Merge remote-tracking branch 'origin/master' into grid

Change-Id: Ic7629f9cedb3c948edf4f63c678ca499e3d52805
author: Leif Åstrand <leif@vaadin.com> 2014-12-18 18:30:09 +0200
committer: Leif Åstrand <leif@vaadin.com> 2014-12-18 18:30:09 +0200
commit: e3d0fbbab68f9ef8642a975741d9f576993b1f38 (patch)
tree: 5711a31c5af1d3773a86b4d25c9f8064aa435ecc /uitest
parent: 434fb5bf5cf62490686367e9193b7898077bbd44 (diff)
parent: 68eec666b55c42b4a55235c00bc78f6212eb2062 (diff)
download: vaadin-framework-e3d0fbbab68f9ef8642a975741d9f576993b1f38.tar.gz
vaadin-framework-e3d0fbbab68f9ef8642a975741d9f576993b1f38.zip
574 files changed, 1131 insertions, 430 deletions
diff --git a/uitest/integration_tests.xml b/uitest/integration_tests.xml
index c0d73580bb..4469b58c24 100644
--- a/uitest/integration_tests.xml
+++ b/uitest/integration_tests.xml
@@ -146,12 +146,6 @@
             <param name="target-server" value="tomcat8" />
         </antcall>
     </target>
-    <target name="integration-test-tomcat5">
-        <antcall target="run-generic-integration-test">
-            <param name="startDelay" value="10" />
-            <param name="target-server" value="tomcat5" />
-        </antcall>
-    </target>
 
     <target name="integration-test-tomcat6">
         <antcall target="run-generic-integration-test">
@@ -160,18 +154,6 @@
         </antcall>
     </target>
 
-    <target name="integration-test-jetty5">
-        <antcall target="run-generic-integration-test">
-            <param name="target-server" value="jetty5" />
-        </antcall>
-    </target>
-
-    <target name="integration-test-jetty6">
-        <antcall target="run-generic-integration-test">
-            <param name="target-server" value="jetty6" />
-        </antcall>
-    </target>
-
     <target name="integration-test-jetty7">
         <antcall target="run-generic-integration-test">
             <param name="target-server" value="jetty7" />
@@ -233,13 +215,6 @@
         </antcall>
     </target>
 
-    <target name="integration-test-glassfish2">
-        <antcall target="run-generic-integration-test">
-            <param name="startDelay" value="10" />
-            <param name="target-server" value="glassfish2" />
-        </antcall>
-    </target>
-
     <target name="integration-test-glassfish3">
         <antcall target="run-generic-integration-test">
             <param name="startDelay" value="10" />
@@ -434,7 +409,6 @@
             <antcall target="integration-test-weblogic10" />
             <antcall target="integration-test-weblogic12" />
             <antcall target="integration-test-gatein3" />
-            <antcall target="integration-test-glassfish2" />
             <antcall target="integration-test-glassfish3" />
             <antcall target="integration-test-glassfish4" />
             <antcall target="integration-test-jboss4" />
@@ -443,12 +417,9 @@
             <antcall target="integration-test-jboss7" />
             <antcall target="integration-test-jboss-eap6" />
             <antcall target="integration-test-wildfly8" />
-            <antcall target="integration-test-jetty5" />
-            <antcall target="integration-test-jetty6" />
             <antcall target="integration-test-jetty7" />
             <antcall target="integration-test-jetty8" />
             <antcall target="integration-test-jetty9" />
-            <antcall target="integration-test-tomcat5" />
             <antcall target="integration-test-tomcat6" />
             <antcall target="integration-test-tomcat7" />
             <antcall target="integration-test-tomcat8" />
diff --git a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxNullValue.html b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxNullValue.html
deleted file mode 100644
index 9717ccec78..0000000000
--- a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxNullValue.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="" />
-<title>CheckBoxNullValue</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">CheckBoxNullValue</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/run/com.vaadin.tests.components.checkbox.CheckBoxNullValue?restartApplication</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>initial</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxNullValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>bothnull</td>
-</tr>
-<tr>
-	<td>mouseClick</td>
-	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxNullValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>
-	<td>6,5</td>
-</tr>
-<tr>
-	<td>mouseClick</td>
-	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxNullValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VCheckBox[0]/domChild[0]</td>
-	<td>7,4</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxNullValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>bothtrue</td>
-</tr>
-<tr>
-	<td>mouseClick</td>
-	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxNullValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VCheckBox[0]/domChild[0]</td>
-	<td>6,6</td>
-</tr>
-<tr>
-	<td>mouseClick</td>
-	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxNullValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>
-	<td>9,9</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxNullValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>bothfalse</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxNullValueTest.java b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxNullValueTest.java
new file mode 100644
index 0000000000..63e5c3f080
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxNullValueTest.java
@@ -0,0 +1,64 @@
+package com.vaadin.tests.components.checkbox;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.testbench.By;
+import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.CheckBoxElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class CheckBoxNullValueTest extends MultiBrowserTest {
+    @Test
+    public void testValidation() throws Exception {
+        openTestURL();
+        CheckBoxElement checkbox = $(CheckBoxElement.class).first();
+        CheckBoxElement requiredCheckbox = $(CheckBoxElement.class).caption(
+                "A required checkbox").first();
+
+        assertValid(checkbox, true);
+        assertValid(requiredCheckbox, true);
+        ButtonElement validate = $(ButtonElement.class).caption("Validate")
+                .first();
+        validate.click();
+
+        assertValid(checkbox, true);
+        assertValid(requiredCheckbox, false);
+
+        click(checkbox);
+        click(requiredCheckbox);
+        validate.click();
+
+        assertValid(checkbox, true);
+        assertValid(requiredCheckbox, true);
+
+        click(checkbox);
+        click(requiredCheckbox);
+        validate.click();
+        assertValid(checkbox, true);
+        assertValid(requiredCheckbox, false);
+
+    }
+
+    private void click(CheckBoxElement checkbox) {
+        checkbox.findElement(By.xpath("input")).click();
+
+    }
+
+    private void assertValid(CheckBoxElement checkbox, boolean valid) {
+        boolean hasIndicator = false;
+        List<WebElement> e = checkbox.findElements(By
+                .className("v-errorindicator"));
+        if (e.size() != 0) {
+            hasIndicator = e.get(0).isDisplayed();
+        }
+
+        Assert.assertEquals("Checkbox state should be "
+                + (valid ? "valid" : "invalid"), valid, !hasIndicator);
+
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/textfield/AlternatingTextFields.java b/uitest/src/com/vaadin/tests/components/textfield/AlternatingTextFields.java
deleted file mode 100644
index 3eda11d999..0000000000
--- a/uitest/src/com/vaadin/tests/components/textfield/AlternatingTextFields.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2000-2014 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.tests.components.textfield;
-
-import com.vaadin.event.FieldEvents.TextChangeEvent;
-import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.server.VaadinRequest;
-import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.TextField;
-import com.vaadin.ui.VerticalLayout;
-
-/**
- * When two TextFields repeatedly disable each other, ensure that also their
- * input prompts are removed
- * 
- * @since
- * @author Vaadin Ltd
- */
-public class AlternatingTextFields extends AbstractTestUI {
-
-    public static final String FIRST_TEXTFIELD_INPUT_PROMPT = "Enter first data here";
-    public static final String SECOND_TEXTFIELD_INPUT_PROMPT = "Enter second data here";
-
-    @Override
-    protected void setup(final VaadinRequest request) {
-
-        VerticalLayout layout = new VerticalLayout();
-        layout.setMargin(true);
-        layout.setSpacing(true);
-
-        final TextField firstTextField = createTextField("First",
-                FIRST_TEXTFIELD_INPUT_PROMPT);
-
-        final TextField secondTextField = createTextField("Second",
-                SECOND_TEXTFIELD_INPUT_PROMPT);
-
-        addTextChangeListener(firstTextField, secondTextField);
-        addTextChangeListener(secondTextField, firstTextField);
-
-        layout.addComponent(firstTextField);
-        layout.addComponent(secondTextField);
-
-        addComponent(layout);
-    }
-
-    private static TextField createTextField(String number, String inputPrompt) {
-
-        String caption = " TextField with TextChangeListener";
-
-        TextField textField = new TextField(number + caption);
-        textField.setImmediate(true);
-        textField.setInputPrompt(inputPrompt);
-
-        return textField;
-    }
-
-    private void addTextChangeListener(TextField currentTextField,
-            final TextField otherTextField) {
-
-        final String otherDefaultPrompt = otherTextField.getInputPrompt();
-        currentTextField.addTextChangeListener(new TextChangeListener() {
-
-            @Override
-            public void textChange(TextChangeEvent event) {
-
-                String currentText = event.getText();
-
-                if (currentText.isEmpty() || currentText == null) {
-                    // change other to default
-
-                    otherTextField.setInputPrompt(otherDefaultPrompt);
-                    otherTextField.setEnabled(true);
-                } else {
-                    // change other to empty
-
-                    otherTextField.setInputPrompt(null);
-                    otherTextField.setEnabled(false);
-                }
-
-            }
-        });
-    }
-
-    @Override
-    protected String getTestDescription() {
-        return "When two TextFields repeatedly disable each other, ensure that also their input prompts are removed";
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        return 15144;
-    }
-}
diff --git a/uitest/src/com/vaadin/tests/components/textfield/AlternatingTextFieldsTest.java b/uitest/src/com/vaadin/tests/components/textfield/AlternatingTextFieldsTest.java
deleted file mode 100644
index a7ee3fede2..0000000000
--- a/uitest/src/com/vaadin/tests/components/textfield/AlternatingTextFieldsTest.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright 2000-2014 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.tests.components.textfield;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.List;
-
-import org.junit.Test;
-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;
-
-public class AlternatingTextFieldsTest extends MultiBrowserTest {
-
-    private String RANDOM_INPUT = "Some input here";
-
-    private List<TextFieldElement> textfields;
-
-    @Test
-    public void testInputPrompt() {
-        openTestURL();
-
-        /*
-         * Starting positions
-         */
-
-        createTextFields();
-
-        // test that both input prompts exist in the beginning
-        ensureTextFieldHasInputPrompt(0);
-        ensureTextFieldHasInputPrompt(1);
-
-        /*
-         * Write on and empty the first TextField
-         */
-
-        // select first input prompt
-        ensureSelectionClearsPrompt(0);
-
-        // write on the first TextField
-        ensureWritingDisablesOther(0);
-
-        // empty the text on the first TextField
-        ensureEmptyingAddsPromptAndEnablesOther(0);
-
-        /*
-         * Write on and empty the second TextField
-         */
-
-        // now select the second input prompt
-        ensureSelectionClearsPrompt(1);
-
-        // write on the second TextField
-        ensureWritingDisablesOther(1);
-
-        // empty the text on the second TextField
-        ensureEmptyingAddsPromptAndEnablesOther(1);
-
-    }
-
-    private void ensureEmptyingAddsPromptAndEnablesOther(int index) {
-        // remove the text from the TextField
-        emptyTextField(index);
-
-        // ensure that the TextField really is empty
-        ensureTextFieldEmpty(index);
-
-        // ensure that the other TextField has again been enabled and has an
-        // input prompt
-        if (index == 0) {
-            ensureTextFieldIsEnabledAndHasInputPrompt(1);
-        } else {
-            ensureTextFieldIsEnabledAndHasInputPrompt(0);
-        }
-    }
-
-    private void ensureWritingDisablesOther(int index) {
-        // write some text to the TextField
-        writeOnTextField(index);
-
-        // ensure that the other TextField is disabled and has no input prompt
-        if (index == 0) {
-            ensureTextFieldDisabledAndEmpty(1);
-        } else {
-            ensureTextFieldDisabledAndEmpty(0);
-        }
-    }
-
-    private void ensureSelectionClearsPrompt(int index) {
-        // select the TextField
-        textfields.get(index).click();
-
-        // check that the the prompt was removed
-        ensureTextFieldEmpty(index);
-    }
-
-    /**
-     * Check that the TextField has no input prompt
-     * 
-     * @since
-     * @param index
-     *            The TextField to be inspected
-     */
-    private void ensureTextFieldEmpty(int index) {
-
-        assertEquals("TextField " + index + " was not empty,", "", textfields
-                .get(index).getValue());
-    }
-
-    /**
-     * Check that the TextField has been enabled and has correct input prompt
-     * 
-     * @since
-     * @param index
-     *            the TextField to be inspected
-     */
-    private void ensureTextFieldIsEnabledAndHasInputPrompt(final int index) {
-
-        waitUntil(new ExpectedCondition<Boolean>() {
-
-            @Override
-            public Boolean apply(WebDriver input) {
-                return textfields.get(index).isEnabled();
-            }
-
-            @Override
-            public String toString() {
-                // Timed out after 10 seconds waiting for ...
-                return "TextField " + index + " to be enabled";
-            }
-        });
-
-        ensureTextFieldHasInputPrompt(index);
-    }
-
-    /**
-     * Check that the TextField has the correct input prompt
-     * 
-     * @since
-     * @param index
-     *            The TextField to be inspected
-     */
-    private void ensureTextFieldHasInputPrompt(final int index) {
-
-        if (index == 0) {
-            assertEquals("Incorrect or missing prompt,",
-                    AlternatingTextFields.FIRST_TEXTFIELD_INPUT_PROMPT,
-                    textfields.get(index).getValue());
-        } else {
-            assertEquals("Incorrect or missing prompt,",
-                    AlternatingTextFields.SECOND_TEXTFIELD_INPUT_PROMPT,
-                    textfields.get(index).getValue());
-        }
-    }
-
-    /**
-     * Check that the TextField has been disabled and has no input prompt
-     * 
-     * @since
-     * @param index
-     *            The TextField to be inspected
-     */
-    private void ensureTextFieldDisabledAndEmpty(final int index) {
-
-        waitUntil(new ExpectedCondition<Boolean>() {
-
-            @Override
-            public Boolean apply(WebDriver input) {
-                return !textfields.get(index).isEnabled();
-            }
-
-            @Override
-            public String toString() {
-                // Timed out after 10 seconds waiting for ...
-                return "TextField " + index + " to be disabled";
-            }
-        });
-
-        ensureTextFieldEmpty(index);
-    }
-
-    private void createTextFields() {
-        textfields = $(TextFieldElement.class).all();
-    }
-
-    private void writeOnTextField(int index) {
-        textfields.get(index).sendKeys(RANDOM_INPUT);
-    }
-
-    private void emptyTextField(int index) {
-        for (int i = 0; i < 15; i++) {
-            textfields.get(index).sendKeys(Keys.BACK_SPACE);
-        }
-    }
-}
diff --git a/uitest/src/com/vaadin/tests/components/ui/DynamicViewport.java b/uitest/src/com/vaadin/tests/components/ui/DynamicViewport.java
new file mode 100644
index 0000000000..ca9ebcd451
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/ui/DynamicViewport.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2000-2014 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.tests.components.ui;
+
+import com.vaadin.annotations.ViewportGeneratorClass;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.server.ViewportGenerator;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.tests.components.ui.DynamicViewport.MyViewportGenerator;
+import com.vaadin.ui.Label;
+
+@ViewportGeneratorClass(MyViewportGenerator.class)
+public class DynamicViewport extends AbstractTestUI {
+    public static class MyViewportGenerator implements ViewportGenerator {
+        @Override
+        public String getViewport(VaadinRequest request) {
+            String userAgent = request.getHeader("User-Agent");
+            System.out.println(userAgent);
+            if (userAgent == null || userAgent.contains("Chrome")) {
+                return null;
+            }
+            return userAgent;
+        }
+    }
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        addComponent(new Label("I should have a dynamic viewport tag"));
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/components/ui/DynamicViewportEmptyTest.java b/uitest/src/com/vaadin/tests/components/ui/DynamicViewportEmptyTest.java
new file mode 100644
index 0000000000..40ec937c1c
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/ui/DynamicViewportEmptyTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2000-2014 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.tests.components.ui;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.remote.DesiredCapabilities;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class DynamicViewportEmptyTest extends MultiBrowserTest {
+
+    @Override
+    protected Class<?> getUIClass() {
+        return DynamicViewport.class;
+    }
+
+    @Override
+    public List<DesiredCapabilities> getBrowsersToTest() {
+        return Arrays.asList(Browser.CHROME.getDesiredCapabilities());
+    }
+
+    @Test
+    public void testGeneratedEmptyViewport() {
+        openTestURL();
+
+        List<WebElement> viewportElements = findElements(By
+                .cssSelector("meta[name=viewport]"));
+
+        Assert.assertTrue("There should be no viewport tags",
+                viewportElements.isEmpty());
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/ui/DynamicViewportTest.java b/uitest/src/com/vaadin/tests/components/ui/DynamicViewportTest.java
new file mode 100644
index 0000000000..f1d9efdbd1
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/ui/DynamicViewportTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2000-2014 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.tests.components.ui;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.tests.tb3.SingleBrowserTest;
+
+public class DynamicViewportTest extends SingleBrowserTest {
+
+    @Test
+    public void testGeneratedViewport() {
+        openTestURL();
+
+        WebElement viewportElement = findElement(By
+                .cssSelector("meta[name=viewport]"));
+
+        Assert.assertTrue(viewportElement.getAttribute("content").contains(
+                "PhantomJS"));
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/components/ui/InvalidViewport.java b/uitest/src/com/vaadin/tests/components/ui/InvalidViewport.java
new file mode 100644
index 0000000000..9557a2d2b0
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/ui/InvalidViewport.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2000-2014 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.tests.components.ui;
+
+import com.vaadin.annotations.Viewport;
+import com.vaadin.annotations.ViewportGeneratorClass;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.tests.components.ui.DynamicViewport.MyViewportGenerator;
+import com.vaadin.ui.Label;
+
+@ViewportGeneratorClass(MyViewportGenerator.class)
+@Viewport("myViewport")
+public class InvalidViewport extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        addComponent(new Label(
+                "I shouldn't load because of conflicting viewport definitions"));
+
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/ui/InvalidViewportTest.java b/uitest/src/com/vaadin/tests/components/ui/InvalidViewportTest.java
new file mode 100644
index 0000000000..9d0aac49f7
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/ui/InvalidViewportTest.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2000-2014 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.tests.components.ui;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.tests.tb3.SingleBrowserTest;
+
+public class InvalidViewportTest extends SingleBrowserTest {
+
+    @Test
+    public void testInvalidViewport() {
+        openTestURL();
+
+        WebElement heading = findElement(By.tagName("h2"));
+
+        Assert.assertEquals("HTTP ERROR 500", heading.getText());
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/ui/StaticViewport.java b/uitest/src/com/vaadin/tests/components/ui/StaticViewport.java
new file mode 100644
index 0000000000..813206dbe8
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/ui/StaticViewport.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2000-2014 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.tests.components.ui;
+
+import com.vaadin.annotations.Viewport;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Label;
+
+@Viewport("myViewport")
+public class StaticViewport extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        addComponent(new Label("I should have a static viewport tag"));
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/ui/StaticViewportTest.java b/uitest/src/com/vaadin/tests/components/ui/StaticViewportTest.java
new file mode 100644
index 0000000000..61b3c944c9
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/ui/StaticViewportTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2000-2014 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.tests.components.ui;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.tests.tb3.SingleBrowserTest;
+
+public class StaticViewportTest extends SingleBrowserTest {
+
+    @Test
+    public void testStaticViewport() {
+        openTestURL();
+
+        WebElement viewportElement = findElement(By
+                .cssSelector("meta[name=viewport]"));
+
+        Assert.assertEquals("myViewport",
+                viewportElement.getAttribute("content"));
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUI.java b/uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUI.java
new file mode 100644
index 0000000000..e80686f6f3
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUI.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2000-2014 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.tests.components.ui;
+
+import com.vaadin.annotations.Theme;
+import com.vaadin.server.Responsive;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CssLayout;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.UI;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.themes.ValoTheme;
+
+/**
+ * 
+ * @since
+ * @author Vaadin Ltd
+ */
+@Theme("valo")
+public class UnnecessaryPaddingInResponsiveUI extends UI {
+
+    @Override
+    protected void init(VaadinRequest request) {
+        Responsive.makeResponsive(this);
+
+        HorizontalLayout root = new HorizontalLayout();
+        root.setSpacing(true);
+
+        MenuLayout menu = new MenuLayout();
+
+        root.addComponent(menu);
+
+        setContent(root);
+
+        setWidth(799, Unit.PIXELS);
+        setId("UI");
+
+        // Uncomment this to enable responsive features in Valo Menu and
+        // introduce a padding-top to the UI. When this is commented the
+        // padding-top should be 0 and the related test should pass.
+
+        // addStyleName(ValoTheme.UI_WITH_MENU);
+    }
+
+    class MenuLayout extends VerticalLayout {
+        public MenuLayout() {
+            setSizeFull();
+            setPrimaryStyleName(ValoTheme.MENU_ROOT);
+
+            CssLayout titleLo = new CssLayout();
+            titleLo.addStyleName(ValoTheme.MENU_TITLE);
+            titleLo.addComponent(new Label("menu-title"));
+
+            addComponent(titleLo);
+
+            for (int i = 1; i <= 5; i++) {
+                Button button = new Button("Menu Item " + i);
+                button.setPrimaryStyleName(ValoTheme.MENU_ITEM);
+                addComponent(button);
+            }
+        }
+
+    }
+}
+\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUITest.java b/uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUITest.java
new file mode 100644
index 0000000000..661db179e7
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUITest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2000-2014 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.tests.components.ui;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.tests.tb3.SingleBrowserTest;
+
+/**
+ * 
+ * @since
+ * @author Vaadin Ltd
+ */
+public class UnnecessaryPaddingInResponsiveUITest extends SingleBrowserTest {
+
+    @Test
+    public void testUIShouldHaveNoPaddingTop() {
+        openTestURL();
+
+        WebElement ui = vaadinElementById("UI");
+
+        String paddingTop = ui.getCssValue("padding-top");
+
+        Integer paddingHeight = Integer.parseInt(paddingTop.substring(0,
+                paddingTop.length() - 2));
+
+        assertThat(paddingHeight, equalTo(0));
+
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/declarative/DeclarativeEditor.java b/uitest/src/com/vaadin/tests/declarative/DeclarativeEditor.java
new file mode 100644
index 0000000000..17942ee201
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/declarative/DeclarativeEditor.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2000-2014 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.tests.declarative;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.tools.ant.filters.StringInputStream;
+
+import com.vaadin.annotations.Theme;
+import com.vaadin.data.Property.ReadOnlyException;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.data.Property.ValueChangeNotifier;
+import com.vaadin.event.FieldEvents.TextChangeEvent;
+import com.vaadin.event.FieldEvents.TextChangeListener;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.HasComponents;
+import com.vaadin.ui.HorizontalSplitPanel;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TextArea;
+import com.vaadin.ui.UI;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.declarative.Design;
+import com.vaadin.ui.declarative.DesignContext;
+
+@Theme("valo")
+public class DeclarativeEditor extends UI {
+
+    private VerticalLayout treeHolder;
+    private TextArea editor;
+    private DesignContext dc;
+    private boolean disableEvents = false;
+    private HorizontalSplitPanel main;
+
+    @Override
+    protected void init(VaadinRequest request) {
+        main = new HorizontalSplitPanel();
+        editor = new TextArea();
+        editor.setSizeFull();
+        try {
+            editor.setValue(IOUtils.toString(getClass().getResourceAsStream(
+                    "DeclarativeEditorInitial.html")));
+        } catch (ReadOnlyException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        editor.addTextChangeListener(new TextChangeListener() {
+
+            @Override
+            public void textChange(TextChangeEvent event) {
+                editor.setComponentError(null);
+                updateTree(event.getText());
+            }
+        });
+
+        Panel editorPanel = new Panel(editor);
+        editorPanel.setSizeFull();
+        treeHolder = new VerticalLayout();
+        treeHolder.setSizeFull();
+
+        main.addComponents(editorPanel, treeHolder);
+        main.setSizeFull();
+
+        setContent(main);
+        updateTree(editor.getValue());
+    }
+
+    protected void updateTree(String string) {
+        if (disableEvents) {
+            return;
+        }
+
+        dc = Design.read(new StringInputStream(string), null);
+        treeHolder.removeAllComponents();
+        treeHolder.addComponent(dc.getRootComponent());
+
+        addValueChangeListeners(dc.getRootComponent());
+    }
+
+    protected void updateCode() {
+        if (disableEvents) {
+            return;
+        }
+
+        ByteArrayOutputStream o = new ByteArrayOutputStream();
+        try {
+            Design.write(treeHolder.getComponent(0), o);
+            disableEvents = true;
+            editor.setValue(o.toString("UTF-8"));
+            disableEvents = false;
+        } catch (IOException e1) {
+            e1.printStackTrace();
+        }
+
+    }
+
+    private void addValueChangeListeners(Component component) {
+        if (component instanceof ValueChangeNotifier) {
+            ((ValueChangeNotifier) component)
+                    .addValueChangeListener(new ValueChangeListener() {
+                        @Override
+                        public void valueChange(ValueChangeEvent event) {
+                            updateCode();
+                        }
+                    });
+        }
+
+        if (component instanceof HasComponents) {
+            for (Component c : ((HasComponents) component)) {
+                addValueChangeListeners(c);
+            }
+        }
+
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/declarative/DeclarativeEditorInitial.html b/uitest/src/com/vaadin/tests/declarative/DeclarativeEditorInitial.html
new file mode 100644
index 0000000000..17f7d6aa59
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/declarative/DeclarativeEditorInitial.html
@@ -0,0 +1,23 @@
+<v-vertical-layout size-full margin spacing>
+    <v-horizontal-layout spacing margin width-full>   
+        <v-label size-auto>POTUS Database</v-label>
+        <v-button :expand>Add new</v-button>
+    </v-horizontal-layout>
+    <v-table _id="potusList" :expand selectable size-full />
+    <v-vertical-layout _id="form" spacing margin>
+        <v-horizontal-layout spacing>   
+            <v-text-field caption="First Name" width="300px" />
+            <v-text-field caption="Last Name" width="300px" />
+        </v-horizontal-layout>
+        <v-horizontal-layout spacing>   
+            <v-combo-box caption="Party" width="300px" />
+            <v-popup-date-field caption="Took Office" />
+            <v-popup-date-field caption="Left Office" />
+        </v-horizontal-layout>
+        <v-horizontal-layout spacing width-full>  
+            <v-button style-name="primary">Save</v-button>
+            <v-button>Revert</v-button>
+            <v-button :expand :right>Delete</v-button>
+        </v-horizontal-layout>
+    </v-vertical-layout>
+</v-vertical-layout>
+\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/declarative/Potus.java b/uitest/src/com/vaadin/tests/declarative/Potus.java
new file mode 100644
index 0000000000..23448a9b7f
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/declarative/Potus.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2000-2014 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.tests.declarative;
+
+import java.util.Date;
+
+/**
+ * 
+ * @since
+ * @author Vaadin Ltd
+ */
+public class Potus {
+    private String firstName;
+    private String lastName;
+    private String party;
+    private Date tookOffice;
+    private Date leftOffice;
+
+    /**
+     * @return the firstName
+     */
+    public String getFirstName() {
+        return firstName;
+    }
+
+    /**
+     * @param firstName
+     *            the firstName to set
+     */
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    /**
+     * @return the lastName
+     */
+    public String getLastName() {
+        return lastName;
+    }
+
+    /**
+     * @param lastName
+     *            the lastName to set
+     */
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    /**
+     * @return the party
+     */
+    public String getParty() {
+        return party;
+    }
+
+    /**
+     * @param party
+     *            the party to set
+     */
+    public void setParty(String party) {
+        this.party = party;
+    }
+
+    /**
+     * @return the tookOffice
+     */
+    public Date getTookOffice() {
+        return tookOffice;
+    }
+
+    /**
+     * @param tookOffice
+     *            the tookOffice to set
+     */
+    public void setTookOffice(Date tookOffice) {
+        this.tookOffice = tookOffice;
+    }
+
+    /**
+     * @return the leftOffice
+     */
+    public Date getLeftOffice() {
+        return leftOffice;
+    }
+
+    /**
+     * @param leftOffice
+     *            the leftOffice to set
+     */
+    public void setLeftOffice(Date leftOffice) {
+        this.leftOffice = leftOffice;
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/declarative/PotusCrud.html b/uitest/src/com/vaadin/tests/declarative/PotusCrud.html
new file mode 100644
index 0000000000..05acee9679
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/declarative/PotusCrud.html
@@ -0,0 +1,14 @@
+<head>
+  <meta name="package-mapping" content="x:com.vaadin.tests.declarative"/>
+</head>
+<body>
+	<v-vertical-layout size-full margin="true" spacing>
+	    <v-horizontal-layout spacing margin width-full>   
+	        <v-label size-auto>POTUS Database</v-label>
+	        <v-button :expand _id="addNew">Add new</v-button>
+	    </v-horizontal-layout>
+	    <v-table _id="potusList" :expand selectable size-full/>
+	    <x-potus-form _id="potusForm" />
+	</v-vertical-layout>
+</body>
+
diff --git a/uitest/src/com/vaadin/tests/declarative/PotusCrud.java b/uitest/src/com/vaadin/tests/declarative/PotusCrud.java
new file mode 100644
index 0000000000..70ad956045
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/declarative/PotusCrud.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2000-2014 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.tests.declarative;
+
+import com.vaadin.annotations.DesignRoot;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.data.fieldgroup.FieldGroup;
+import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
+import com.vaadin.data.util.BeanItemContainer;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.declarative.Design;
+
+@DesignRoot
+public class PotusCrud extends VerticalLayout {
+
+    public Table potusList;
+    public PotusForm potusForm;
+    public Button addNew;
+
+    private FieldGroup fg;
+
+    private BeanItemContainer<Potus> potusContainer = new BeanItemContainer<Potus>(
+            Potus.class);
+
+    public PotusCrud() {
+        Design.read(this);
+        init();
+    }
+
+    private void init() {
+        initTable();
+        initForm();
+        addNew.addClickListener(new Button.ClickListener() {
+            @Override
+            public void buttonClick(ClickEvent event) {
+                doAdd();
+            }
+        });
+    }
+
+    private void initTable() {
+        potusList.setContainerDataSource(potusContainer);
+        potusList.addValueChangeListener(new ValueChangeListener() {
+            @Override
+            public void valueChange(ValueChangeEvent event) {
+                doEdit();
+            }
+        });
+    }
+
+    private void initForm() {
+        potusForm.save.addClickListener(new Button.ClickListener() {
+            @Override
+            public void buttonClick(ClickEvent event) {
+                doSave();
+            }
+
+        });
+        potusForm.delete.addClickListener(new Button.ClickListener() {
+
+            @Override
+            public void buttonClick(ClickEvent event) {
+                doDelete();
+            }
+        });
+        potusForm.revert.addClickListener(new Button.ClickListener() {
+
+            @Override
+            public void buttonClick(ClickEvent event) {
+                doRevert();
+            }
+        });
+        fg = new FieldGroup();
+    }
+
+    protected void doRevert() {
+        fg.discard();
+    }
+
+    protected void doDelete() {
+        potusContainer.removeItem(potusList.getValue());
+        fg.setItemDataSource(null);
+    }
+
+    protected void doSave() {
+        try {
+            fg.commit();
+        } catch (CommitException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    protected void doAdd() {
+        potusContainer.addBean(new Potus());
+    }
+
+    protected void doEdit() {
+        if (potusList.getValue() != null) {
+            fg.setItemDataSource(potusList.getItem(potusList.getValue()));
+            fg.bindMemberFields(potusForm);
+        } else {
+            fg.setItemDataSource(null);
+        }
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/declarative/PotusCrudUI.java b/uitest/src/com/vaadin/tests/declarative/PotusCrudUI.java
new file mode 100644
index 0000000000..f1d94f7f16
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/declarative/PotusCrudUI.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2000-2014 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.tests.declarative;
+
+import com.vaadin.annotations.Theme;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.ui.UI;
+
+/**
+ * 
+ * @since
+ * @author Vaadin Ltd
+ */
+@Theme("valo")
+public class PotusCrudUI extends UI {
+
+    @Override
+    protected void init(VaadinRequest request) {
+        setContent(new PotusCrud());
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/declarative/PotusForm.html b/uitest/src/com/vaadin/tests/declarative/PotusForm.html
new file mode 100644
index 0000000000..0542e1ee52
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/declarative/PotusForm.html
@@ -0,0 +1,16 @@
+<v-vertical-layout _id="form" spacing margin>
+    <v-horizontal-layout spacing>   
+        <v-text-field _id="firstName" caption="First Name" null-representation="" width="300px" />
+        <v-text-field _id="lastName" caption="Last Name" null-representation="" width="300px" />
+    </v-horizontal-layout>
+    <v-horizontal-layout spacing>   
+        <v-combo-box _id="party" caption="Party" width="300px" />
+        <v-popup-date-field _id="tookOffice" caption="Took Office" />
+        <v-popup-date-field _id="leftOffice" caption="Left Office" />
+    </v-horizontal-layout>
+    <v-horizontal-layout spacing width-full>  
+        <v-button _id="save" style-name="primary">Save</v-button>
+        <v-button _id="revert">Revert</v-button>
+        <v-button _id="delete" style-name="danger" :expand :right>Delete</v-button>
+    </v-horizontal-layout>
+</v-vertical-layout>
+\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/declarative/PotusForm.java b/uitest/src/com/vaadin/tests/declarative/PotusForm.java
new file mode 100644
index 0000000000..506a25f663
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/declarative/PotusForm.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2000-2014 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.tests.declarative;
+
+import com.vaadin.annotations.DesignRoot;
+import com.vaadin.data.fieldgroup.PropertyId;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.PopupDateField;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.declarative.Design;
+
+@DesignRoot
+public class PotusForm extends VerticalLayout {
+
+    @PropertyId("firstName")
+    public TextField firstName;
+    @PropertyId("lastName")
+    public TextField lastName;
+    @PropertyId("party")
+    public ComboBox party;
+    @PropertyId("tookOffice")
+    public PopupDateField tookOffice;
+    @PropertyId("leftOffice")
+    public PopupDateField leftOffice;
+
+    public Button save;
+    public Button revert;
+    public Button delete;
+
+    public PotusForm() {
+        Design.read(this);
+        party.addItems("Democratic Party");
+        party.addItems("Republican Party");
+        party.addItems("Independent");
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/layouts/CaptionsInLayouts.java b/uitest/src/com/vaadin/tests/layouts/CaptionsInLayouts.java
index 03c3c43ccd..74cfe12ad7 100644
--- a/uitest/src/com/vaadin/tests/layouts/CaptionsInLayouts.java
+++ b/uitest/src/com/vaadin/tests/layouts/CaptionsInLayouts.java
@@ -8,7 +8,8 @@ import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.server.UserError;
-import com.vaadin.tests.components.TestBase;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.AbstractField;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -25,7 +26,7 @@ import com.vaadin.ui.NativeSelect;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.VerticalLayout;
 
-public class CaptionsInLayouts extends TestBase {
+public class CaptionsInLayouts extends AbstractTestUI {
 
     private static final Object CAPTION = "CAPTION";
     private static final Object CLASS = "C";
@@ -42,7 +43,7 @@ public class CaptionsInLayouts extends TestBase {
     private HorizontalLayout layoutParent = new HorizontalLayout();
 
     @Override
-    protected void setup() {
+    protected void setup(VaadinRequest request) {
         // setTheme("tests-tickets");
         addComponent(createLayoutSelect());
         addComponent(toggleRequired());
@@ -270,7 +271,7 @@ public class CaptionsInLayouts extends TestBase {
     }
 
     @Override
-    protected String getDescription() {
+    protected String getTestDescription() {
         return "Tests what happens when the caption changes in various layouts. Behavior should be consistent.";
     }
 
diff --git a/uitest/src/com/vaadin/tests/layouts/HtmlInCaption.java b/uitest/src/com/vaadin/tests/layouts/HtmlInCaption.java
new file mode 100644
index 0000000000..830b96b3d7
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/layouts/HtmlInCaption.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright 2000-2014 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.tests.layouts;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.AbsoluteLayout;
+import com.vaadin.ui.AbstractComponent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.ColorPicker;
+import com.vaadin.ui.ColorPickerArea;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CssLayout;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.NativeButton;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+
+/**
+ * 
+ * @since
+ * @author Vaadin Ltd
+ */
+public class HtmlInCaption extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        HorizontalLayout main = new HorizontalLayout();
+        addComponent(main);
+        VerticalLayout components = new VerticalLayout();
+        components.setId("components");
+        VerticalLayout layouts = new VerticalLayout();
+        layouts.setId("layouts");
+        main.addComponent(layouts);
+        main.addComponent(components);
+
+        createComponents(components);
+        createLayouts(layouts);
+
+        Window w = new Window();
+        w.setCaption(getTextCaption("Window"));
+        w.setPositionX(600);
+        addWindow(w);
+
+        w = new Window();
+        w.setCaptionAsHtml(true);
+        w.setCaption(getHtmlCaption("Window"));
+        w.setPositionX(600);
+        w.setPositionY(100);
+        addWindow(w);
+    }
+
+    private void createLayouts(VerticalLayout layouts) {
+        VerticalLayout vl = new VerticalLayout(tf(false), tf(true));
+        vl.setCaption("VerticalLayout");
+        layouts.addComponent(vl);
+
+        HorizontalLayout hl = new HorizontalLayout(tf(false), tf(true));
+        hl.setCaption("HorizontalLayout");
+        layouts.addComponent(hl);
+
+        GridLayout gl = new GridLayout(2, 1);
+        gl.setCaption("GridLayout");
+        gl.addComponents(tf(false), tf(true));
+        layouts.addComponent(gl);
+
+        CssLayout cl = new CssLayout();
+        cl.setCaption("CssLayout");
+        cl.addComponents(tf(false), tf(true));
+        layouts.addComponent(cl);
+
+        AbsoluteLayout al = new AbsoluteLayout();
+        al.setCaption("AbsoluteLayout");
+        al.setWidth("300px");
+        al.setHeight("200px");
+        al.addComponent(tf(false), "top:30px");
+        al.addComponent(tf(true), "top: 100px");
+        layouts.addComponent(al);
+    }
+
+    private void createComponents(VerticalLayout components) {
+        createComponent(components, Button.class);
+        createComponent(components, NativeButton.class);
+        createComponent(components, CheckBox.class);
+        createComponent(components, Link.class);
+
+        createComponent(components, Panel.class);
+        createComponent(components, ColorPicker.class);
+        createComponent(components, ColorPickerArea.class);
+        createComponent(components, Form.class);
+
+    }
+
+    private void createComponent(VerticalLayout components,
+            Class<? extends AbstractComponent> class1) {
+        AbstractComponent ac;
+        try {
+            ac = class1.newInstance();
+            ac.setCaption(getTextCaption(class1.getSimpleName()));
+            components.addComponent(ac);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        try {
+            ac = class1.newInstance();
+            ac.setCaption(getHtmlCaption(class1.getSimpleName()));
+            ac.setCaptionAsHtml(true);
+            components.addComponent(ac);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    private Component tf(boolean htmlCaption) {
+        TextField tf = new TextField();
+        if (htmlCaption) {
+            tf.setCaptionAsHtml(htmlCaption);
+            tf.setCaption(getHtmlCaption(""));
+        } else {
+            tf.setCaption(getTextCaption(""));
+        }
+        return tf;
+    }
+
+    private String getTextCaption(String string) {
+        return "<b>Plain text " + string + "</b>";
+    }
+
+    private String getHtmlCaption(String string) {
+        return "<b><font color='red'>HTML " + string + "</font></b>";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 9426;
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java b/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java
index e7a74775bf..182a2e67e4 100644
--- a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java
+++ b/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java
@@ -30,6 +30,7 @@ import com.vaadin.server.VaadinService;
 import com.vaadin.server.VaadinServletService;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.ui.JavaScriptFunction;
+
 import elemental.json.JsonArray;
 
 // Load vaadinPush.js so that jQueryVaadin is defined 
@@ -39,7 +40,7 @@ public class TrackMessageSizeUI extends AbstractTestUIWithLog {
     private String testMethod = "function testSequence(expected, data) {\n"
             + "    var request = {trackMessageLength: true, messageDelimiter: '|'};\n"
             + "    _request = {trackMessageLength: true, messageDelimiter: '|'};\n"
-            + "    _handleProtocol = function(a,b) {return true;};"
+            + "    _handleProtocol = function(a,message) {return message;};"
             + "    var response = {partialMessage: ''};\n"
             + "    var messages = [];\n"
             + "    for(var i = 0; i < data.length; i++) {\n"
diff --git a/uitest/src/com/vaadin/tests/VerifyBrowserVersion.html b/uitest/tb2/com/vaadin/tests/VerifyBrowserVersion.html
index 8313eceeab..8313eceeab 100644
--- a/uitest/src/com/vaadin/tests/VerifyBrowserVersion.html
+++ b/uitest/tb2/com/vaadin/tests/VerifyBrowserVersion.html
diff --git a/uitest/src/com/vaadin/tests/application/DeploymentConfigurationTest.html b/uitest/tb2/com/vaadin/tests/application/DeploymentConfigurationTest.html
index 2bdb7c79a5..2bdb7c79a5 100644
--- a/uitest/src/com/vaadin/tests/application/DeploymentConfigurationTest.html
+++ b/uitest/tb2/com/vaadin/tests/application/DeploymentConfigurationTest.html
diff --git a/uitest/src/com/vaadin/tests/application/DetachOldUIOnReload.html b/uitest/tb2/com/vaadin/tests/application/DetachOldUIOnReload.html
index 33fc46f060..33fc46f060 100644
--- a/uitest/src/com/vaadin/tests/application/DetachOldUIOnReload.html
+++ b/uitest/tb2/com/vaadin/tests/application/DetachOldUIOnReload.html
diff --git a/uitest/src/com/vaadin/tests/application/ErrorInUnloadEvent.html b/uitest/tb2/com/vaadin/tests/application/ErrorInUnloadEvent.html
index ee200d7f5c..ee200d7f5c 100644
--- a/uitest/src/com/vaadin/tests/application/ErrorInUnloadEvent.html
+++ b/uitest/tb2/com/vaadin/tests/application/ErrorInUnloadEvent.html
diff --git a/uitest/src/com/vaadin/tests/application/RefreshFragmentChange.html b/uitest/tb2/com/vaadin/tests/application/RefreshFragmentChange.html
index 147e67f19d..147e67f19d 100644
--- a/uitest/src/com/vaadin/tests/application/RefreshFragmentChange.html
+++ b/uitest/tb2/com/vaadin/tests/application/RefreshFragmentChange.html
diff --git a/uitest/src/com/vaadin/tests/application/RefreshStatePreserve.html b/uitest/tb2/com/vaadin/tests/application/RefreshStatePreserve.html
index ea8c0c93b6..ea8c0c93b6 100644
--- a/uitest/src/com/vaadin/tests/application/RefreshStatePreserve.html
+++ b/uitest/tb2/com/vaadin/tests/application/RefreshStatePreserve.html
diff --git a/uitest/src/com/vaadin/tests/application/RefreshStatePreserveTitle.html b/uitest/tb2/com/vaadin/tests/application/RefreshStatePreserveTitle.html
index f366054f45..f366054f45 100644
--- a/uitest/src/com/vaadin/tests/application/RefreshStatePreserveTitle.html
+++ b/uitest/tb2/com/vaadin/tests/application/RefreshStatePreserveTitle.html
diff --git a/uitest/src/com/vaadin/tests/application/TerminalErrorNotification.html b/uitest/tb2/com/vaadin/tests/application/TerminalErrorNotification.html
index e7d437eeca..e7d437eeca 100644
--- a/uitest/src/com/vaadin/tests/application/TerminalErrorNotification.html
+++ b/uitest/tb2/com/vaadin/tests/application/TerminalErrorNotification.html
diff --git a/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.html b/uitest/tb2/com/vaadin/tests/application/ThreadLocalInstances.html
index 0d3a746152..0d3a746152 100644
--- a/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.html
+++ b/uitest/tb2/com/vaadin/tests/application/ThreadLocalInstances.html
diff --git a/uitest/src/com/vaadin/tests/application/VaadinSessionAttribute.html b/uitest/tb2/com/vaadin/tests/application/VaadinSessionAttribute.html
index 150ab3ff3d..150ab3ff3d 100644
--- a/uitest/src/com/vaadin/tests/application/VaadinSessionAttribute.html
+++ b/uitest/tb2/com/vaadin/tests/application/VaadinSessionAttribute.html
diff --git a/uitest/src/com/vaadin/tests/application/WebBrowserSizeTest.html b/uitest/tb2/com/vaadin/tests/application/WebBrowserSizeTest.html
index 3c59c7a953..3c59c7a953 100644
--- a/uitest/src/com/vaadin/tests/application/WebBrowserSizeTest.html
+++ b/uitest/tb2/com/vaadin/tests/application/WebBrowserSizeTest.html
diff --git a/uitest/src/com/vaadin/tests/application/WebBrowserTest.html b/uitest/tb2/com/vaadin/tests/application/WebBrowserTest.html
index f04dd564bf..f04dd564bf 100644
--- a/uitest/src/com/vaadin/tests/application/WebBrowserTest.html
+++ b/uitest/tb2/com/vaadin/tests/application/WebBrowserTest.html
diff --git a/uitest/src/com/vaadin/tests/applicationcontext/ChangeSessionId.html b/uitest/tb2/com/vaadin/tests/applicationcontext/ChangeSessionId.html
index 6bf4041a93..6bf4041a93 100644
--- a/uitest/src/com/vaadin/tests/applicationcontext/ChangeSessionId.html
+++ b/uitest/tb2/com/vaadin/tests/applicationcontext/ChangeSessionId.html
diff --git a/uitest/src/com/vaadin/tests/applicationcontext/CloseSession.html b/uitest/tb2/com/vaadin/tests/applicationcontext/CloseSession.html
index eb6e7681e6..eb6e7681e6 100644
--- a/uitest/src/com/vaadin/tests/applicationcontext/CloseSession.html
+++ b/uitest/tb2/com/vaadin/tests/applicationcontext/CloseSession.html
diff --git a/uitest/src/com/vaadin/tests/applicationcontext/RpcForClosedUI.html b/uitest/tb2/com/vaadin/tests/applicationcontext/RpcForClosedUI.html
index 642e31b22c..642e31b22c 100644
--- a/uitest/src/com/vaadin/tests/applicationcontext/RpcForClosedUI.html
+++ b/uitest/tb2/com/vaadin/tests/applicationcontext/RpcForClosedUI.html
diff --git a/uitest/src/com/vaadin/tests/applicationservlet/MultipleServletConfiguration.html b/uitest/tb2/com/vaadin/tests/applicationservlet/MultipleServletConfiguration.html
index 3b4452cc8d..3b4452cc8d 100644
--- a/uitest/src/com/vaadin/tests/applicationservlet/MultipleServletConfiguration.html
+++ b/uitest/tb2/com/vaadin/tests/applicationservlet/MultipleServletConfiguration.html
diff --git a/uitest/src/com/vaadin/tests/applicationservlet/SystemMessagesTest.html b/uitest/tb2/com/vaadin/tests/applicationservlet/SystemMessagesTest.html
index a764255b5b..a764255b5b 100644
--- a/uitest/src/com/vaadin/tests/applicationservlet/SystemMessagesTest.html
+++ b/uitest/tb2/com/vaadin/tests/applicationservlet/SystemMessagesTest.html
diff --git a/uitest/src/com/vaadin/tests/browserfeatures/FullHeightScrollbar.html b/uitest/tb2/com/vaadin/tests/browserfeatures/FullHeightScrollbar.html
index 37fee35746..37fee35746 100644
--- a/uitest/src/com/vaadin/tests/browserfeatures/FullHeightScrollbar.html
+++ b/uitest/tb2/com/vaadin/tests/browserfeatures/FullHeightScrollbar.html
diff --git a/uitest/src/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.html b/uitest/tb2/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.html
index a5296b8b4d..a5296b8b4d 100644
--- a/uitest/src/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.html
+++ b/uitest/tb2/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.html
diff --git a/uitest/src/com/vaadin/tests/componentlocator/TestDetachedNotPresent.html b/uitest/tb2/com/vaadin/tests/componentlocator/TestDetachedNotPresent.html
index 18129a72e2..18129a72e2 100644
--- a/uitest/src/com/vaadin/tests/componentlocator/TestDetachedNotPresent.html
+++ b/uitest/tb2/com/vaadin/tests/componentlocator/TestDetachedNotPresent.html
diff --git a/uitest/src/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.html b/uitest/tb2/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.html
index 512140cc6d..512140cc6d 100644
--- a/uitest/src/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.html
diff --git a/uitest/src/com/vaadin/tests/components/AddressFormExample.html b/uitest/tb2/com/vaadin/tests/components/AddressFormExample.html
index 5f1893a33c..5f1893a33c 100644
--- a/uitest/src/com/vaadin/tests/components/AddressFormExample.html
+++ b/uitest/tb2/com/vaadin/tests/components/AddressFormExample.html
diff --git a/uitest/src/com/vaadin/tests/components/DisableEnableCascade.html b/uitest/tb2/com/vaadin/tests/components/DisableEnableCascade.html
index 029da64754..029da64754 100644
--- a/uitest/src/com/vaadin/tests/components/DisableEnableCascade.html
+++ b/uitest/tb2/com/vaadin/tests/components/DisableEnableCascade.html
diff --git a/uitest/src/com/vaadin/tests/components/DisableEnableCascadeStyles.html b/uitest/tb2/com/vaadin/tests/components/DisableEnableCascadeStyles.html
index ac3a4f0cb0..ac3a4f0cb0 100644
--- a/uitest/src/com/vaadin/tests/components/DisableEnableCascadeStyles.html
+++ b/uitest/tb2/com/vaadin/tests/components/DisableEnableCascadeStyles.html
diff --git a/uitest/src/com/vaadin/tests/components/ErrorMessages.html b/uitest/tb2/com/vaadin/tests/components/ErrorMessages.html
index 2b7032ea79..2b7032ea79 100644
--- a/uitest/src/com/vaadin/tests/components/ErrorMessages.html
+++ b/uitest/tb2/com/vaadin/tests/components/ErrorMessages.html
diff --git a/uitest/src/com/vaadin/tests/components/FileDownloaderTest.html b/uitest/tb2/com/vaadin/tests/components/FileDownloaderTest.html
index bfe87091cc..bfe87091cc 100644
--- a/uitest/src/com/vaadin/tests/components/FileDownloaderTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/FileDownloaderTest.html
diff --git a/uitest/src/com/vaadin/tests/components/HierarchyChangeForRemovedComponentContainers.html b/uitest/tb2/com/vaadin/tests/components/HierarchyChangeForRemovedComponentContainers.html
index 49b02d3f01..49b02d3f01 100644
--- a/uitest/src/com/vaadin/tests/components/HierarchyChangeForRemovedComponentContainers.html
+++ b/uitest/tb2/com/vaadin/tests/components/HierarchyChangeForRemovedComponentContainers.html
diff --git a/uitest/src/com/vaadin/tests/components/LayoutAttachListenerInfo.html b/uitest/tb2/com/vaadin/tests/components/LayoutAttachListenerInfo.html
index 10dd21d240..10dd21d240 100644
--- a/uitest/src/com/vaadin/tests/components/LayoutAttachListenerInfo.html
+++ b/uitest/tb2/com/vaadin/tests/components/LayoutAttachListenerInfo.html
diff --git a/uitest/src/com/vaadin/tests/components/OutOfSyncTest.html b/uitest/tb2/com/vaadin/tests/components/OutOfSyncTest.html
index 4828069e2a..4828069e2a 100644
--- a/uitest/src/com/vaadin/tests/components/OutOfSyncTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/OutOfSyncTest.html
diff --git a/uitest/src/com/vaadin/tests/components/TooltipsOnScrollingWindow.html b/uitest/tb2/com/vaadin/tests/components/TooltipsOnScrollingWindow.html
index b251cdf03b..b251cdf03b 100644
--- a/uitest/src/com/vaadin/tests/components/TooltipsOnScrollingWindow.html
+++ b/uitest/tb2/com/vaadin/tests/components/TooltipsOnScrollingWindow.html
diff --git a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.html b/uitest/tb2/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.html
index ff5c890abf..ff5c890abf 100644
--- a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.html
+++ b/uitest/tb2/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.html
diff --git a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutCorrectPositioningOfHiddenField.html b/uitest/tb2/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutCorrectPositioningOfHiddenField.html
index f00d6b15f9..f00d6b15f9 100644
--- a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutCorrectPositioningOfHiddenField.html
+++ b/uitest/tb2/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutCorrectPositioningOfHiddenField.html
diff --git a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutPrimaryStylename.html b/uitest/tb2/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutPrimaryStylename.html
index fccbb29b8b..fccbb29b8b 100644
--- a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutPrimaryStylename.html
+++ b/uitest/tb2/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutPrimaryStylename.html
diff --git a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutResizing.html b/uitest/tb2/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutResizing.html
index 01206b317c..01206b317c 100644
--- a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutResizing.html
+++ b/uitest/tb2/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutResizing.html
diff --git a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutWrapperStyles.html b/uitest/tb2/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutWrapperStyles.html
index 1b92e3cdc5..1b92e3cdc5 100644
--- a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutWrapperStyles.html
+++ b/uitest/tb2/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutWrapperStyles.html
diff --git a/uitest/src/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html b/uitest/tb2/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html
index bb74775912..bb74775912 100644
--- a/uitest/src/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html
+++ b/uitest/tb2/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html
diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/EnableState.html b/uitest/tb2/com/vaadin/tests/components/abstractcomponent/EnableState.html
index dacd5c5009..dacd5c5009 100644
--- a/uitest/src/com/vaadin/tests/components/abstractcomponent/EnableState.html
+++ b/uitest/tb2/com/vaadin/tests/components/abstractcomponent/EnableState.html
diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.html b/uitest/tb2/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.html
index 0bdde03ec7..0bdde03ec7 100644
--- a/uitest/src/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.html
diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/TooltipTests.html b/uitest/tb2/com/vaadin/tests/components/abstractcomponent/TooltipTests.html
index 3cea965690..3cea965690 100644
--- a/uitest/src/com/vaadin/tests/components/abstractcomponent/TooltipTests.html
+++ b/uitest/tb2/com/vaadin/tests/components/abstractcomponent/TooltipTests.html
diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/UseStateFromHierarchy.html b/uitest/tb2/com/vaadin/tests/components/abstractcomponent/UseStateFromHierarchy.html
index 225b901413..225b901413 100644
--- a/uitest/src/com/vaadin/tests/components/abstractcomponent/UseStateFromHierarchy.html
+++ b/uitest/tb2/com/vaadin/tests/components/abstractcomponent/UseStateFromHierarchy.html
diff --git a/uitest/src/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSource.html b/uitest/tb2/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSource.html
index 37186bd901..37186bd901 100644
--- a/uitest/src/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSource.html
+++ b/uitest/tb2/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSource.html
diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.html b/uitest/tb2/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.html
index 6a47032545..6a47032545 100644
--- a/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.html
+++ b/uitest/tb2/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.html
diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.html b/uitest/tb2/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.html
index f99bdea946..f99bdea946 100644
--- a/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.html
+++ b/uitest/tb2/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.html
diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.html b/uitest/tb2/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.html
index bc013f42ef..bc013f42ef 100644
--- a/uitest/src/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.html
+++ b/uitest/tb2/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.html
diff --git a/uitest/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.html b/uitest/tb2/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.html
index 9023c97cda..9023c97cda 100644
--- a/uitest/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.html
+++ b/uitest/tb2/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.html
diff --git a/uitest/src/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.html b/uitest/tb2/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.html
index 6f888f7467..6f888f7467 100644
--- a/uitest/src/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.html
+++ b/uitest/tb2/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.html
diff --git a/uitest/src/com/vaadin/tests/components/accordion/AccordionTabStylenames.html b/uitest/tb2/com/vaadin/tests/components/accordion/AccordionTabStylenames.html
index 4870777717..4870777717 100644
--- a/uitest/src/com/vaadin/tests/components/accordion/AccordionTabStylenames.html
+++ b/uitest/tb2/com/vaadin/tests/components/accordion/AccordionTabStylenames.html
diff --git a/uitest/src/com/vaadin/tests/components/accordion/AccordionTheme.html b/uitest/tb2/com/vaadin/tests/components/accordion/AccordionTheme.html
index 4d04d30d88..4d04d30d88 100644
--- a/uitest/src/com/vaadin/tests/components/accordion/AccordionTheme.html
+++ b/uitest/tb2/com/vaadin/tests/components/accordion/AccordionTheme.html
diff --git a/uitest/src/com/vaadin/tests/components/accordion/RemoveTabs.html b/uitest/tb2/com/vaadin/tests/components/accordion/RemoveTabs.html
index ec24ade8ce..ec24ade8ce 100644
--- a/uitest/src/com/vaadin/tests/components/accordion/RemoveTabs.html
+++ b/uitest/tb2/com/vaadin/tests/components/accordion/RemoveTabs.html
diff --git a/uitest/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.html b/uitest/tb2/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.html
index e40be7dc15..e40be7dc15 100644
--- a/uitest/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.html
+++ b/uitest/tb2/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.html
diff --git a/uitest/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html b/uitest/tb2/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html
index a37e8ea662..a37e8ea662 100644
--- a/uitest/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html
+++ b/uitest/tb2/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html
diff --git a/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameIsVisible.html b/uitest/tb2/com/vaadin/tests/components/browserframe/BrowserFrameIsVisible.html
index 93b855838c..93b855838c 100644
--- a/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameIsVisible.html
+++ b/uitest/tb2/com/vaadin/tests/components/browserframe/BrowserFrameIsVisible.html
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonDisableEnableOnClick.html b/uitest/tb2/com/vaadin/tests/components/button/ButtonDisableEnableOnClick.html
index a3cdb64aec..a3cdb64aec 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonDisableEnableOnClick.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/ButtonDisableEnableOnClick.html
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonDisableOnClick.html b/uitest/tb2/com/vaadin/tests/components/button/ButtonDisableOnClick.html
index d39f72ef1f..d39f72ef1f 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonDisableOnClick.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/ButtonDisableOnClick.html
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.html b/uitest/tb2/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.html
index 5ec33f09fa..5ec33f09fa 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.html
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonHtml.html b/uitest/tb2/com/vaadin/tests/components/button/ButtonHtml.html
index 2d58d0e2e1..2d58d0e2e1 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonHtml.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/ButtonHtml.html
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonToggleIcons.html b/uitest/tb2/com/vaadin/tests/components/button/ButtonToggleIcons.html
index 642abd8120..642abd8120 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonToggleIcons.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/ButtonToggleIcons.html
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonUpdateAltText.html b/uitest/tb2/com/vaadin/tests/components/button/ButtonUpdateAltText.html
index 3608851f9c..3608851f9c 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonUpdateAltText.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/ButtonUpdateAltText.html
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonWithShortcutNotRendered.html b/uitest/tb2/com/vaadin/tests/components/button/ButtonWithShortcutNotRendered.html
index a4e36b6f44..a4e36b6f44 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonWithShortcutNotRendered.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/ButtonWithShortcutNotRendered.html
diff --git a/uitest/src/com/vaadin/tests/components/button/Buttons-chameleon.html b/uitest/tb2/com/vaadin/tests/components/button/Buttons-chameleon.html
index 4830c79bcf..4830c79bcf 100644
--- a/uitest/src/com/vaadin/tests/components/button/Buttons-chameleon.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/Buttons-chameleon.html
diff --git a/uitest/src/com/vaadin/tests/components/button/Buttons-reindeer.html b/uitest/tb2/com/vaadin/tests/components/button/Buttons-reindeer.html
index 43e554bec5..43e554bec5 100644
--- a/uitest/src/com/vaadin/tests/components/button/Buttons-reindeer.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/Buttons-reindeer.html
diff --git a/uitest/src/com/vaadin/tests/components/button/Buttons-runo.html b/uitest/tb2/com/vaadin/tests/components/button/Buttons-runo.html
index 27779f170b..27779f170b 100644
--- a/uitest/src/com/vaadin/tests/components/button/Buttons-runo.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/Buttons-runo.html
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonsAndIcons-chameleon.html b/uitest/tb2/com/vaadin/tests/components/button/ButtonsAndIcons-chameleon.html
index 5425ebb716..5425ebb716 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonsAndIcons-chameleon.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/ButtonsAndIcons-chameleon.html
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonsAndIcons-reindeer.html b/uitest/tb2/com/vaadin/tests/components/button/ButtonsAndIcons-reindeer.html
index 6bee11d561..6bee11d561 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonsAndIcons-reindeer.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/ButtonsAndIcons-reindeer.html
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonsAndIcons-runo.html b/uitest/tb2/com/vaadin/tests/components/button/ButtonsAndIcons-runo.html
index 8084a58536..8084a58536 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonsAndIcons-runo.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/ButtonsAndIcons-runo.html
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.html b/uitest/tb2/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.html
index cb3b5e66ee..cb3b5e66ee 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.html
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonsWaiAria.html b/uitest/tb2/com/vaadin/tests/components/button/ButtonsWaiAria.html
index 8d10438c1d..8d10438c1d 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonsWaiAria.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/ButtonsWaiAria.html
diff --git a/uitest/src/com/vaadin/tests/components/button/DisabledButtons.html b/uitest/tb2/com/vaadin/tests/components/button/DisabledButtons.html
index 65584fd4d0..65584fd4d0 100644
--- a/uitest/src/com/vaadin/tests/components/button/DisabledButtons.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/DisabledButtons.html
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarActions.html b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarActions.html
index bec3f2aded..bec3f2aded 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarActions.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarActions.html
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarBasicNavigation.html b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarBasicNavigation.html
index cccb88bfb2..cccb88bfb2 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarBasicNavigation.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarBasicNavigation.html
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarDragAndDrop.html b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarDragAndDrop.html
index b0a702adc0..b0a702adc0 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarDragAndDrop.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarDragAndDrop.html
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarEventSizingNoOverlap.html b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarEventSizingNoOverlap.html
index dcf6c1ec53..dcf6c1ec53 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarEventSizingNoOverlap.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarEventSizingNoOverlap.html
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarMidnightEventsTest.html b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarMidnightEventsTest.html
index 8991e1983d..8991e1983d 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarMidnightEventsTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarMidnightEventsTest.html
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarMonthlyViewNewEvent.html b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarMonthlyViewNewEvent.html
index 760beef6c0..760beef6c0 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarMonthlyViewNewEvent.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarMonthlyViewNewEvent.html
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarMonthlyViewNewEvents.html b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarMonthlyViewNewEvents.html
index 68690f81b4..68690f81b4 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarMonthlyViewNewEvents.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarMonthlyViewNewEvents.html
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarSizeTest1000x600px.html b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTest1000x600px.html
index bd4c671361..bd4c671361 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarSizeTest1000x600px.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTest1000x600px.html
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarSizeTest100percentXundefined.html b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTest100percentXundefined.html
index 64b5444d34..64b5444d34 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarSizeTest100percentXundefined.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTest100percentXundefined.html
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarSizeTest100x100percent.html b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTest100x100percent.html
index 0905034b13..0905034b13 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarSizeTest100x100percent.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTest100x100percent.html
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarSizeTest300pxXundefined.html b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTest300pxXundefined.html
index 99327a01df..99327a01df 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarSizeTest300pxXundefined.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTest300pxXundefined.html
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarSizeTestUndefinedX100percent.html b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTestUndefinedX100percent.html
index 2e4c811ff1..2e4c811ff1 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarSizeTestUndefinedX100percent.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTestUndefinedX100percent.html
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarSizeTestUndefinedX300px.html b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTestUndefinedX300px.html
index cca66c7145..cca66c7145 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarSizeTestUndefinedX300px.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTestUndefinedX300px.html
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarSizeTestUndefinedXUndefined.html b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTestUndefinedXUndefined.html
index e4a8da691b..e4a8da691b 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarSizeTestUndefinedXUndefined.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTestUndefinedXUndefined.html
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarVisibleHours24H.html b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarVisibleHours24H.html
index 6b7bb26b76..6b7bb26b76 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarVisibleHours24H.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarVisibleHours24H.html
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarWeeklyViewNewEvents.html b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarWeeklyViewNewEvents.html
index 6add1deba5..6add1deba5 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarWeeklyViewNewEvents.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarWeeklyViewNewEvents.html
diff --git a/uitest/src/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.html b/uitest/tb2/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.html
index 38a6be24ce..38a6be24ce 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.html
diff --git a/uitest/src/com/vaadin/tests/components/caption/EmptyCaptions.html b/uitest/tb2/com/vaadin/tests/components/caption/EmptyCaptions.html
index f1ede9a04b..f1ede9a04b 100644
--- a/uitest/src/com/vaadin/tests/components/caption/EmptyCaptions.html
+++ b/uitest/tb2/com/vaadin/tests/components/caption/EmptyCaptions.html
diff --git a/uitest/src/com/vaadin/tests/components/caption/LargeCaptionIcon.html b/uitest/tb2/com/vaadin/tests/components/caption/LargeCaptionIcon.html
index 7c94821e7f..7c94821e7f 100644
--- a/uitest/src/com/vaadin/tests/components/caption/LargeCaptionIcon.html
+++ b/uitest/tb2/com/vaadin/tests/components/caption/LargeCaptionIcon.html
diff --git a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxDisabledReadOnlyValueChange.html b/uitest/tb2/com/vaadin/tests/components/checkbox/CheckBoxDisabledReadOnlyValueChange.html
index ddcdc68691..ddcdc68691 100644
--- a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxDisabledReadOnlyValueChange.html
+++ b/uitest/tb2/com/vaadin/tests/components/checkbox/CheckBoxDisabledReadOnlyValueChange.html
diff --git a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxRevertValueChange.html b/uitest/tb2/com/vaadin/tests/components/checkbox/CheckBoxRevertValueChange.html
index ea5849f99f..ea5849f99f 100644
--- a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxRevertValueChange.html
+++ b/uitest/tb2/com/vaadin/tests/components/checkbox/CheckBoxRevertValueChange.html
diff --git a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxes.html b/uitest/tb2/com/vaadin/tests/components/checkbox/CheckBoxes.html
index 601be4e1cb..601be4e1cb 100644
--- a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxes.html
+++ b/uitest/tb2/com/vaadin/tests/components/checkbox/CheckBoxes.html
diff --git a/uitest/src/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.html b/uitest/tb2/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.html
index 26ecc95721..26ecc95721 100644
--- a/uitest/src/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.html
+++ b/uitest/tb2/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.html
diff --git a/uitest/src/com/vaadin/tests/components/colorpicker/ColorPickerHsvTest.html b/uitest/tb2/com/vaadin/tests/components/colorpicker/ColorPickerHsvTest.html
index 1c53673b41..1c53673b41 100644
--- a/uitest/src/com/vaadin/tests/components/colorpicker/ColorPickerHsvTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/colorpicker/ColorPickerHsvTest.html
diff --git a/uitest/src/com/vaadin/tests/components/colorpicker/ColorPickerTest.html b/uitest/tb2/com/vaadin/tests/components/colorpicker/ColorPickerTest.html
index 48a4219c87..48a4219c87 100644
--- a/uitest/src/com/vaadin/tests/components/colorpicker/ColorPickerTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/colorpicker/ColorPickerTest.html
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxBorder.html b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxBorder.html
index 7e7bb7722d..7e7bb7722d 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxBorder.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxBorder.html
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.html b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.html
index 1689c7c1fc..1689c7c1fc 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.html
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.html b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.html
index cab8bbc996..cab8bbc996 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.html
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.html b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.html
index 1459a30985..1459a30985 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.html
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html
index 6e6e87bc7e..6e6e87bc7e 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html
index fd2aceb7f2..fd2aceb7f2 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.html b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxNavigation.html
index 03de00a6f1..03de00a6f1 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxNavigation.html
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.html b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.html
index 2066da47c1..2066da47c1 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.html
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNullItem.html b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxNullItem.html
index 3dc31f4a98..3dc31f4a98 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNullItem.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxNullItem.html
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxPageLength.html b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxPageLength.html
index 3f0782742f..3f0782742f 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxPageLength.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxPageLength.html
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxParentDisable.html b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxParentDisable.html
index ab8c4f81d0..ab8c4f81d0 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxParentDisable.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxParentDisable.html
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html
index 50b95bfdc2..50b95bfdc2 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxRemoveAllItems.html b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxRemoveAllItems.html
index eec15d0b40..eec15d0b40 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxRemoveAllItems.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxRemoveAllItems.html
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.html b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.html
index f3f44a5d90..f3f44a5d90 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.html
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.html b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.html
index ba251e5cc0..ba251e5cc0 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.html
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.html b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.html
index 8366f2dc8c..8366f2dc8c 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.html
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.html b/uitest/tb2/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.html
index 4d91ce7838..4d91ce7838 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.html
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.html b/uitest/tb2/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.html
index 1b7b42a4e3..1b7b42a4e3 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.html
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboboxPrimaryStyleName.html b/uitest/tb2/com/vaadin/tests/components/combobox/ComboboxPrimaryStyleName.html
index 649dda72f8..649dda72f8 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboboxPrimaryStyleName.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboboxPrimaryStyleName.html
diff --git a/uitest/src/com/vaadin/tests/components/combobox/Comboboxes.html b/uitest/tb2/com/vaadin/tests/components/combobox/Comboboxes.html
index 4aa84a9453..4aa84a9453 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/Comboboxes.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/Comboboxes.html
diff --git a/uitest/src/com/vaadin/tests/components/combobox/EscapeClosesComboboxNotWindow.html b/uitest/tb2/com/vaadin/tests/components/combobox/EscapeClosesComboboxNotWindow.html
index 312fffcb97..312fffcb97 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/EscapeClosesComboboxNotWindow.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/EscapeClosesComboboxNotWindow.html
diff --git a/uitest/src/com/vaadin/tests/components/combobox/PopUpWidth.html b/uitest/tb2/com/vaadin/tests/components/combobox/PopUpWidth.html
index 35a6bcf29a..35a6bcf29a 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/PopUpWidth.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/PopUpWidth.html
diff --git a/uitest/src/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.html b/uitest/tb2/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.html
index fc3862ebb7..fc3862ebb7 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.html
diff --git a/uitest/src/com/vaadin/tests/components/combobox/WidthToggleReadOnly.html b/uitest/tb2/com/vaadin/tests/components/combobox/WidthToggleReadOnly.html
index b661aa2bd7..b661aa2bd7 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/WidthToggleReadOnly.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/WidthToggleReadOnly.html
diff --git a/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.html b/uitest/tb2/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.html
index 0a1b7212c9..0a1b7212c9 100644
--- a/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.html
+++ b/uitest/tb2/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.html
diff --git a/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentHideContent.html b/uitest/tb2/com/vaadin/tests/components/customcomponent/CustomComponentHideContent.html
index 0616c10ab3..0616c10ab3 100644
--- a/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentHideContent.html
+++ b/uitest/tb2/com/vaadin/tests/components/customcomponent/CustomComponentHideContent.html
diff --git a/uitest/src/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.html b/uitest/tb2/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.html
index 268d3074f7..268d3074f7 100644
--- a/uitest/src/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.html
+++ b/uitest/tb2/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.html
diff --git a/uitest/src/com/vaadin/tests/components/customfield/BooleanFieldExample.html b/uitest/tb2/com/vaadin/tests/components/customfield/BooleanFieldExample.html
index 6b1b3e8a2d..6b1b3e8a2d 100644
--- a/uitest/src/com/vaadin/tests/components/customfield/BooleanFieldExample.html
+++ b/uitest/tb2/com/vaadin/tests/components/customfield/BooleanFieldExample.html
diff --git a/uitest/src/com/vaadin/tests/components/customfield/EmbeddedFormExample.html b/uitest/tb2/com/vaadin/tests/components/customfield/EmbeddedFormExample.html
index 2af441bc83..2af441bc83 100644
--- a/uitest/src/com/vaadin/tests/components/customfield/EmbeddedFormExample.html
+++ b/uitest/tb2/com/vaadin/tests/components/customfield/EmbeddedFormExample.html
diff --git a/uitest/src/com/vaadin/tests/components/customfield/NestedFormExample.html b/uitest/tb2/com/vaadin/tests/components/customfield/NestedFormExample.html
index f9f5783c05..f9f5783c05 100644
--- a/uitest/src/com/vaadin/tests/components/customfield/NestedFormExample.html
+++ b/uitest/tb2/com/vaadin/tests/components/customfield/NestedFormExample.html
diff --git a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutPrimaryStyleName.html b/uitest/tb2/com/vaadin/tests/components/customlayout/CustomLayoutPrimaryStyleName.html
index 0a5654bb1f..0a5654bb1f 100644
--- a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutPrimaryStyleName.html
+++ b/uitest/tb2/com/vaadin/tests/components/customlayout/CustomLayoutPrimaryStyleName.html
diff --git a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.html b/uitest/tb2/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.html
index 78a87894c6..78a87894c6 100644
--- a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.html
+++ b/uitest/tb2/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.html
diff --git a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.html b/uitest/tb2/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.html
index 7fe2e4c07c..7fe2e4c07c 100644
--- a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.html
+++ b/uitest/tb2/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/CommitInvalid.html b/uitest/tb2/com/vaadin/tests/components/datefield/CommitInvalid.html
index 8420888098..8420888098 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/CommitInvalid.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/CommitInvalid.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormat.html b/uitest/tb2/com/vaadin/tests/components/datefield/CustomDateFormat.html
index ed92afe378..ed92afe378 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormat.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/CustomDateFormat.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.html b/uitest/tb2/com/vaadin/tests/components/datefield/CustomDateFormats.html
index b20e7295f7..b20e7295f7 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/CustomDateFormats.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html
index f387695b5f..f387695b5f 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldExtendedRange.html b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldExtendedRange.html
index 266a1a379d..266a1a379d 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldExtendedRange.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldExtendedRange.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.html b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldInSubWindow.html
index f2ef2123f6..f2ef2123f6 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldInSubWindow.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.html b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.html
index f7541f0270..f7541f0270 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPrimaryStyleNames.html b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldPrimaryStyleNames.html
index 38034fd0c8..38034fd0c8 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPrimaryStyleNames.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldPrimaryStyleNames.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldRangeValidation.html b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldRangeValidation.html
index 444f8e3bac..444f8e3bac 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldRangeValidation.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldRangeValidation.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldRanges_ChangingRangeSoValueFallsOutsideRangeCausesOutOfRangeExceptionIfImmediateField.html b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldRanges_ChangingRangeSoValueFallsOutsideRangeCausesOutOfRangeExceptionIfImmediateField.html
index ca5c006e82..ca5c006e82 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldRanges_ChangingRangeSoValueFallsOutsideRangeCausesOutOfRangeExceptionIfImmediateField.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldRanges_ChangingRangeSoValueFallsOutsideRangeCausesOutOfRangeExceptionIfImmediateField.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldRanges_EndRangeEarlierThanStartRangeCausesException.html b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldRanges_EndRangeEarlierThanStartRangeCausesException.html
index b19f519cb1..b19f519cb1 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldRanges_EndRangeEarlierThanStartRangeCausesException.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldRanges_EndRangeEarlierThanStartRangeCausesException.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldRanges_InitialDatesOutsideRange.html b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldRanges_InitialDatesOutsideRange.html
index eeeda5270b..eeeda5270b 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldRanges_InitialDatesOutsideRange.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldRanges_InitialDatesOutsideRange.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldRanges_MonthChangeMeansFocusDayRolledInsideRange.html b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldRanges_MonthChangeMeansFocusDayRolledInsideRange.html
index 1135c650f5..1135c650f5 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldRanges_MonthChangeMeansFocusDayRolledInsideRange.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldRanges_MonthChangeMeansFocusDayRolledInsideRange.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldRanges_NextYearClickableIfRangeAcceptsFractionOfNextYear.html b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldRanges_NextYearClickableIfRangeAcceptsFractionOfNextYear.html
index f5d7ee97ca..f5d7ee97ca 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldRanges_NextYearClickableIfRangeAcceptsFractionOfNextYear.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldRanges_NextYearClickableIfRangeAcceptsFractionOfNextYear.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldRanges_PrevYearClickableIfRangeAcceptsFractionOfPrevYear.html b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldRanges_PrevYearClickableIfRangeAcceptsFractionOfPrevYear.html
index 4c671b266d..4c671b266d 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldRanges_PrevYearClickableIfRangeAcceptsFractionOfPrevYear.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldRanges_PrevYearClickableIfRangeAcceptsFractionOfPrevYear.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldRanges_SettingValueOutsideRangeCausesException.html b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldRanges_SettingValueOutsideRangeCausesException.html
index c3f7e021a8..c3f7e021a8 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldRanges_SettingValueOutsideRangeCausesException.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldRanges_SettingValueOutsideRangeCausesException.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldTimezone.html b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldTimezone.html
index be325ef2eb..be325ef2eb 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldTimezone.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/DateFieldTimezone.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DatePopupStyleName.html b/uitest/tb2/com/vaadin/tests/components/datefield/DatePopupStyleName.html
index f367fc383b..f367fc383b 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DatePopupStyleName.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/DatePopupStyleName.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.html b/uitest/tb2/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.html
index 75c19945b0..75c19945b0 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html b/uitest/tb2/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html
index 13f918302b..13f918302b 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/InlineDateFieldValueChange.html b/uitest/tb2/com/vaadin/tests/components/datefield/InlineDateFieldValueChange.html
index 9614afb09b..9614afb09b 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/InlineDateFieldValueChange.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/InlineDateFieldValueChange.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/InlineDateFieldsHiddenOnStart.html b/uitest/tb2/com/vaadin/tests/components/datefield/InlineDateFieldsHiddenOnStart.html
index 6b79ef419b..6b79ef419b 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/InlineDateFieldsHiddenOnStart.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/InlineDateFieldsHiddenOnStart.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.html b/uitest/tb2/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.html
index 9852b30ae7..9852b30ae7 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldDisabledReadonly.html b/uitest/tb2/com/vaadin/tests/components/datefield/PopupDateFieldDisabledReadonly.html
index 009ca0aaf9..009ca0aaf9 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldDisabledReadonly.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/PopupDateFieldDisabledReadonly.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldLocaleTest.html b/uitest/tb2/com/vaadin/tests/components/datefield/PopupDateFieldLocaleTest.html
index 932ad0646e..932ad0646e 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldLocaleTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/PopupDateFieldLocaleTest.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldMonth.html b/uitest/tb2/com/vaadin/tests/components/datefield/PopupDateFieldMonth.html
index 9111388f5a..9111388f5a 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldMonth.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/PopupDateFieldMonth.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldPopup.html b/uitest/tb2/com/vaadin/tests/components/datefield/PopupDateFieldPopup.html
index 1ec418e523..1ec418e523 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldPopup.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/PopupDateFieldPopup.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html b/uitest/tb2/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html
index d799c776d0..d799c776d0 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldTest.html b/uitest/tb2/com/vaadin/tests/components/datefield/PopupDateFieldTest.html
index eb9859bf9d..eb9859bf9d 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/PopupDateFieldTest.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.html b/uitest/tb2/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.html
index 18f0ce0da2..18f0ce0da2 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/RequiredInvalidDateField.html b/uitest/tb2/com/vaadin/tests/components/datefield/RequiredInvalidDateField.html
index 6dc46e4eec..6dc46e4eec 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/RequiredInvalidDateField.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/RequiredInvalidDateField.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.html b/uitest/tb2/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.html
index 1cd79338e9..1cd79338e9 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/TestDatefieldYear.html b/uitest/tb2/com/vaadin/tests/components/datefield/TestDatefieldYear.html
index 71c246593a..71c246593a 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/TestDatefieldYear.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/TestDatefieldYear.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullInlineDateField.html b/uitest/tb2/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullInlineDateField.html
index 7f4cd92be2..7f4cd92be2 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullInlineDateField.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullInlineDateField.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullPopupDateField.html b/uitest/tb2/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullPopupDateField.html
index 9db6763296..9db6763296 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullPopupDateField.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullPopupDateField.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/ValueThroughProperty.html b/uitest/tb2/com/vaadin/tests/components/datefield/ValueThroughProperty.html
index 07b8b1b237..07b8b1b237 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/ValueThroughProperty.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/ValueThroughProperty.html
diff --git a/uitest/src/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.html b/uitest/tb2/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.html
index 70441efd9f..70441efd9f 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.html
+++ b/uitest/tb2/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.html
diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.html b/uitest/tb2/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.html
index 50b66a3b68..50b66a3b68 100644
--- a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.html
+++ b/uitest/tb2/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.html
diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperInPanel.html b/uitest/tb2/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperInPanel.html
index e98c8bd41c..e98c8bd41c 100644
--- a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperInPanel.html
+++ b/uitest/tb2/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperInPanel.html
diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.html b/uitest/tb2/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.html
index c85d7e0626..c85d7e0626 100644
--- a/uitest/src/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.html
+++ b/uitest/tb2/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.html
diff --git a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedAltText.html b/uitest/tb2/com/vaadin/tests/components/embedded/EmbeddedAltText.html
index 066c55fe55..066c55fe55 100644
--- a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedAltText.html
+++ b/uitest/tb2/com/vaadin/tests/components/embedded/EmbeddedAltText.html
diff --git a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.html b/uitest/tb2/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.html
index ae81cfe61c..ae81cfe61c 100644
--- a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.html
+++ b/uitest/tb2/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.html
diff --git a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedPdf.html b/uitest/tb2/com/vaadin/tests/components/embedded/EmbeddedPdf.html
index c550b0f5d9..c550b0f5d9 100644
--- a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedPdf.html
+++ b/uitest/tb2/com/vaadin/tests/components/embedded/EmbeddedPdf.html
diff --git a/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisible.html b/uitest/tb2/com/vaadin/tests/components/embedded/FlashIsVisible.html
index ffa2ac11ec..ffa2ac11ec 100644
--- a/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisible.html
+++ b/uitest/tb2/com/vaadin/tests/components/embedded/FlashIsVisible.html
diff --git a/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.html b/uitest/tb2/com/vaadin/tests/components/flash/FlashIsVisible.html
index f3f8f50526..f3f8f50526 100644
--- a/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.html
+++ b/uitest/tb2/com/vaadin/tests/components/flash/FlashIsVisible.html
diff --git a/uitest/src/com/vaadin/tests/components/form/FormCaptionClickFocusing.html b/uitest/tb2/com/vaadin/tests/components/form/FormCaptionClickFocusing.html
index 14dbc6d4c8..14dbc6d4c8 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormCaptionClickFocusing.html
+++ b/uitest/tb2/com/vaadin/tests/components/form/FormCaptionClickFocusing.html
diff --git a/uitest/src/com/vaadin/tests/components/form/FormClearDatasourceRepaint.html b/uitest/tb2/com/vaadin/tests/components/form/FormClearDatasourceRepaint.html
index 200ddb547d..200ddb547d 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormClearDatasourceRepaint.html
+++ b/uitest/tb2/com/vaadin/tests/components/form/FormClearDatasourceRepaint.html
diff --git a/uitest/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.html b/uitest/tb2/com/vaadin/tests/components/form/FormCommitWithInvalidValues.html
index 0d5b435609..0d5b435609 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.html
+++ b/uitest/tb2/com/vaadin/tests/components/form/FormCommitWithInvalidValues.html
diff --git a/uitest/src/com/vaadin/tests/components/form/FormDescription.html b/uitest/tb2/com/vaadin/tests/components/form/FormDescription.html
index 7cf93c6125..7cf93c6125 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormDescription.html
+++ b/uitest/tb2/com/vaadin/tests/components/form/FormDescription.html
diff --git a/uitest/src/com/vaadin/tests/components/form/FormDescriptions.html b/uitest/tb2/com/vaadin/tests/components/form/FormDescriptions.html
index 1c6562ac52..1c6562ac52 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormDescriptions.html
+++ b/uitest/tb2/com/vaadin/tests/components/form/FormDescriptions.html
diff --git a/uitest/src/com/vaadin/tests/components/form/FormErrorVisible.html b/uitest/tb2/com/vaadin/tests/components/form/FormErrorVisible.html
index 4abf8dc6ec..4abf8dc6ec 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormErrorVisible.html
+++ b/uitest/tb2/com/vaadin/tests/components/form/FormErrorVisible.html
diff --git a/uitest/src/com/vaadin/tests/components/form/FormFieldCaptionsStyles.html b/uitest/tb2/com/vaadin/tests/components/form/FormFieldCaptionsStyles.html
index 10ebb37529..10ebb37529 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormFieldCaptionsStyles.html
+++ b/uitest/tb2/com/vaadin/tests/components/form/FormFieldCaptionsStyles.html
diff --git a/uitest/src/com/vaadin/tests/components/form/FormFieldFactoryAndLayouts.html b/uitest/tb2/com/vaadin/tests/components/form/FormFieldFactoryAndLayouts.html
index c9d3dbef93..c9d3dbef93 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormFieldFactoryAndLayouts.html
+++ b/uitest/tb2/com/vaadin/tests/components/form/FormFieldFactoryAndLayouts.html
diff --git a/uitest/src/com/vaadin/tests/components/form/FormPrimaryStyleName.html b/uitest/tb2/com/vaadin/tests/components/form/FormPrimaryStyleName.html
index a4b738a36d..a4b738a36d 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormPrimaryStyleName.html
+++ b/uitest/tb2/com/vaadin/tests/components/form/FormPrimaryStyleName.html
diff --git a/uitest/src/com/vaadin/tests/components/form/FormWithEnterShortcut.html b/uitest/tb2/com/vaadin/tests/components/form/FormWithEnterShortcut.html
index 9680ef7022..9680ef7022 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormWithEnterShortcut.html
+++ b/uitest/tb2/com/vaadin/tests/components/form/FormWithEnterShortcut.html
diff --git a/uitest/src/com/vaadin/tests/components/form/FormWithPaddingsAndBorders.html b/uitest/tb2/com/vaadin/tests/components/form/FormWithPaddingsAndBorders.html
index 384cc6c398..384cc6c398 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormWithPaddingsAndBorders.html
+++ b/uitest/tb2/com/vaadin/tests/components/form/FormWithPaddingsAndBorders.html
diff --git a/uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.html b/uitest/tb2/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.html
index ade84de312..ade84de312 100644
--- a/uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.html
+++ b/uitest/tb2/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.html
diff --git a/uitest/src/com/vaadin/tests/components/formlayout/CaptionEnableDisable.html b/uitest/tb2/com/vaadin/tests/components/formlayout/CaptionEnableDisable.html
index 87bf0edb49..87bf0edb49 100644
--- a/uitest/src/com/vaadin/tests/components/formlayout/CaptionEnableDisable.html
+++ b/uitest/tb2/com/vaadin/tests/components/formlayout/CaptionEnableDisable.html
diff --git a/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.html b/uitest/tb2/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.html
index 14b5cc4c53..14b5cc4c53 100644
--- a/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.html
+++ b/uitest/tb2/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.html
diff --git a/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.html b/uitest/tb2/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.html
index 7733da4e95..7733da4e95 100644
--- a/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.html
+++ b/uitest/tb2/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.html
diff --git a/uitest/src/com/vaadin/tests/components/formlayout/NestedFormLayouts.html b/uitest/tb2/com/vaadin/tests/components/formlayout/NestedFormLayouts.html
index a95aecac80..a95aecac80 100644
--- a/uitest/src/com/vaadin/tests/components/formlayout/NestedFormLayouts.html
+++ b/uitest/tb2/com/vaadin/tests/components/formlayout/NestedFormLayouts.html
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/InsertRowInMiddle.html b/uitest/tb2/com/vaadin/tests/components/gridlayout/InsertRowInMiddle.html
index 7de29edd1b..7de29edd1b 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/InsertRowInMiddle.html
+++ b/uitest/tb2/com/vaadin/tests/components/gridlayout/InsertRowInMiddle.html
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.html b/uitest/tb2/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.html
index 0ad58823be..0ad58823be 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.html
+++ b/uitest/tb2/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.html
diff --git a/uitest/src/com/vaadin/tests/components/image/ImageAltText.html b/uitest/tb2/com/vaadin/tests/components/image/ImageAltText.html
index 743aa5caaf..743aa5caaf 100644
--- a/uitest/src/com/vaadin/tests/components/image/ImageAltText.html
+++ b/uitest/tb2/com/vaadin/tests/components/image/ImageAltText.html
diff --git a/uitest/src/com/vaadin/tests/components/image/ImageClicks.html b/uitest/tb2/com/vaadin/tests/components/image/ImageClicks.html
index 14afaab98d..14afaab98d 100644
--- a/uitest/src/com/vaadin/tests/components/image/ImageClicks.html
+++ b/uitest/tb2/com/vaadin/tests/components/image/ImageClicks.html
diff --git a/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.html b/uitest/tb2/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.html
index d7024b2972..d7024b2972 100644
--- a/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.html
+++ b/uitest/tb2/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.html
diff --git a/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListener.html b/uitest/tb2/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListener.html
index 53af1d4ceb..53af1d4ceb 100644
--- a/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListener.html
+++ b/uitest/tb2/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListener.html
diff --git a/uitest/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.html b/uitest/tb2/com/vaadin/tests/components/label/HundredPercentWideLabelResize.html
index 667f08ba4f..667f08ba4f 100644
--- a/uitest/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.html
+++ b/uitest/tb2/com/vaadin/tests/components/label/HundredPercentWideLabelResize.html
diff --git a/uitest/src/com/vaadin/tests/components/label/LabelPropertySourceValue.html b/uitest/tb2/com/vaadin/tests/components/label/LabelPropertySourceValue.html
index e62ef4bba1..e62ef4bba1 100644
--- a/uitest/src/com/vaadin/tests/components/label/LabelPropertySourceValue.html
+++ b/uitest/tb2/com/vaadin/tests/components/label/LabelPropertySourceValue.html
diff --git a/uitest/src/com/vaadin/tests/components/label/LabelTooltip-chameleon.html b/uitest/tb2/com/vaadin/tests/components/label/LabelTooltip-chameleon.html
index 8a042ede92..8a042ede92 100644
--- a/uitest/src/com/vaadin/tests/components/label/LabelTooltip-chameleon.html
+++ b/uitest/tb2/com/vaadin/tests/components/label/LabelTooltip-chameleon.html
diff --git a/uitest/src/com/vaadin/tests/components/label/LabelTooltip-runo.html b/uitest/tb2/com/vaadin/tests/components/label/LabelTooltip-runo.html
index 34fb088ff9..34fb088ff9 100644
--- a/uitest/src/com/vaadin/tests/components/label/LabelTooltip-runo.html
+++ b/uitest/tb2/com/vaadin/tests/components/label/LabelTooltip-runo.html
diff --git a/uitest/src/com/vaadin/tests/components/label/LabelTooltip.html b/uitest/tb2/com/vaadin/tests/components/label/LabelTooltip.html
index 05da9195ef..05da9195ef 100644
--- a/uitest/src/com/vaadin/tests/components/label/LabelTooltip.html
+++ b/uitest/tb2/com/vaadin/tests/components/label/LabelTooltip.html
diff --git a/uitest/src/com/vaadin/tests/components/label/LabelWrapping.html b/uitest/tb2/com/vaadin/tests/components/label/LabelWrapping.html
index b8038a75b4..b8038a75b4 100644
--- a/uitest/src/com/vaadin/tests/components/label/LabelWrapping.html
+++ b/uitest/tb2/com/vaadin/tests/components/label/LabelWrapping.html
diff --git a/uitest/src/com/vaadin/tests/components/label/Labels.html b/uitest/tb2/com/vaadin/tests/components/label/Labels.html
index 46ff066d8c..46ff066d8c 100644
--- a/uitest/src/com/vaadin/tests/components/label/Labels.html
+++ b/uitest/tb2/com/vaadin/tests/components/label/Labels.html
diff --git a/uitest/src/com/vaadin/tests/components/label/MarginsInLabels.html b/uitest/tb2/com/vaadin/tests/components/label/MarginsInLabels.html
index 080200092d..080200092d 100644
--- a/uitest/src/com/vaadin/tests/components/label/MarginsInLabels.html
+++ b/uitest/tb2/com/vaadin/tests/components/label/MarginsInLabels.html
diff --git a/uitest/src/com/vaadin/tests/components/link/LinkToPercentage.html b/uitest/tb2/com/vaadin/tests/components/link/LinkToPercentage.html
index 328b884478..328b884478 100644
--- a/uitest/src/com/vaadin/tests/components/link/LinkToPercentage.html
+++ b/uitest/tb2/com/vaadin/tests/components/link/LinkToPercentage.html
diff --git a/uitest/src/com/vaadin/tests/components/listselect/ListSelectAllowNewItem.html b/uitest/tb2/com/vaadin/tests/components/listselect/ListSelectAllowNewItem.html
index ad5eda1ace..ad5eda1ace 100644
--- a/uitest/src/com/vaadin/tests/components/listselect/ListSelectAllowNewItem.html
+++ b/uitest/tb2/com/vaadin/tests/components/listselect/ListSelectAllowNewItem.html
diff --git a/uitest/src/com/vaadin/tests/components/listselect/ListSelectJump.html b/uitest/tb2/com/vaadin/tests/components/listselect/ListSelectJump.html
index f066d488e6..f066d488e6 100644
--- a/uitest/src/com/vaadin/tests/components/listselect/ListSelectJump.html
+++ b/uitest/tb2/com/vaadin/tests/components/listselect/ListSelectJump.html
diff --git a/uitest/src/com/vaadin/tests/components/listselect/ListSelectParentDisabled.html b/uitest/tb2/com/vaadin/tests/components/listselect/ListSelectParentDisabled.html
index 886f454dcb..886f454dcb 100644
--- a/uitest/src/com/vaadin/tests/components/listselect/ListSelectParentDisabled.html
+++ b/uitest/tb2/com/vaadin/tests/components/listselect/ListSelectParentDisabled.html
diff --git a/uitest/src/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.html b/uitest/tb2/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.html
index 7dbb99d0e6..7dbb99d0e6 100644
--- a/uitest/src/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.html
+++ b/uitest/tb2/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.html
diff --git a/uitest/src/com/vaadin/tests/components/listselect/ListSelectSelection.html b/uitest/tb2/com/vaadin/tests/components/listselect/ListSelectSelection.html
index 9820e044f7..9820e044f7 100644
--- a/uitest/src/com/vaadin/tests/components/listselect/ListSelectSelection.html
+++ b/uitest/tb2/com/vaadin/tests/components/listselect/ListSelectSelection.html
diff --git a/uitest/src/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.html b/uitest/tb2/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.html
index 5a2a0d839a..5a2a0d839a 100644
--- a/uitest/src/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.html
diff --git a/uitest/src/com/vaadin/tests/components/loginform/LoginFormTest.html b/uitest/tb2/com/vaadin/tests/components/loginform/LoginFormTest.html
index daaefab48c..daaefab48c 100644
--- a/uitest/src/com/vaadin/tests/components/loginform/LoginFormTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/loginform/LoginFormTest.html
diff --git a/uitest/src/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.html b/uitest/tb2/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.html
index 3c0a50d11d..3c0a50d11d 100755
--- a/uitest/src/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.html
+++ b/uitest/tb2/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.html
diff --git a/uitest/src/com/vaadin/tests/components/media/AudioTest.html b/uitest/tb2/com/vaadin/tests/components/media/AudioTest.html
index 8425cad38a..8425cad38a 100644
--- a/uitest/src/com/vaadin/tests/components/media/AudioTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/media/AudioTest.html
diff --git a/uitest/src/com/vaadin/tests/components/menubar/IconsInRootMenuBar.html b/uitest/tb2/com/vaadin/tests/components/menubar/IconsInRootMenuBar.html
index dfb74f9d34..dfb74f9d34 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/IconsInRootMenuBar.html
+++ b/uitest/tb2/com/vaadin/tests/components/menubar/IconsInRootMenuBar.html
diff --git a/uitest/src/com/vaadin/tests/components/menubar/IconsInSubMenus.html b/uitest/tb2/com/vaadin/tests/components/menubar/IconsInSubMenus.html
index 87f6f7a65e..87f6f7a65e 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/IconsInSubMenus.html
+++ b/uitest/tb2/com/vaadin/tests/components/menubar/IconsInSubMenus.html
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarFocus.html b/uitest/tb2/com/vaadin/tests/components/menubar/MenuBarFocus.html
index cd8de3757a..cd8de3757a 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarFocus.html
+++ b/uitest/tb2/com/vaadin/tests/components/menubar/MenuBarFocus.html
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarHtmlItems.html b/uitest/tb2/com/vaadin/tests/components/menubar/MenuBarHtmlItems.html
index 2878018752..2878018752 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarHtmlItems.html
+++ b/uitest/tb2/com/vaadin/tests/components/menubar/MenuBarHtmlItems.html
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarItemsCheckable.html b/uitest/tb2/com/vaadin/tests/components/menubar/MenuBarItemsCheckable.html
index ebdfa81f20..ebdfa81f20 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarItemsCheckable.html
+++ b/uitest/tb2/com/vaadin/tests/components/menubar/MenuBarItemsCheckable.html
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarLongMenus.html b/uitest/tb2/com/vaadin/tests/components/menubar/MenuBarLongMenus.html
index 7170a98325..7170a98325 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarLongMenus.html
+++ b/uitest/tb2/com/vaadin/tests/components/menubar/MenuBarLongMenus.html
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarNavigationKeyboard.html b/uitest/tb2/com/vaadin/tests/components/menubar/MenuBarNavigationKeyboard.html
index a3d7700dae..a3d7700dae 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarNavigationKeyboard.html
+++ b/uitest/tb2/com/vaadin/tests/components/menubar/MenuBarNavigationKeyboard.html
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarNavigationMouse.html b/uitest/tb2/com/vaadin/tests/components/menubar/MenuBarNavigationMouse.html
index 421966876b..421966876b 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarNavigationMouse.html
+++ b/uitest/tb2/com/vaadin/tests/components/menubar/MenuBarNavigationMouse.html
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarPrimaryStylenames.html b/uitest/tb2/com/vaadin/tests/components/menubar/MenuBarPrimaryStylenames.html
index 3a8e8d81af..3a8e8d81af 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarPrimaryStylenames.html
+++ b/uitest/tb2/com/vaadin/tests/components/menubar/MenuBarPrimaryStylenames.html
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarResize.html b/uitest/tb2/com/vaadin/tests/components/menubar/MenuBarResize.html
index 97006323a2..97006323a2 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarResize.html
+++ b/uitest/tb2/com/vaadin/tests/components/menubar/MenuBarResize.html
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.html b/uitest/tb2/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.html
index a53757a969..a53757a969 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.html
+++ b/uitest/tb2/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.html
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.html b/uitest/tb2/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.html
index 63f6ff7753..63f6ff7753 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.html
+++ b/uitest/tb2/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.html
diff --git a/uitest/src/com/vaadin/tests/components/menubar/Menubars.html b/uitest/tb2/com/vaadin/tests/components/menubar/Menubars.html
index 93d77f9f36..93d77f9f36 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/Menubars.html
+++ b/uitest/tb2/com/vaadin/tests/components/menubar/Menubars.html
diff --git a/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonDisableOnClick.html b/uitest/tb2/com/vaadin/tests/components/nativebutton/NativeButtonDisableOnClick.html
index 5f80004c7c..5f80004c7c 100644
--- a/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonDisableOnClick.html
+++ b/uitest/tb2/com/vaadin/tests/components/nativebutton/NativeButtonDisableOnClick.html
diff --git a/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonHtml.html b/uitest/tb2/com/vaadin/tests/components/nativebutton/NativeButtonHtml.html
index 8a1b21c35d..8a1b21c35d 100644
--- a/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonHtml.html
+++ b/uitest/tb2/com/vaadin/tests/components/nativebutton/NativeButtonHtml.html
diff --git a/uitest/src/com/vaadin/tests/components/nativeselect/NativeSelectParentDisabled.html b/uitest/tb2/com/vaadin/tests/components/nativeselect/NativeSelectParentDisabled.html
index a8d3577eba..a8d3577eba 100644
--- a/uitest/src/com/vaadin/tests/components/nativeselect/NativeSelectParentDisabled.html
+++ b/uitest/tb2/com/vaadin/tests/components/nativeselect/NativeSelectParentDisabled.html
diff --git a/uitest/src/com/vaadin/tests/components/notification/CloseErrorNotificationWithEscape.html b/uitest/tb2/com/vaadin/tests/components/notification/CloseErrorNotificationWithEscape.html
index c9d9e186bc..c9d9e186bc 100644
--- a/uitest/src/com/vaadin/tests/components/notification/CloseErrorNotificationWithEscape.html
+++ b/uitest/tb2/com/vaadin/tests/components/notification/CloseErrorNotificationWithEscape.html
diff --git a/uitest/src/com/vaadin/tests/components/notification/Notifications.html b/uitest/tb2/com/vaadin/tests/components/notification/Notifications.html
index 7554175cdb..7554175cdb 100644
--- a/uitest/src/com/vaadin/tests/components/notification/Notifications.html
+++ b/uitest/tb2/com/vaadin/tests/components/notification/Notifications.html
diff --git a/uitest/src/com/vaadin/tests/components/notification/NotificationsAndModalWindow.html b/uitest/tb2/com/vaadin/tests/components/notification/NotificationsAndModalWindow.html
index 35d22da46e..35d22da46e 100644
--- a/uitest/src/com/vaadin/tests/components/notification/NotificationsAndModalWindow.html
+++ b/uitest/tb2/com/vaadin/tests/components/notification/NotificationsAndModalWindow.html
diff --git a/uitest/src/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.html b/uitest/tb2/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.html
index 1e43728f6a..1e43728f6a 100644
--- a/uitest/src/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.html
+++ b/uitest/tb2/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.html
diff --git a/uitest/src/com/vaadin/tests/components/notification/SemitransparentNotification.html b/uitest/tb2/com/vaadin/tests/components/notification/SemitransparentNotification.html
index f125b98ee1..f125b98ee1 100755
--- a/uitest/src/com/vaadin/tests/components/notification/SemitransparentNotification.html
+++ b/uitest/tb2/com/vaadin/tests/components/notification/SemitransparentNotification.html
diff --git a/uitest/src/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.html b/uitest/tb2/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.html
index 01c033e4fa..01c033e4fa 100644
--- a/uitest/src/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.html
+++ b/uitest/tb2/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.html
diff --git a/uitest/src/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.html b/uitest/tb2/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.html
index d74354299d..d74354299d 100644
--- a/uitest/src/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.html
+++ b/uitest/tb2/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.html
diff --git a/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupItemIcons.html b/uitest/tb2/com/vaadin/tests/components/optiongroup/OptionGroupItemIcons.html
index 978d911a2d..978d911a2d 100644
--- a/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupItemIcons.html
+++ b/uitest/tb2/com/vaadin/tests/components/optiongroup/OptionGroupItemIcons.html
diff --git a/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupParentDisabled.html b/uitest/tb2/com/vaadin/tests/components/optiongroup/OptionGroupParentDisabled.html
index db5a268ecd..db5a268ecd 100644
--- a/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupParentDisabled.html
+++ b/uitest/tb2/com/vaadin/tests/components/optiongroup/OptionGroupParentDisabled.html
diff --git a/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.html b/uitest/tb2/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.html
index 046cac0e30..046cac0e30 100644
--- a/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.html
+++ b/uitest/tb2/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.html
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.html b/uitest/tb2/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.html
index 8fbd3d215b..8fbd3d215b 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.html
+++ b/uitest/tb2/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.html
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutVerticalAlign.html b/uitest/tb2/com/vaadin/tests/components/orderedlayout/HorizontalLayoutVerticalAlign.html
index d16e4a3354..d16e4a3354 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutVerticalAlign.html
+++ b/uitest/tb2/com/vaadin/tests/components/orderedlayout/HorizontalLayoutVerticalAlign.html
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalRelativeChildren.html b/uitest/tb2/com/vaadin/tests/components/orderedlayout/HorizontalRelativeChildren.html
index 1957637bcb..1957637bcb 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalRelativeChildren.html
+++ b/uitest/tb2/com/vaadin/tests/components/orderedlayout/HorizontalRelativeChildren.html
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.html b/uitest/tb2/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.html
index 06de880bcf..06de880bcf 100755
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.html
+++ b/uitest/tb2/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.html
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/InsertComponentInHorizontalLayout.html b/uitest/tb2/com/vaadin/tests/components/orderedlayout/InsertComponentInHorizontalLayout.html
index 11b343077a..11b343077a 100755
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/InsertComponentInHorizontalLayout.html
+++ b/uitest/tb2/com/vaadin/tests/components/orderedlayout/InsertComponentInHorizontalLayout.html
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.html b/uitest/tb2/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.html
index f0fd1568b1..f0fd1568b1 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.html
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.html b/uitest/tb2/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.html
index 9e1400521b..9e1400521b 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.html
+++ b/uitest/tb2/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.html
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutComponentOrdering.html b/uitest/tb2/com/vaadin/tests/components/orderedlayout/OrderedLayoutComponentOrdering.html
index ba75d7e56e..ba75d7e56e 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutComponentOrdering.html
+++ b/uitest/tb2/com/vaadin/tests/components/orderedlayout/OrderedLayoutComponentOrdering.html
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutSlotStyleNames.html b/uitest/tb2/com/vaadin/tests/components/orderedlayout/OrderedLayoutSlotStyleNames.html
index adfc8fb7c7..adfc8fb7c7 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutSlotStyleNames.html
+++ b/uitest/tb2/com/vaadin/tests/components/orderedlayout/OrderedLayoutSlotStyleNames.html
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/RelativeChildWithoutExpand.html b/uitest/tb2/com/vaadin/tests/components/orderedlayout/RelativeChildWithoutExpand.html
index c7f75ff55a..c7f75ff55a 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/RelativeChildWithoutExpand.html
+++ b/uitest/tb2/com/vaadin/tests/components/orderedlayout/RelativeChildWithoutExpand.html
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/RelativeChildrenWithoutExpand.html b/uitest/tb2/com/vaadin/tests/components/orderedlayout/RelativeChildrenWithoutExpand.html
index 46252bc447..46252bc447 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/RelativeChildrenWithoutExpand.html
+++ b/uitest/tb2/com/vaadin/tests/components/orderedlayout/RelativeChildrenWithoutExpand.html
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.html b/uitest/tb2/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.html
index 7a071030dc..7a071030dc 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.html
+++ b/uitest/tb2/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.html
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutChangingChildrenSizes.html b/uitest/tb2/com/vaadin/tests/components/orderedlayout/VerticalLayoutChangingChildrenSizes.html
index 8b6a8d7d26..8b6a8d7d26 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutChangingChildrenSizes.html
+++ b/uitest/tb2/com/vaadin/tests/components/orderedlayout/VerticalLayoutChangingChildrenSizes.html
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.html b/uitest/tb2/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.html
index f0d837d97a..f0d837d97a 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.html
+++ b/uitest/tb2/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.html
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalRelativeChildren.html b/uitest/tb2/com/vaadin/tests/components/orderedlayout/VerticalRelativeChildren.html
index bcff408592..bcff408592 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalRelativeChildren.html
+++ b/uitest/tb2/com/vaadin/tests/components/orderedlayout/VerticalRelativeChildren.html
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.html b/uitest/tb2/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.html
index caf4347b45..caf4347b45 100755
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.html
+++ b/uitest/tb2/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.html
diff --git a/uitest/src/com/vaadin/tests/components/page/PageReload.html b/uitest/tb2/com/vaadin/tests/components/page/PageReload.html
index 20d61a48f1..20d61a48f1 100644
--- a/uitest/src/com/vaadin/tests/components/page/PageReload.html
+++ b/uitest/tb2/com/vaadin/tests/components/page/PageReload.html
diff --git a/uitest/src/com/vaadin/tests/components/panel/PanelChangeContents.html b/uitest/tb2/com/vaadin/tests/components/panel/PanelChangeContents.html
index bff19c4846..bff19c4846 100644
--- a/uitest/src/com/vaadin/tests/components/panel/PanelChangeContents.html
+++ b/uitest/tb2/com/vaadin/tests/components/panel/PanelChangeContents.html
diff --git a/uitest/src/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.html b/uitest/tb2/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.html
index 4b71c5a9a9..4b71c5a9a9 100644
--- a/uitest/src/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.html
+++ b/uitest/tb2/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.html
diff --git a/uitest/src/com/vaadin/tests/components/panel/PanelShouldNotScroll.html b/uitest/tb2/com/vaadin/tests/components/panel/PanelShouldNotScroll.html
index 8b03ca330f..8b03ca330f 100644
--- a/uitest/src/com/vaadin/tests/components/panel/PanelShouldNotScroll.html
+++ b/uitest/tb2/com/vaadin/tests/components/panel/PanelShouldNotScroll.html
diff --git a/uitest/src/com/vaadin/tests/components/panel/WebkitScrollbarTest.html b/uitest/tb2/com/vaadin/tests/components/panel/WebkitScrollbarTest.html
index ee33ee2bf0..ee33ee2bf0 100644
--- a/uitest/src/com/vaadin/tests/components/panel/WebkitScrollbarTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/panel/WebkitScrollbarTest.html
diff --git a/uitest/src/com/vaadin/tests/components/passwordfield/PasswordFieldBasicStates.html b/uitest/tb2/com/vaadin/tests/components/passwordfield/PasswordFieldBasicStates.html
index ed671c9104..ed671c9104 100644
--- a/uitest/src/com/vaadin/tests/components/passwordfield/PasswordFieldBasicStates.html
+++ b/uitest/tb2/com/vaadin/tests/components/passwordfield/PasswordFieldBasicStates.html
diff --git a/uitest/src/com/vaadin/tests/components/popupview/ClickingWhilePopupOpen.html b/uitest/tb2/com/vaadin/tests/components/popupview/ClickingWhilePopupOpen.html
index 43f1c2e8ed..43f1c2e8ed 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/ClickingWhilePopupOpen.html
+++ b/uitest/tb2/com/vaadin/tests/components/popupview/ClickingWhilePopupOpen.html
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewClickShortcut.html b/uitest/tb2/com/vaadin/tests/components/popupview/PopupViewClickShortcut.html
index 7f787017a0..7f787017a0 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewClickShortcut.html
+++ b/uitest/tb2/com/vaadin/tests/components/popupview/PopupViewClickShortcut.html
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.html b/uitest/tb2/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.html
index d2ca843cf5..d2ca843cf5 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.html
+++ b/uitest/tb2/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.html
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.html b/uitest/tb2/com/vaadin/tests/components/popupview/PopupViewOffScreen.html
index 99ee864179..99ee864179 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.html
+++ b/uitest/tb2/com/vaadin/tests/components/popupview/PopupViewOffScreen.html
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.html b/uitest/tb2/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.html
index fb62215f16..fb62215f16 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.html
+++ b/uitest/tb2/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.html
diff --git a/uitest/src/com/vaadin/tests/components/popupview/ReopenPopupView.html b/uitest/tb2/com/vaadin/tests/components/popupview/ReopenPopupView.html
index a8d1407005..a8d1407005 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/ReopenPopupView.html
+++ b/uitest/tb2/com/vaadin/tests/components/popupview/ReopenPopupView.html
diff --git a/uitest/src/com/vaadin/tests/components/progressindicator/ProgressBarPrimaryStyleName.html b/uitest/tb2/com/vaadin/tests/components/progressindicator/ProgressBarPrimaryStyleName.html
index 92f678947a..92f678947a 100644
--- a/uitest/src/com/vaadin/tests/components/progressindicator/ProgressBarPrimaryStyleName.html
+++ b/uitest/tb2/com/vaadin/tests/components/progressindicator/ProgressBarPrimaryStyleName.html
diff --git a/uitest/src/com/vaadin/tests/components/progressindicator/ProgressBarTest.html b/uitest/tb2/com/vaadin/tests/components/progressindicator/ProgressBarTest.html
index b7add101f9..b7add101f9 100644
--- a/uitest/src/com/vaadin/tests/components/progressindicator/ProgressBarTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/progressindicator/ProgressBarTest.html
diff --git a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaPreventsTextFieldAccess.html b/uitest/tb2/com/vaadin/tests/components/richtextarea/RichTextAreaPreventsTextFieldAccess.html
index 6601bf9d88..6601bf9d88 100644
--- a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaPreventsTextFieldAccess.html
+++ b/uitest/tb2/com/vaadin/tests/components/richtextarea/RichTextAreaPreventsTextFieldAccess.html
diff --git a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.html b/uitest/tb2/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.html
index be1c5a2cde..be1c5a2cde 100644
--- a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.html
+++ b/uitest/tb2/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.html
diff --git a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.html b/uitest/tb2/com/vaadin/tests/components/richtextarea/RichTextAreaSize.html
index 7708c88e54..7708c88e54 100644
--- a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.html
+++ b/uitest/tb2/com/vaadin/tests/components/richtextarea/RichTextAreaSize.html
diff --git a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.html b/uitest/tb2/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.html
index 6ddd1b4097..6ddd1b4097 100644
--- a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.html
+++ b/uitest/tb2/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.html
diff --git a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreas.html b/uitest/tb2/com/vaadin/tests/components/richtextarea/RichTextAreas.html
index 7d96b4185f..7d96b4185f 100644
--- a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreas.html
+++ b/uitest/tb2/com/vaadin/tests/components/richtextarea/RichTextAreas.html
diff --git a/uitest/src/com/vaadin/tests/components/select/NativeSelects.html b/uitest/tb2/com/vaadin/tests/components/select/NativeSelects.html
index f9ab8eb3a0..f9ab8eb3a0 100644
--- a/uitest/src/com/vaadin/tests/components/select/NativeSelects.html
+++ b/uitest/tb2/com/vaadin/tests/components/select/NativeSelects.html
diff --git a/uitest/src/com/vaadin/tests/components/select/OptionGroupBasedSelectsParentDisabledScreenshots.html b/uitest/tb2/com/vaadin/tests/components/select/OptionGroupBasedSelectsParentDisabledScreenshots.html
index 4259da836d..4259da836d 100644
--- a/uitest/src/com/vaadin/tests/components/select/OptionGroupBasedSelectsParentDisabledScreenshots.html
+++ b/uitest/tb2/com/vaadin/tests/components/select/OptionGroupBasedSelectsParentDisabledScreenshots.html
diff --git a/uitest/src/com/vaadin/tests/components/select/SelectDisplaysOldValue.html b/uitest/tb2/com/vaadin/tests/components/select/SelectDisplaysOldValue.html
index 122e90e140..122e90e140 100644
--- a/uitest/src/com/vaadin/tests/components/select/SelectDisplaysOldValue.html
+++ b/uitest/tb2/com/vaadin/tests/components/select/SelectDisplaysOldValue.html
diff --git a/uitest/src/com/vaadin/tests/components/select/SelectIconPlacement.html b/uitest/tb2/com/vaadin/tests/components/select/SelectIconPlacement.html
index 90e2e293a3..90e2e293a3 100644
--- a/uitest/src/com/vaadin/tests/components/select/SelectIconPlacement.html
+++ b/uitest/tb2/com/vaadin/tests/components/select/SelectIconPlacement.html
diff --git a/uitest/src/com/vaadin/tests/components/select/SelectItemCaptionRefresh.html b/uitest/tb2/com/vaadin/tests/components/select/SelectItemCaptionRefresh.html
index 2f8532de61..2f8532de61 100644
--- a/uitest/src/com/vaadin/tests/components/select/SelectItemCaptionRefresh.html
+++ b/uitest/tb2/com/vaadin/tests/components/select/SelectItemCaptionRefresh.html
diff --git a/uitest/src/com/vaadin/tests/components/select/StylingPopupOpener.html b/uitest/tb2/com/vaadin/tests/components/select/StylingPopupOpener.html
index 48adf2edfe..48adf2edfe 100644
--- a/uitest/src/com/vaadin/tests/components/select/StylingPopupOpener.html
+++ b/uitest/tb2/com/vaadin/tests/components/select/StylingPopupOpener.html
diff --git a/uitest/src/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.html b/uitest/tb2/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.html
index c2b55a5229..c2b55a5229 100644
--- a/uitest/src/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.html
+++ b/uitest/tb2/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.html
diff --git a/uitest/src/com/vaadin/tests/components/select/TwinColSelectDualCaptions.html b/uitest/tb2/com/vaadin/tests/components/select/TwinColSelectDualCaptions.html
index bdb7121675..bdb7121675 100644
--- a/uitest/src/com/vaadin/tests/components/select/TwinColSelectDualCaptions.html
+++ b/uitest/tb2/com/vaadin/tests/components/select/TwinColSelectDualCaptions.html
diff --git a/uitest/src/com/vaadin/tests/components/select/TwinColSelectsDisabledReadonly.html b/uitest/tb2/com/vaadin/tests/components/select/TwinColSelectsDisabledReadonly.html
index aa217d97cf..aa217d97cf 100644
--- a/uitest/src/com/vaadin/tests/components/select/TwinColSelectsDisabledReadonly.html
+++ b/uitest/tb2/com/vaadin/tests/components/select/TwinColSelectsDisabledReadonly.html
diff --git a/uitest/src/com/vaadin/tests/components/slider/SliderKeyboardFocus.html b/uitest/tb2/com/vaadin/tests/components/slider/SliderKeyboardFocus.html
index 0521506418..0521506418 100644
--- a/uitest/src/com/vaadin/tests/components/slider/SliderKeyboardFocus.html
+++ b/uitest/tb2/com/vaadin/tests/components/slider/SliderKeyboardFocus.html
diff --git a/uitest/src/com/vaadin/tests/components/slider/SliderOrientation.html b/uitest/tb2/com/vaadin/tests/components/slider/SliderOrientation.html
index 174ddca016..174ddca016 100644
--- a/uitest/src/com/vaadin/tests/components/slider/SliderOrientation.html
+++ b/uitest/tb2/com/vaadin/tests/components/slider/SliderOrientation.html
diff --git a/uitest/src/com/vaadin/tests/components/slider/SliderPrimaryStyleName.html b/uitest/tb2/com/vaadin/tests/components/slider/SliderPrimaryStyleName.html
index b61ec80920..b61ec80920 100644
--- a/uitest/src/com/vaadin/tests/components/slider/SliderPrimaryStyleName.html
+++ b/uitest/tb2/com/vaadin/tests/components/slider/SliderPrimaryStyleName.html
diff --git a/uitest/src/com/vaadin/tests/components/slider/SliderUpdateFromValueChange.html b/uitest/tb2/com/vaadin/tests/components/slider/SliderUpdateFromValueChange.html
index 81c5938eb2..81c5938eb2 100644
--- a/uitest/src/com/vaadin/tests/components/slider/SliderUpdateFromValueChange.html
+++ b/uitest/tb2/com/vaadin/tests/components/slider/SliderUpdateFromValueChange.html
diff --git a/uitest/src/com/vaadin/tests/components/slider/SliderValueFromDataSource.html b/uitest/tb2/com/vaadin/tests/components/slider/SliderValueFromDataSource.html
index 8b5a7067e4..8b5a7067e4 100644
--- a/uitest/src/com/vaadin/tests/components/slider/SliderValueFromDataSource.html
+++ b/uitest/tb2/com/vaadin/tests/components/slider/SliderValueFromDataSource.html
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelBasicStates.html b/uitest/tb2/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelBasicStates.html
index 82229773d0..82229773d0 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelBasicStates.html
+++ b/uitest/tb2/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelBasicStates.html
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelMoveSplitter.html b/uitest/tb2/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelMoveSplitter.html
index 131950da41..131950da41 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelMoveSplitter.html
+++ b/uitest/tb2/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelMoveSplitter.html
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelSplitterClick.html b/uitest/tb2/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelSplitterClick.html
index 12e90c3d3f..12e90c3d3f 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelSplitterClick.html
+++ b/uitest/tb2/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelSplitterClick.html
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/RetainSplitterPositionWhenOutOfBounds.html b/uitest/tb2/com/vaadin/tests/components/splitpanel/RetainSplitterPositionWhenOutOfBounds.html
index dff4dbb996..dff4dbb996 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/RetainSplitterPositionWhenOutOfBounds.html
+++ b/uitest/tb2/com/vaadin/tests/components/splitpanel/RetainSplitterPositionWhenOutOfBounds.html
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.html b/uitest/tb2/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.html
index e8e7395198..e8e7395198 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.html
+++ b/uitest/tb2/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.html
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.html b/uitest/tb2/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.html
index 6bdc9dd5e7..6bdc9dd5e7 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.html
+++ b/uitest/tb2/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.html
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.html b/uitest/tb2/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.html
index f84eba7c36..f84eba7c36 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.html
+++ b/uitest/tb2/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.html
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.html b/uitest/tb2/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.html
index c522d2b8d8..c522d2b8d8 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.html
+++ b/uitest/tb2/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.html
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanelBasicStates.html b/uitest/tb2/com/vaadin/tests/components/splitpanel/VerticalSplitPanelBasicStates.html
index cf67caccb7..cf67caccb7 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanelBasicStates.html
+++ b/uitest/tb2/com/vaadin/tests/components/splitpanel/VerticalSplitPanelBasicStates.html
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanelMoveSplitter.html b/uitest/tb2/com/vaadin/tests/components/splitpanel/VerticalSplitPanelMoveSplitter.html
index 852efed548..852efed548 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanelMoveSplitter.html
+++ b/uitest/tb2/com/vaadin/tests/components/splitpanel/VerticalSplitPanelMoveSplitter.html
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanelSplitterClick.html b/uitest/tb2/com/vaadin/tests/components/splitpanel/VerticalSplitPanelSplitterClick.html
index 85d891e1bb..85d891e1bb 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanelSplitterClick.html
+++ b/uitest/tb2/com/vaadin/tests/components/splitpanel/VerticalSplitPanelSplitterClick.html
diff --git a/uitest/src/com/vaadin/tests/components/table/ActionsOnTableBackground.html b/uitest/tb2/com/vaadin/tests/components/table/ActionsOnTableBackground.html
index 93037c3da1..93037c3da1 100644
--- a/uitest/src/com/vaadin/tests/components/table/ActionsOnTableBackground.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/ActionsOnTableBackground.html
diff --git a/uitest/src/com/vaadin/tests/components/table/AddItemToEmptyTable.html b/uitest/tb2/com/vaadin/tests/components/table/AddItemToEmptyTable.html
index 7f4845d1a9..7f4845d1a9 100644
--- a/uitest/src/com/vaadin/tests/components/table/AddItemToEmptyTable.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/AddItemToEmptyTable.html
diff --git a/uitest/src/com/vaadin/tests/components/table/AddNonRenderedRow.html b/uitest/tb2/com/vaadin/tests/components/table/AddNonRenderedRow.html
index ba1e177235..ba1e177235 100644
--- a/uitest/src/com/vaadin/tests/components/table/AddNonRenderedRow.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/AddNonRenderedRow.html
diff --git a/uitest/src/com/vaadin/tests/components/table/ClippedComponentsInTable.html b/uitest/tb2/com/vaadin/tests/components/table/ClippedComponentsInTable.html
index 4a6ccbbe2d..4a6ccbbe2d 100644
--- a/uitest/src/com/vaadin/tests/components/table/ClippedComponentsInTable.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/ClippedComponentsInTable.html
diff --git a/uitest/src/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.html b/uitest/tb2/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.html
index e3d0821642..e3d0821642 100644
--- a/uitest/src/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.html
diff --git a/uitest/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html b/uitest/tb2/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
index 4dc63721a1..4dc63721a1 100644
--- a/uitest/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
diff --git a/uitest/src/com/vaadin/tests/components/table/ColumnExpandRatio.html b/uitest/tb2/com/vaadin/tests/components/table/ColumnExpandRatio.html
index 6d5422831e..6d5422831e 100644
--- a/uitest/src/com/vaadin/tests/components/table/ColumnExpandRatio.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/ColumnExpandRatio.html
diff --git a/uitest/src/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.html b/uitest/tb2/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.html
index eb338c8dde..eb338c8dde 100644
--- a/uitest/src/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.html
diff --git a/uitest/src/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.html b/uitest/tb2/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.html
index 5b5c83e629..5b5c83e629 100644
--- a/uitest/src/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.html
diff --git a/uitest/src/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.html b/uitest/tb2/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.html
index 6c8a770b6a..6c8a770b6a 100644
--- a/uitest/src/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.html
diff --git a/uitest/src/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.html b/uitest/tb2/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.html
index 236f184a41..236f184a41 100644
--- a/uitest/src/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.html
diff --git a/uitest/src/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.html b/uitest/tb2/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.html
index a8f0e864c3..a8f0e864c3 100644
--- a/uitest/src/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.html
diff --git a/uitest/src/com/vaadin/tests/components/table/EmptyTable.html b/uitest/tb2/com/vaadin/tests/components/table/EmptyTable.html
index 7196771f56..7196771f56 100644
--- a/uitest/src/com/vaadin/tests/components/table/EmptyTable.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/EmptyTable.html
diff --git a/uitest/src/com/vaadin/tests/components/table/FixedHeightTable.html b/uitest/tb2/com/vaadin/tests/components/table/FixedHeightTable.html
index fb8f7c8b7f..fb8f7c8b7f 100644
--- a/uitest/src/com/vaadin/tests/components/table/FixedHeightTable.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/FixedHeightTable.html
diff --git a/uitest/src/com/vaadin/tests/components/table/Footer.html b/uitest/tb2/com/vaadin/tests/components/table/Footer.html
index dbbdef2f9c..dbbdef2f9c 100644
--- a/uitest/src/com/vaadin/tests/components/table/Footer.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/Footer.html
diff --git a/uitest/src/com/vaadin/tests/components/table/FooterClick.html b/uitest/tb2/com/vaadin/tests/components/table/FooterClick.html
index fb3d004620..fb3d004620 100644
--- a/uitest/src/com/vaadin/tests/components/table/FooterClick.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/FooterClick.html
diff --git a/uitest/src/com/vaadin/tests/components/table/HeaderClick.html b/uitest/tb2/com/vaadin/tests/components/table/HeaderClick.html
index d5328b25d3..d5328b25d3 100644
--- a/uitest/src/com/vaadin/tests/components/table/HeaderClick.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/HeaderClick.html
diff --git a/uitest/src/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.html b/uitest/tb2/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.html
index dfd001bf5c..dfd001bf5c 100644
--- a/uitest/src/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.html
diff --git a/uitest/src/com/vaadin/tests/components/table/HeaderPositionWhenSorting.html b/uitest/tb2/com/vaadin/tests/components/table/HeaderPositionWhenSorting.html
index c3128820ef..c3128820ef 100644
--- a/uitest/src/com/vaadin/tests/components/table/HeaderPositionWhenSorting.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/HeaderPositionWhenSorting.html
diff --git a/uitest/src/com/vaadin/tests/components/table/HeaderSyncOnScroll.html b/uitest/tb2/com/vaadin/tests/components/table/HeaderSyncOnScroll.html
index 66f6107f90..66f6107f90 100644
--- a/uitest/src/com/vaadin/tests/components/table/HeaderSyncOnScroll.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/HeaderSyncOnScroll.html
diff --git a/uitest/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.html b/uitest/tb2/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.html
index ef2067fbf5..ef2067fbf5 100644
--- a/uitest/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.html
diff --git a/uitest/src/com/vaadin/tests/components/table/HiddenComponentCells.html b/uitest/tb2/com/vaadin/tests/components/table/HiddenComponentCells.html
index 22ba16abca..22ba16abca 100644
--- a/uitest/src/com/vaadin/tests/components/table/HiddenComponentCells.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/HiddenComponentCells.html
diff --git a/uitest/src/com/vaadin/tests/components/table/HorizontalScrollWithNoRows.html b/uitest/tb2/com/vaadin/tests/components/table/HorizontalScrollWithNoRows.html
index 98629252d9..98629252d9 100644
--- a/uitest/src/com/vaadin/tests/components/table/HorizontalScrollWithNoRows.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/HorizontalScrollWithNoRows.html
diff --git a/uitest/src/com/vaadin/tests/components/table/ItemClickEvents.html b/uitest/tb2/com/vaadin/tests/components/table/ItemClickEvents.html
index 1d7b2b6bf9..1d7b2b6bf9 100644
--- a/uitest/src/com/vaadin/tests/components/table/ItemClickEvents.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/ItemClickEvents.html
diff --git a/uitest/src/com/vaadin/tests/components/table/LargeSelectionCausesNPE.html b/uitest/tb2/com/vaadin/tests/components/table/LargeSelectionCausesNPE.html
index 8ee0bad9ec..8ee0bad9ec 100644
--- a/uitest/src/com/vaadin/tests/components/table/LargeSelectionCausesNPE.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/LargeSelectionCausesNPE.html
diff --git a/uitest/src/com/vaadin/tests/components/table/LastColumnNegative.html b/uitest/tb2/com/vaadin/tests/components/table/LastColumnNegative.html
index 441142e7f9..441142e7f9 100644
--- a/uitest/src/com/vaadin/tests/components/table/LastColumnNegative.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/LastColumnNegative.html
diff --git a/uitest/src/com/vaadin/tests/components/table/MissingScrollbar.html b/uitest/tb2/com/vaadin/tests/components/table/MissingScrollbar.html
index e1f783d42f..e1f783d42f 100644
--- a/uitest/src/com/vaadin/tests/components/table/MissingScrollbar.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/MissingScrollbar.html
diff --git a/uitest/src/com/vaadin/tests/components/table/ModifyContainerProperty.html b/uitest/tb2/com/vaadin/tests/components/table/ModifyContainerProperty.html
index 33318c9a95..33318c9a95 100644
--- a/uitest/src/com/vaadin/tests/components/table/ModifyContainerProperty.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/ModifyContainerProperty.html
diff --git a/uitest/src/com/vaadin/tests/components/table/MultiSelectValueOrder.html b/uitest/tb2/com/vaadin/tests/components/table/MultiSelectValueOrder.html
index 4bac7741da..4bac7741da 100644
--- a/uitest/src/com/vaadin/tests/components/table/MultiSelectValueOrder.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/MultiSelectValueOrder.html
diff --git a/uitest/src/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.html b/uitest/tb2/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.html
index 670736127b..670736127b 100644
--- a/uitest/src/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.html
diff --git a/uitest/src/com/vaadin/tests/components/table/OddEvenRowStyling.html b/uitest/tb2/com/vaadin/tests/components/table/OddEvenRowStyling.html
index 525ad34888..525ad34888 100644
--- a/uitest/src/com/vaadin/tests/components/table/OddEvenRowStyling.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/OddEvenRowStyling.html
diff --git a/uitest/src/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.html b/uitest/tb2/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.html
index 8d185b6219..8d185b6219 100644
--- a/uitest/src/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.html
diff --git a/uitest/src/com/vaadin/tests/components/table/PropertyValueChange.html b/uitest/tb2/com/vaadin/tests/components/table/PropertyValueChange.html
index b5904120d6..b5904120d6 100644
--- a/uitest/src/com/vaadin/tests/components/table/PropertyValueChange.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/PropertyValueChange.html
diff --git a/uitest/src/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.html b/uitest/tb2/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.html
index e6d4d69f81..e6d4d69f81 100644
--- a/uitest/src/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.html
diff --git a/uitest/src/com/vaadin/tests/components/table/RemoveItemOnClick.html b/uitest/tb2/com/vaadin/tests/components/table/RemoveItemOnClick.html
index e95dbb3a65..e95dbb3a65 100644
--- a/uitest/src/com/vaadin/tests/components/table/RemoveItemOnClick.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/RemoveItemOnClick.html
diff --git a/uitest/src/com/vaadin/tests/components/table/ResizeColumnAfterScrolling.html b/uitest/tb2/com/vaadin/tests/components/table/ResizeColumnAfterScrolling.html
index 7e7536d63a..7e7536d63a 100644
--- a/uitest/src/com/vaadin/tests/components/table/ResizeColumnAfterScrolling.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/ResizeColumnAfterScrolling.html
diff --git a/uitest/src/com/vaadin/tests/components/table/RowFocusAppliedAndRemovedOnSelection.html b/uitest/tb2/com/vaadin/tests/components/table/RowFocusAppliedAndRemovedOnSelection.html
index a2f57aa085..a2f57aa085 100644
--- a/uitest/src/com/vaadin/tests/components/table/RowFocusAppliedAndRemovedOnSelection.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/RowFocusAppliedAndRemovedOnSelection.html
diff --git a/uitest/src/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.html b/uitest/tb2/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.html
index 65487d8fa8..65487d8fa8 100644
--- a/uitest/src/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.html
diff --git a/uitest/src/com/vaadin/tests/components/table/SelectableEditable.html b/uitest/tb2/com/vaadin/tests/components/table/SelectableEditable.html
index 8d46523c40..8d46523c40 100644
--- a/uitest/src/com/vaadin/tests/components/table/SelectableEditable.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/SelectableEditable.html
diff --git a/uitest/src/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.html b/uitest/tb2/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.html
index 02132e45a7..02132e45a7 100644
--- a/uitest/src/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.html
diff --git a/uitest/src/com/vaadin/tests/components/table/ShowLastItem.html b/uitest/tb2/com/vaadin/tests/components/table/ShowLastItem.html
index c9c93198fa..c9c93198fa 100644
--- a/uitest/src/com/vaadin/tests/components/table/ShowLastItem.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/ShowLastItem.html
diff --git a/uitest/src/com/vaadin/tests/components/table/SortLabelsInTable.html b/uitest/tb2/com/vaadin/tests/components/table/SortLabelsInTable.html
index 21d2d7f3b3..21d2d7f3b3 100644
--- a/uitest/src/com/vaadin/tests/components/table/SortLabelsInTable.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/SortLabelsInTable.html
diff --git a/uitest/src/com/vaadin/tests/components/table/SortLongTable.html b/uitest/tb2/com/vaadin/tests/components/table/SortLongTable.html
index 96513509e1..96513509e1 100644
--- a/uitest/src/com/vaadin/tests/components/table/SortLongTable.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/SortLongTable.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableClickValueChangeInteraction.html b/uitest/tb2/com/vaadin/tests/components/table/TableClickValueChangeInteraction.html
index 5b50eeba23..5b50eeba23 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableClickValueChangeInteraction.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableClickValueChangeInteraction.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableColumnAlignment.html b/uitest/tb2/com/vaadin/tests/components/table/TableColumnAlignment.html
index 49bb86dbce..49bb86dbce 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableColumnAlignment.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableColumnAlignment.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableColumnHeaders.html b/uitest/tb2/com/vaadin/tests/components/table/TableColumnHeaders.html
index 9f4e6cb8da..9f4e6cb8da 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableColumnHeaders.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableColumnHeaders.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableColumnIcons-chameleon.html b/uitest/tb2/com/vaadin/tests/components/table/TableColumnIcons-chameleon.html
index efb99410fe..efb99410fe 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableColumnIcons-chameleon.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableColumnIcons-chameleon.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableColumnIcons-runo.html b/uitest/tb2/com/vaadin/tests/components/table/TableColumnIcons-runo.html
index d565fb5140..d565fb5140 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableColumnIcons-runo.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableColumnIcons-runo.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableColumnIcons.html b/uitest/tb2/com/vaadin/tests/components/table/TableColumnIcons.html
index 81b8be89fa..81b8be89fa 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableColumnIcons.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableColumnIcons.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableColumnSorting.html b/uitest/tb2/com/vaadin/tests/components/table/TableColumnSorting.html
index 7f6ee1a975..7f6ee1a975 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableColumnSorting.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableColumnSorting.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableColumnWidthsAndExpandRatios.html b/uitest/tb2/com/vaadin/tests/components/table/TableColumnWidthsAndExpandRatios.html
index 75d98ce2e6..75d98ce2e6 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableColumnWidthsAndExpandRatios.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableColumnWidthsAndExpandRatios.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableContextMenuAndIcons.html b/uitest/tb2/com/vaadin/tests/components/table/TableContextMenuAndIcons.html
index 82f1e63d6b..82f1e63d6b 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableContextMenuAndIcons.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableContextMenuAndIcons.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableDragColumn.html b/uitest/tb2/com/vaadin/tests/components/table/TableDragColumn.html
index 5d0ba160fe..5d0ba160fe 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableDragColumn.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableDragColumn.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableDragColumnFloatingElementStyles.html b/uitest/tb2/com/vaadin/tests/components/table/TableDragColumnFloatingElementStyles.html
index e225091b5f..e225091b5f 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableDragColumnFloatingElementStyles.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableDragColumnFloatingElementStyles.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableGeneratedColumns.html b/uitest/tb2/com/vaadin/tests/components/table/TableGeneratedColumns.html
index 19326e9f12..19326e9f12 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableGeneratedColumns.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableGeneratedColumns.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableGeneratedRows-chameleon.html b/uitest/tb2/com/vaadin/tests/components/table/TableGeneratedRows-chameleon.html
index c382a7c766..c382a7c766 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableGeneratedRows-chameleon.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableGeneratedRows-chameleon.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableGeneratedRows.html b/uitest/tb2/com/vaadin/tests/components/table/TableGeneratedRows.html
index 35a600765f..35a600765f 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableGeneratedRows.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableGeneratedRows.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableGeneratedStringColumns.html b/uitest/tb2/com/vaadin/tests/components/table/TableGeneratedStringColumns.html
index 4d5f4c2d17..4d5f4c2d17 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableGeneratedStringColumns.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableGeneratedStringColumns.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.html b/uitest/tb2/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.html
index 01b2c578f0..01b2c578f0 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableLastRowMissing.html b/uitest/tb2/com/vaadin/tests/components/table/TableLastRowMissing.html
index ca8ee6d6a4..ca8ee6d6a4 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableLastRowMissing.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableLastRowMissing.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableModificationsWhenScrolledRight.html b/uitest/tb2/com/vaadin/tests/components/table/TableModificationsWhenScrolledRight.html
index eab6164330..eab6164330 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableModificationsWhenScrolledRight.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableModificationsWhenScrolledRight.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableMultiSelectMouse.html b/uitest/tb2/com/vaadin/tests/components/table/TableMultiSelectMouse.html
index a980253743..a980253743 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableMultiSelectMouse.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableMultiSelectMouse.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableMultiSelectSimple-chameleon.html b/uitest/tb2/com/vaadin/tests/components/table/TableMultiSelectSimple-chameleon.html
index aa9bfd5391..aa9bfd5391 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableMultiSelectSimple-chameleon.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableMultiSelectSimple-chameleon.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableMultiSelectSimple.html b/uitest/tb2/com/vaadin/tests/components/table/TableMultiSelectSimple.html
index dcf88620ca..dcf88620ca 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableMultiSelectSimple.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableMultiSelectSimple.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TablePageLengthUpdate.html b/uitest/tb2/com/vaadin/tests/components/table/TablePageLengthUpdate.html
index bc438eaf1b..bc438eaf1b 100644
--- a/uitest/src/com/vaadin/tests/components/table/TablePageLengthUpdate.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TablePageLengthUpdate.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableReduceContainerSize.html b/uitest/tb2/com/vaadin/tests/components/table/TableReduceContainerSize.html
index 9bd0149bdb..9bd0149bdb 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableReduceContainerSize.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableReduceContainerSize.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableRemoveActionHandlers.html b/uitest/tb2/com/vaadin/tests/components/table/TableRemoveActionHandlers.html
index a363f6980e..a363f6980e 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableRemoveActionHandlers.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableRemoveActionHandlers.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableRepaintWhenMadeVisible.html b/uitest/tb2/com/vaadin/tests/components/table/TableRepaintWhenMadeVisible.html
index e523a89df3..e523a89df3 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableRepaintWhenMadeVisible.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableRepaintWhenMadeVisible.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableRowHeight.html b/uitest/tb2/com/vaadin/tests/components/table/TableRowHeight.html
index a28df6329f..a28df6329f 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableRowHeight.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableRowHeight.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableRowHeight3.html b/uitest/tb2/com/vaadin/tests/components/table/TableRowHeight3.html
index 2aa90085e4..2aa90085e4 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableRowHeight3.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableRowHeight3.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableRowNoHeightNoRows.html b/uitest/tb2/com/vaadin/tests/components/table/TableRowNoHeightNoRows.html
index 35d64c3a0c..35d64c3a0c 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableRowNoHeightNoRows.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableRowNoHeightNoRows.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableScrollOnFocus.html b/uitest/tb2/com/vaadin/tests/components/table/TableScrollOnFocus.html
index 93e5a802ee..93e5a802ee 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableScrollOnFocus.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableScrollOnFocus.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableScrolling.html b/uitest/tb2/com/vaadin/tests/components/table/TableScrolling.html
index 51fa844412..51fa844412 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableScrolling.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableScrolling.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html b/uitest/tb2/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html
index e24f4ddca4..e24f4ddca4 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableSingleSelect.html b/uitest/tb2/com/vaadin/tests/components/table/TableSingleSelect.html
index c809678a4f..c809678a4f 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableSingleSelect.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableSingleSelect.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableSqlContainer.html b/uitest/tb2/com/vaadin/tests/components/table/TableSqlContainer.html
index c6ccb4df73..c6ccb4df73 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableSqlContainer.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableSqlContainer.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableToggleVisibility.html b/uitest/tb2/com/vaadin/tests/components/table/TableToggleVisibility.html
index e9c57203c0..e9c57203c0 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableToggleVisibility.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableToggleVisibility.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableUndefinedSize.html b/uitest/tb2/com/vaadin/tests/components/table/TableUndefinedSize.html
index f21a78ddb0..f21a78ddb0 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableUndefinedSize.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableUndefinedSize.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableUnregisterComponent.html b/uitest/tb2/com/vaadin/tests/components/table/TableUnregisterComponent.html
index 1e5617d64f..1e5617d64f 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableUnregisterComponent.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableUnregisterComponent.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.html b/uitest/tb2/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.html
index 05325cb9e6..05325cb9e6 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.html b/uitest/tb2/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.html
index 441324bb6a..441324bb6a 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableWithCustomConverterFactory.html b/uitest/tb2/com/vaadin/tests/components/table/TableWithCustomConverterFactory.html
index 3bf592aeb1..3bf592aeb1 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableWithCustomConverterFactory.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableWithCustomConverterFactory.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableWithManyColumns.html b/uitest/tb2/com/vaadin/tests/components/table/TableWithManyColumns.html
index a933b0b1d1..a933b0b1d1 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableWithManyColumns.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableWithManyColumns.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.html b/uitest/tb2/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.html
index e3c9a8423b..e3c9a8423b 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TestCurrentPageFirstItem.html b/uitest/tb2/com/vaadin/tests/components/table/TestCurrentPageFirstItem.html
index 451e9b9c8d..451e9b9c8d 100644
--- a/uitest/src/com/vaadin/tests/components/table/TestCurrentPageFirstItem.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TestCurrentPageFirstItem.html
diff --git a/uitest/src/com/vaadin/tests/components/table/TooManySetColumnCollapsedCalls.html b/uitest/tb2/com/vaadin/tests/components/table/TooManySetColumnCollapsedCalls.html
index a234594b8f..a234594b8f 100644
--- a/uitest/src/com/vaadin/tests/components/table/TooManySetColumnCollapsedCalls.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/TooManySetColumnCollapsedCalls.html
diff --git a/uitest/src/com/vaadin/tests/components/table/UncollapsedCollumnWidth.html b/uitest/tb2/com/vaadin/tests/components/table/UncollapsedCollumnWidth.html
index e1b39533f3..e1b39533f3 100644
--- a/uitest/src/com/vaadin/tests/components/table/UncollapsedCollumnWidth.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/UncollapsedCollumnWidth.html
diff --git a/uitest/src/com/vaadin/tests/components/table/ValueAfterClearingContainer.html b/uitest/tb2/com/vaadin/tests/components/table/ValueAfterClearingContainer.html
index 3aecf8bf97..3aecf8bf97 100644
--- a/uitest/src/com/vaadin/tests/components/table/ValueAfterClearingContainer.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/ValueAfterClearingContainer.html
diff --git a/uitest/src/com/vaadin/tests/components/table/ViewPortCalculation.html b/uitest/tb2/com/vaadin/tests/components/table/ViewPortCalculation.html
index aa2b29b3b7..aa2b29b3b7 100644
--- a/uitest/src/com/vaadin/tests/components/table/ViewPortCalculation.html
+++ b/uitest/tb2/com/vaadin/tests/components/table/ViewPortCalculation.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html
index 993ef79c91..993ef79c91 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/EXtraScrollbarsInTabSheet.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/EXtraScrollbarsInTabSheet.html
index 4287eaa05b..4287eaa05b 100755
--- a/uitest/src/com/vaadin/tests/components/tabsheet/EXtraScrollbarsInTabSheet.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/EXtraScrollbarsInTabSheet.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/MoveComponentBetweenTabsheets.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/MoveComponentBetweenTabsheets.html
index a23729b282..a23729b282 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/MoveComponentBetweenTabsheets.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/MoveComponentBetweenTabsheets.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/NestedTabSheetsHideTabs.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/NestedTabSheetsHideTabs.html
index cc018de5eb..cc018de5eb 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/NestedTabSheetsHideTabs.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/NestedTabSheetsHideTabs.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html
index 13f103b82d..13f103b82d 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.html
index f5579c9875..f5579c9875 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.html
index fce39361e1..fce39361e1 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetBasicOperations.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabSheetBasicOperations.html
index 357455545e..357455545e 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetBasicOperations.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabSheetBasicOperations.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetCaptions.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabSheetCaptions.html
index d240d4b419..d240d4b419 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetCaptions.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabSheetCaptions.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabSheetDisabling.html
index bc03f7687b..bc03f7687b 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabSheetDisabling.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.html
index 4cb6925b28..4cb6925b28 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetIcons.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabSheetIcons.html
index 6876497a1f..6876497a1f 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetIcons.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabSheetIcons.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.html
index 8db5641603..8db5641603 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetSelectionStyles.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabSheetSelectionStyles.html
index e046cfacb4..e046cfacb4 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetSelectionStyles.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabSheetSelectionStyles.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html
index d49e2817d3..d49e2817d3 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithDisappearingContent.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabSheetWithDisappearingContent.html
index 47f8993aca..47f8993aca 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithDisappearingContent.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabSheetWithDisappearingContent.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.html
index 19eff4f8b7..19eff4f8b7 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithTabIds.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabSheetWithTabIds.html
index 64e85f55e3..64e85f55e3 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithTabIds.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabSheetWithTabIds.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.html
index 36e85c1b37..36e85c1b37 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetMinimalClosableTabs.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabsheetMinimalClosableTabs.html
index 799e844e04..799e844e04 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetMinimalClosableTabs.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabsheetMinimalClosableTabs.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabsheetScrolling.html
index dd45e2c591..dd45e2c591 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabsheetScrolling.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.html
index 2536ed50f6..2536ed50f6 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html
index 38ff6ab8ca..38ff6ab8ca 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.html
index 3da03edb6a..3da03edb6a 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.html
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.html b/uitest/tb2/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.html
index f1a54df714..f1a54df714 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.html
+++ b/uitest/tb2/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.html
diff --git a/uitest/src/com/vaadin/tests/components/textarea/ScrollCursor.html b/uitest/tb2/com/vaadin/tests/components/textarea/ScrollCursor.html
index 9eaa1ceada..9eaa1ceada 100644
--- a/uitest/src/com/vaadin/tests/components/textarea/ScrollCursor.html
+++ b/uitest/tb2/com/vaadin/tests/components/textarea/ScrollCursor.html
diff --git a/uitest/src/com/vaadin/tests/components/textarea/TextAreaBasicStates.html b/uitest/tb2/com/vaadin/tests/components/textarea/TextAreaBasicStates.html
index 3d44192506..3d44192506 100644
--- a/uitest/src/com/vaadin/tests/components/textarea/TextAreaBasicStates.html
+++ b/uitest/tb2/com/vaadin/tests/components/textarea/TextAreaBasicStates.html
diff --git a/uitest/src/com/vaadin/tests/components/textarea/TextAreaMaxLength.html b/uitest/tb2/com/vaadin/tests/components/textarea/TextAreaMaxLength.html
index 5fe43b7b7a..5fe43b7b7a 100755
--- a/uitest/src/com/vaadin/tests/components/textarea/TextAreaMaxLength.html
+++ b/uitest/tb2/com/vaadin/tests/components/textarea/TextAreaMaxLength.html
diff --git a/uitest/src/com/vaadin/tests/components/textarea/TextAreaNullRepresentation.html b/uitest/tb2/com/vaadin/tests/components/textarea/TextAreaNullRepresentation.html
index 6b29b634db..6b29b634db 100644
--- a/uitest/src/com/vaadin/tests/components/textarea/TextAreaNullRepresentation.html
+++ b/uitest/tb2/com/vaadin/tests/components/textarea/TextAreaNullRepresentation.html
diff --git a/uitest/src/com/vaadin/tests/components/textarea/TextAreaWordwrap.html b/uitest/tb2/com/vaadin/tests/components/textarea/TextAreaWordwrap.html
index 43bb52b3e7..43bb52b3e7 100644
--- a/uitest/src/com/vaadin/tests/components/textarea/TextAreaWordwrap.html
+++ b/uitest/tb2/com/vaadin/tests/components/textarea/TextAreaWordwrap.html
diff --git a/uitest/src/com/vaadin/tests/components/textfield/BigDecimalTextField.html b/uitest/tb2/com/vaadin/tests/components/textfield/BigDecimalTextField.html
index 2428e8b4bb..2428e8b4bb 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/BigDecimalTextField.html
+++ b/uitest/tb2/com/vaadin/tests/components/textfield/BigDecimalTextField.html
diff --git a/uitest/src/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.html b/uitest/tb2/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.html
index c058d8d975..c058d8d975 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.html
+++ b/uitest/tb2/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.html
diff --git a/uitest/src/com/vaadin/tests/components/textfield/SetTabIndex.html b/uitest/tb2/com/vaadin/tests/components/textfield/SetTabIndex.html
index b61b464f97..b61b464f97 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/SetTabIndex.html
+++ b/uitest/tb2/com/vaadin/tests/components/textfield/SetTabIndex.html
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.html b/uitest/tb2/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.html
index 6f0772aa29..6f0772aa29 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.html
+++ b/uitest/tb2/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.html
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.html b/uitest/tb2/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.html
index dc4c0bba13..dc4c0bba13 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.html
+++ b/uitest/tb2/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.html
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.html b/uitest/tb2/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.html
index 544cea9faa..544cea9faa 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.html
+++ b/uitest/tb2/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.html
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldBasicStates.html b/uitest/tb2/com/vaadin/tests/components/textfield/TextFieldBasicStates.html
index b38c24d7f5..b38c24d7f5 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldBasicStates.html
+++ b/uitest/tb2/com/vaadin/tests/components/textfield/TextFieldBasicStates.html
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.html b/uitest/tb2/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.html
index 177a2f85cf..177a2f85cf 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.html
+++ b/uitest/tb2/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.html
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.html b/uitest/tb2/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.html
index e53e8ed601..e53e8ed601 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.html
+++ b/uitest/tb2/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.html
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldMaxLength.html b/uitest/tb2/com/vaadin/tests/components/textfield/TextFieldMaxLength.html
index a0163352cc..a0163352cc 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldMaxLength.html
+++ b/uitest/tb2/com/vaadin/tests/components/textfield/TextFieldMaxLength.html
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldMaxLengthRemovedFromDOM.html b/uitest/tb2/com/vaadin/tests/components/textfield/TextFieldMaxLengthRemovedFromDOM.html
index 3086b66dfa..3086b66dfa 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldMaxLengthRemovedFromDOM.html
+++ b/uitest/tb2/com/vaadin/tests/components/textfield/TextFieldMaxLengthRemovedFromDOM.html
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldNullRepresentation.html b/uitest/tb2/com/vaadin/tests/components/textfield/TextFieldNullRepresentation.html
index c4a887d764..c4a887d764 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldNullRepresentation.html
+++ b/uitest/tb2/com/vaadin/tests/components/textfield/TextFieldNullRepresentation.html
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldNullRepresentationAndSelection.html b/uitest/tb2/com/vaadin/tests/components/textfield/TextFieldNullRepresentationAndSelection.html
index cfd397b4f2..cfd397b4f2 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldNullRepresentationAndSelection.html
+++ b/uitest/tb2/com/vaadin/tests/components/textfield/TextFieldNullRepresentationAndSelection.html
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldTextChangeEvent.html b/uitest/tb2/com/vaadin/tests/components/textfield/TextFieldTextChangeEvent.html
index ad98d72ce8..ad98d72ce8 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldTextChangeEvent.html
+++ b/uitest/tb2/com/vaadin/tests/components/textfield/TextFieldTextChangeEvent.html
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.html b/uitest/tb2/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.html
index cf08d8923d..cf08d8923d 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.html
+++ b/uitest/tb2/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.html
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithProperty.html b/uitest/tb2/com/vaadin/tests/components/textfield/TextFieldWithProperty.html
index fd26e3613f..fd26e3613f 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithProperty.html
+++ b/uitest/tb2/com/vaadin/tests/components/textfield/TextFieldWithProperty.html
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.html b/uitest/tb2/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.html
index f6406af84b..f6406af84b 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.html
+++ b/uitest/tb2/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.html
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFields.html b/uitest/tb2/com/vaadin/tests/components/textfield/TextFields.html
index 3a13fdbdcf..3a13fdbdcf 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFields.html
+++ b/uitest/tb2/com/vaadin/tests/components/textfield/TextFields.html
diff --git a/uitest/src/com/vaadin/tests/components/tree/ActionsOnTreeBackground.html b/uitest/tb2/com/vaadin/tests/components/tree/ActionsOnTreeBackground.html
index 8b679208d0..8b679208d0 100644
--- a/uitest/src/com/vaadin/tests/components/tree/ActionsOnTreeBackground.html
+++ b/uitest/tb2/com/vaadin/tests/components/tree/ActionsOnTreeBackground.html
diff --git a/uitest/src/com/vaadin/tests/components/tree/ExpandCollapseTree.html b/uitest/tb2/com/vaadin/tests/components/tree/ExpandCollapseTree.html
index 8bb51204aa..8bb51204aa 100644
--- a/uitest/src/com/vaadin/tests/components/tree/ExpandCollapseTree.html
+++ b/uitest/tb2/com/vaadin/tests/components/tree/ExpandCollapseTree.html
diff --git a/uitest/src/com/vaadin/tests/components/tree/PreselectedTreeVisible.html b/uitest/tb2/com/vaadin/tests/components/tree/PreselectedTreeVisible.html
index 7f8bb408aa..7f8bb408aa 100644
--- a/uitest/src/com/vaadin/tests/components/tree/PreselectedTreeVisible.html
+++ b/uitest/tb2/com/vaadin/tests/components/tree/PreselectedTreeVisible.html
diff --git a/uitest/src/com/vaadin/tests/components/tree/SimpleTree.html b/uitest/tb2/com/vaadin/tests/components/tree/SimpleTree.html
index a446f67726..a446f67726 100644
--- a/uitest/src/com/vaadin/tests/components/tree/SimpleTree.html
+++ b/uitest/tb2/com/vaadin/tests/components/tree/SimpleTree.html
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeConnectors-base.html b/uitest/tb2/com/vaadin/tests/components/tree/TreeConnectors-base.html
index 8b9aaab2f7..8b9aaab2f7 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeConnectors-base.html
+++ b/uitest/tb2/com/vaadin/tests/components/tree/TreeConnectors-base.html
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeConnectors-chameleon.html b/uitest/tb2/com/vaadin/tests/components/tree/TreeConnectors-chameleon.html
index 0200c31b4a..0200c31b4a 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeConnectors-chameleon.html
+++ b/uitest/tb2/com/vaadin/tests/components/tree/TreeConnectors-chameleon.html
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeConnectors-reindeer.html b/uitest/tb2/com/vaadin/tests/components/tree/TreeConnectors-reindeer.html
index f69dde73e4..f69dde73e4 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeConnectors-reindeer.html
+++ b/uitest/tb2/com/vaadin/tests/components/tree/TreeConnectors-reindeer.html
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeConnectors-runo.html b/uitest/tb2/com/vaadin/tests/components/tree/TreeConnectors-runo.html
index 46d12bfb9d..46d12bfb9d 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeConnectors-runo.html
+++ b/uitest/tb2/com/vaadin/tests/components/tree/TreeConnectors-runo.html
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeContextMenuAndIcons.html b/uitest/tb2/com/vaadin/tests/components/tree/TreeContextMenuAndIcons.html
index 6f9b5e81c3..6f9b5e81c3 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeContextMenuAndIcons.html
+++ b/uitest/tb2/com/vaadin/tests/components/tree/TreeContextMenuAndIcons.html
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.html b/uitest/tb2/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.html
index b093bd90d6..b093bd90d6 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.html
+++ b/uitest/tb2/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.html
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeFiltering.html b/uitest/tb2/com/vaadin/tests/components/tree/TreeFiltering.html
index 2b08cdf865..2b08cdf865 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeFiltering.html
+++ b/uitest/tb2/com/vaadin/tests/components/tree/TreeFiltering.html
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeFocusGaining.html b/uitest/tb2/com/vaadin/tests/components/tree/TreeFocusGaining.html
index 74a69ec203..74a69ec203 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeFocusGaining.html
+++ b/uitest/tb2/com/vaadin/tests/components/tree/TreeFocusGaining.html
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeHorizontalResize.html b/uitest/tb2/com/vaadin/tests/components/tree/TreeHorizontalResize.html
index 8e882e215d..8e882e215d 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeHorizontalResize.html
+++ b/uitest/tb2/com/vaadin/tests/components/tree/TreeHorizontalResize.html
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeIconUpdate.html b/uitest/tb2/com/vaadin/tests/components/tree/TreeIconUpdate.html
index d16d8fd79d..d16d8fd79d 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeIconUpdate.html
+++ b/uitest/tb2/com/vaadin/tests/components/tree/TreeIconUpdate.html
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeItemClickAndValueChange.html b/uitest/tb2/com/vaadin/tests/components/tree/TreeItemClickAndValueChange.html
index 83508c9478..83508c9478 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeItemClickAndValueChange.html
+++ b/uitest/tb2/com/vaadin/tests/components/tree/TreeItemClickAndValueChange.html
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationScroll.html b/uitest/tb2/com/vaadin/tests/components/tree/TreeKeyboardNavigationScroll.html
index 0f0db2b71e..0f0db2b71e 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationScroll.html
+++ b/uitest/tb2/com/vaadin/tests/components/tree/TreeKeyboardNavigationScroll.html
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.html b/uitest/tb2/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.html
index 2439079d09..2439079d09 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.html
+++ b/uitest/tb2/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.html
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html b/uitest/tb2/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html
index f98482f4c7..f98482f4c7 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html
+++ b/uitest/tb2/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeScrolling.html b/uitest/tb2/com/vaadin/tests/components/tree/TreeScrolling.html
index 880d52ed75..880d52ed75 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeScrolling.html
+++ b/uitest/tb2/com/vaadin/tests/components/tree/TreeScrolling.html
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeScrollingOnSelection.html b/uitest/tb2/com/vaadin/tests/components/tree/TreeScrollingOnSelection.html
index bd8e944c32..bd8e944c32 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeScrollingOnSelection.html
+++ b/uitest/tb2/com/vaadin/tests/components/tree/TreeScrollingOnSelection.html
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeShiftMultiSelectNodes.html b/uitest/tb2/com/vaadin/tests/components/tree/TreeShiftMultiSelectNodes.html
index 53709b2a64..53709b2a64 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeShiftMultiSelectNodes.html
+++ b/uitest/tb2/com/vaadin/tests/components/tree/TreeShiftMultiSelectNodes.html
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeTooltip.html b/uitest/tb2/com/vaadin/tests/components/tree/TreeTooltip.html
index afebdaacd5..afebdaacd5 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeTooltip.html
+++ b/uitest/tb2/com/vaadin/tests/components/tree/TreeTooltip.html
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeWithIcons.html b/uitest/tb2/com/vaadin/tests/components/tree/TreeWithIcons.html
index 0b01807054..0b01807054 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeWithIcons.html
+++ b/uitest/tb2/com/vaadin/tests/components/tree/TreeWithIcons.html
diff --git a/uitest/src/com/vaadin/tests/components/treetable/AddItemToEmptyTreeTable.html b/uitest/tb2/com/vaadin/tests/components/treetable/AddItemToEmptyTreeTable.html
index 15dc0e074d..15dc0e074d 100755
--- a/uitest/src/com/vaadin/tests/components/treetable/AddItemToEmptyTreeTable.html
+++ b/uitest/tb2/com/vaadin/tests/components/treetable/AddItemToEmptyTreeTable.html
diff --git a/uitest/src/com/vaadin/tests/components/treetable/AddNodesOnExpand.html b/uitest/tb2/com/vaadin/tests/components/treetable/AddNodesOnExpand.html
index efcbded1d5..efcbded1d5 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/AddNodesOnExpand.html
+++ b/uitest/tb2/com/vaadin/tests/components/treetable/AddNodesOnExpand.html
diff --git a/uitest/src/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.html b/uitest/tb2/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.html
index 8391ca186d..8391ca186d 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.html
+++ b/uitest/tb2/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.html
diff --git a/uitest/src/com/vaadin/tests/components/treetable/ComponentsInTreeTable.html b/uitest/tb2/com/vaadin/tests/components/treetable/ComponentsInTreeTable.html
index 05c5986e6b..05c5986e6b 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/ComponentsInTreeTable.html
+++ b/uitest/tb2/com/vaadin/tests/components/treetable/ComponentsInTreeTable.html
diff --git a/uitest/src/com/vaadin/tests/components/treetable/DynamicallyModified.html b/uitest/tb2/com/vaadin/tests/components/treetable/DynamicallyModified.html
index 01bbb75361..01bbb75361 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/DynamicallyModified.html
+++ b/uitest/tb2/com/vaadin/tests/components/treetable/DynamicallyModified.html
diff --git a/uitest/src/com/vaadin/tests/components/treetable/EmptyingTreeTableTest.html b/uitest/tb2/com/vaadin/tests/components/treetable/EmptyingTreeTableTest.html
index 0c43d41aca..0c43d41aca 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/EmptyingTreeTableTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/treetable/EmptyingTreeTableTest.html
diff --git a/uitest/src/com/vaadin/tests/components/treetable/ExpandAndCollapseListeners.html b/uitest/tb2/com/vaadin/tests/components/treetable/ExpandAndCollapseListeners.html
index 81a62aaa50..81a62aaa50 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/ExpandAndCollapseListeners.html
+++ b/uitest/tb2/com/vaadin/tests/components/treetable/ExpandAndCollapseListeners.html
diff --git a/uitest/src/com/vaadin/tests/components/treetable/KeepAllItemsVisible.html b/uitest/tb2/com/vaadin/tests/components/treetable/KeepAllItemsVisible.html
index 0d92deec16..0d92deec16 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/KeepAllItemsVisible.html
+++ b/uitest/tb2/com/vaadin/tests/components/treetable/KeepAllItemsVisible.html
diff --git a/uitest/src/com/vaadin/tests/components/treetable/ProgrammaticCollapse.html b/uitest/tb2/com/vaadin/tests/components/treetable/ProgrammaticCollapse.html
index e06efe85d7..e06efe85d7 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/ProgrammaticCollapse.html
+++ b/uitest/tb2/com/vaadin/tests/components/treetable/ProgrammaticCollapse.html
diff --git a/uitest/src/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.html b/uitest/tb2/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.html
index 1d4c65498b..1d4c65498b 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.html
+++ b/uitest/tb2/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.html
diff --git a/uitest/src/com/vaadin/tests/components/treetable/RowAnimation.html b/uitest/tb2/com/vaadin/tests/components/treetable/RowAnimation.html
index 64ff061c13..64ff061c13 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/RowAnimation.html
+++ b/uitest/tb2/com/vaadin/tests/components/treetable/RowAnimation.html
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableExpandWithRowStyle.html b/uitest/tb2/com/vaadin/tests/components/treetable/TreeTableExpandWithRowStyle.html
index 2143de2607..2143de2607 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableExpandWithRowStyle.html
+++ b/uitest/tb2/com/vaadin/tests/components/treetable/TreeTableExpandWithRowStyle.html
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableExtraScrollBarWithChildren.html b/uitest/tb2/com/vaadin/tests/components/treetable/TreeTableExtraScrollBarWithChildren.html
index 611e7a5994..611e7a5994 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableExtraScrollBarWithChildren.html
+++ b/uitest/tb2/com/vaadin/tests/components/treetable/TreeTableExtraScrollBarWithChildren.html
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableExtraScrollbar.html b/uitest/tb2/com/vaadin/tests/components/treetable/TreeTableExtraScrollbar.html
index c499747232..c499747232 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableExtraScrollbar.html
+++ b/uitest/tb2/com/vaadin/tests/components/treetable/TreeTableExtraScrollbar.html
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableGeneratedColumns.html b/uitest/tb2/com/vaadin/tests/components/treetable/TreeTableGeneratedColumns.html
index 52d2fd7b3f..52d2fd7b3f 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableGeneratedColumns.html
+++ b/uitest/tb2/com/vaadin/tests/components/treetable/TreeTableGeneratedColumns.html
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableGeneratedRows.html b/uitest/tb2/com/vaadin/tests/components/treetable/TreeTableGeneratedRows.html
index 6419a8c251..6419a8c251 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableGeneratedRows.html
+++ b/uitest/tb2/com/vaadin/tests/components/treetable/TreeTableGeneratedRows.html
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableInternalError.html b/uitest/tb2/com/vaadin/tests/components/treetable/TreeTableInternalError.html
index 1aa952d77e..1aa952d77e 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableInternalError.html
+++ b/uitest/tb2/com/vaadin/tests/components/treetable/TreeTableInternalError.html
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.html b/uitest/tb2/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.html
index 5c878dba42..5c878dba42 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.html
+++ b/uitest/tb2/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.html
diff --git a/uitest/src/com/vaadin/tests/components/twincolselect/TwinColSelectParentDisabled.html b/uitest/tb2/com/vaadin/tests/components/twincolselect/TwinColSelectParentDisabled.html
index 266fef421d..266fef421d 100644
--- a/uitest/src/com/vaadin/tests/components/twincolselect/TwinColSelectParentDisabled.html
+++ b/uitest/tb2/com/vaadin/tests/components/twincolselect/TwinColSelectParentDisabled.html
diff --git a/uitest/src/com/vaadin/tests/components/twincolselect/TwinColSelectSelection.html b/uitest/tb2/com/vaadin/tests/components/twincolselect/TwinColSelectSelection.html
index 58187a37de..58187a37de 100644
--- a/uitest/src/com/vaadin/tests/components/twincolselect/TwinColSelectSelection.html
+++ b/uitest/tb2/com/vaadin/tests/components/twincolselect/TwinColSelectSelection.html
diff --git a/uitest/src/com/vaadin/tests/components/ui/ChangeFragmentOnServerToMatchClient.html b/uitest/tb2/com/vaadin/tests/components/ui/ChangeFragmentOnServerToMatchClient.html
index 8276f0fd89..8276f0fd89 100644
--- a/uitest/src/com/vaadin/tests/components/ui/ChangeFragmentOnServerToMatchClient.html
+++ b/uitest/tb2/com/vaadin/tests/components/ui/ChangeFragmentOnServerToMatchClient.html
diff --git a/uitest/src/com/vaadin/tests/components/ui/CurrentUiRetained.html b/uitest/tb2/com/vaadin/tests/components/ui/CurrentUiRetained.html
index fe030f2ea7..fe030f2ea7 100644
--- a/uitest/src/com/vaadin/tests/components/ui/CurrentUiRetained.html
+++ b/uitest/tb2/com/vaadin/tests/components/ui/CurrentUiRetained.html
diff --git a/uitest/src/com/vaadin/tests/components/ui/CustomUITest.html b/uitest/tb2/com/vaadin/tests/components/ui/CustomUITest.html
index 90f7df44d2..90f7df44d2 100644
--- a/uitest/src/com/vaadin/tests/components/ui/CustomUITest.html
+++ b/uitest/tb2/com/vaadin/tests/components/ui/CustomUITest.html
diff --git a/uitest/src/com/vaadin/tests/components/ui/EmptyWindow.html b/uitest/tb2/com/vaadin/tests/components/ui/EmptyWindow.html
index cc7b0751fc..cc7b0751fc 100644
--- a/uitest/src/com/vaadin/tests/components/ui/EmptyWindow.html
+++ b/uitest/tb2/com/vaadin/tests/components/ui/EmptyWindow.html
diff --git a/uitest/src/com/vaadin/tests/components/ui/FragmentChangeEvents.html b/uitest/tb2/com/vaadin/tests/components/ui/FragmentChangeEvents.html
index 972d3d6143..972d3d6143 100644
--- a/uitest/src/com/vaadin/tests/components/ui/FragmentChangeEvents.html
+++ b/uitest/tb2/com/vaadin/tests/components/ui/FragmentChangeEvents.html
diff --git a/uitest/src/com/vaadin/tests/components/ui/IdOverrideTest.html b/uitest/tb2/com/vaadin/tests/components/ui/IdOverrideTest.html
index 3a38712fb4..3a38712fb4 100644
--- a/uitest/src/com/vaadin/tests/components/ui/IdOverrideTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/ui/IdOverrideTest.html
diff --git a/uitest/src/com/vaadin/tests/components/ui/InitiallyEmptyFragment.html b/uitest/tb2/com/vaadin/tests/components/ui/InitiallyEmptyFragment.html
index 933274eae6..933274eae6 100644
--- a/uitest/src/com/vaadin/tests/components/ui/InitiallyEmptyFragment.html
+++ b/uitest/tb2/com/vaadin/tests/components/ui/InitiallyEmptyFragment.html
diff --git a/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.html b/uitest/tb2/com/vaadin/tests/components/ui/LazyInitUIs.html
index f2650ce1c2..f2650ce1c2 100644
--- a/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.html
+++ b/uitest/tb2/com/vaadin/tests/components/ui/LazyInitUIs.html
diff --git a/uitest/src/com/vaadin/tests/components/ui/PollListenerTest.html b/uitest/tb2/com/vaadin/tests/components/ui/PollListenerTest.html
index ac39d1f03c..ac39d1f03c 100644
--- a/uitest/src/com/vaadin/tests/components/ui/PollListenerTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/ui/PollListenerTest.html
diff --git a/uitest/src/com/vaadin/tests/components/ui/RpcInvocationHandlerToString.html b/uitest/tb2/com/vaadin/tests/components/ui/RpcInvocationHandlerToString.html
index c9d5aa303d..c9d5aa303d 100644
--- a/uitest/src/com/vaadin/tests/components/ui/RpcInvocationHandlerToString.html
+++ b/uitest/tb2/com/vaadin/tests/components/ui/RpcInvocationHandlerToString.html
diff --git a/uitest/src/com/vaadin/tests/components/ui/TestUITheme.html b/uitest/tb2/com/vaadin/tests/components/ui/TestUITheme.html
index ed2c0ec971..ed2c0ec971 100644
--- a/uitest/src/com/vaadin/tests/components/ui/TestUITheme.html
+++ b/uitest/tb2/com/vaadin/tests/components/ui/TestUITheme.html
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIAccessExceptionHandling.html b/uitest/tb2/com/vaadin/tests/components/ui/UIAccessExceptionHandling.html
index 94d8aa2777..94d8aa2777 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIAccessExceptionHandling.html
+++ b/uitest/tb2/com/vaadin/tests/components/ui/UIAccessExceptionHandling.html
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIInitBrowserDetails.html b/uitest/tb2/com/vaadin/tests/components/ui/UIInitBrowserDetails.html
index 3fd7a0d560..3fd7a0d560 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIInitBrowserDetails.html
+++ b/uitest/tb2/com/vaadin/tests/components/ui/UIInitBrowserDetails.html
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIInitException.html b/uitest/tb2/com/vaadin/tests/components/ui/UIInitException.html
index 68b11e7942..68b11e7942 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIInitException.html
+++ b/uitest/tb2/com/vaadin/tests/components/ui/UIInitException.html
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIPolling.html b/uitest/tb2/com/vaadin/tests/components/ui/UIPolling.html
index f770bae009..f770bae009 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIPolling.html
+++ b/uitest/tb2/com/vaadin/tests/components/ui/UIPolling.html
diff --git a/uitest/src/com/vaadin/tests/components/ui/UITabIndex.html b/uitest/tb2/com/vaadin/tests/components/ui/UITabIndex.html
index fa083f1489..fa083f1489 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UITabIndex.html
+++ b/uitest/tb2/com/vaadin/tests/components/ui/UITabIndex.html
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.html b/uitest/tb2/com/vaadin/tests/components/ui/UIsInMultipleTabs.html
index 08561588c4..08561588c4 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.html
+++ b/uitest/tb2/com/vaadin/tests/components/ui/UIsInMultipleTabs.html
diff --git a/uitest/src/com/vaadin/tests/components/uitest/base_theme_test.html b/uitest/tb2/com/vaadin/tests/components/uitest/base_theme_test.html
index cdbcf8bacc..cdbcf8bacc 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/base_theme_test.html
+++ b/uitest/tb2/com/vaadin/tests/components/uitest/base_theme_test.html
diff --git a/uitest/src/com/vaadin/tests/components/uitest/chameleon_theme_test.html b/uitest/tb2/com/vaadin/tests/components/uitest/chameleon_theme_test.html
index d5d70a62d2..d5d70a62d2 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/chameleon_theme_test.html
+++ b/uitest/tb2/com/vaadin/tests/components/uitest/chameleon_theme_test.html
diff --git a/uitest/src/com/vaadin/tests/components/uitest/liferay_theme_test.html b/uitest/tb2/com/vaadin/tests/components/uitest/liferay_theme_test.html
index 783784e993..783784e993 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/liferay_theme_test.html
+++ b/uitest/tb2/com/vaadin/tests/components/uitest/liferay_theme_test.html
diff --git a/uitest/src/com/vaadin/tests/components/uitest/reindeer_theme_test.html b/uitest/tb2/com/vaadin/tests/components/uitest/reindeer_theme_test.html
index 175def94d3..175def94d3 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/reindeer_theme_test.html
+++ b/uitest/tb2/com/vaadin/tests/components/uitest/reindeer_theme_test.html
diff --git a/uitest/src/com/vaadin/tests/components/uitest/runo_theme_test.html b/uitest/tb2/com/vaadin/tests/components/uitest/runo_theme_test.html
index 0db6614a9c..0db6614a9c 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/runo_theme_test.html
+++ b/uitest/tb2/com/vaadin/tests/components/uitest/runo_theme_test.html
diff --git a/uitest/src/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.html b/uitest/tb2/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.html
index 2e15d8d645..2e15d8d645 100644
--- a/uitest/src/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.html
+++ b/uitest/tb2/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.html
diff --git a/uitest/src/com/vaadin/tests/components/window/CloseSubWindow.html b/uitest/tb2/com/vaadin/tests/components/window/CloseSubWindow.html
index ae77628bff..ae77628bff 100644
--- a/uitest/src/com/vaadin/tests/components/window/CloseSubWindow.html
+++ b/uitest/tb2/com/vaadin/tests/components/window/CloseSubWindow.html
diff --git a/uitest/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.html b/uitest/tb2/com/vaadin/tests/components/window/EmbeddedInSubWindow.html
index d74e09dd6a..d74e09dd6a 100644
--- a/uitest/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.html
+++ b/uitest/tb2/com/vaadin/tests/components/window/EmbeddedInSubWindow.html
diff --git a/uitest/src/com/vaadin/tests/components/window/ExtraLargeSubWindow.html b/uitest/tb2/com/vaadin/tests/components/window/ExtraLargeSubWindow.html
index 128e3c3583..128e3c3583 100644
--- a/uitest/src/com/vaadin/tests/components/window/ExtraLargeSubWindow.html
+++ b/uitest/tb2/com/vaadin/tests/components/window/ExtraLargeSubWindow.html
diff --git a/uitest/src/com/vaadin/tests/components/window/ExtraWindowShown.html b/uitest/tb2/com/vaadin/tests/components/window/ExtraWindowShown.html
index 65e8b0166b..65e8b0166b 100644
--- a/uitest/src/com/vaadin/tests/components/window/ExtraWindowShown.html
+++ b/uitest/tb2/com/vaadin/tests/components/window/ExtraWindowShown.html
diff --git a/uitest/src/com/vaadin/tests/components/window/RepaintWindowContents.html b/uitest/tb2/com/vaadin/tests/components/window/RepaintWindowContents.html
index 9cbcf1d5ea..9cbcf1d5ea 100644
--- a/uitest/src/com/vaadin/tests/components/window/RepaintWindowContents.html
+++ b/uitest/tb2/com/vaadin/tests/components/window/RepaintWindowContents.html
diff --git a/uitest/src/com/vaadin/tests/components/window/SubWindowOrder.html b/uitest/tb2/com/vaadin/tests/components/window/SubWindowOrder.html
index 6fd99caa19..6fd99caa19 100644
--- a/uitest/src/com/vaadin/tests/components/window/SubWindowOrder.html
+++ b/uitest/tb2/com/vaadin/tests/components/window/SubWindowOrder.html
diff --git a/uitest/src/com/vaadin/tests/components/window/SubWindows-runo.html b/uitest/tb2/com/vaadin/tests/components/window/SubWindows-runo.html
index 5cbd350174..5cbd350174 100644
--- a/uitest/src/com/vaadin/tests/components/window/SubWindows-runo.html
+++ b/uitest/tb2/com/vaadin/tests/components/window/SubWindows-runo.html
diff --git a/uitest/src/com/vaadin/tests/components/window/SubWindows.html b/uitest/tb2/com/vaadin/tests/components/window/SubWindows.html
index 3b2109e3f1..3b2109e3f1 100644
--- a/uitest/src/com/vaadin/tests/components/window/SubWindows.html
+++ b/uitest/tb2/com/vaadin/tests/components/window/SubWindows.html
diff --git a/uitest/src/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.html b/uitest/tb2/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.html
index a3b56cd12a..a3b56cd12a 100644
--- a/uitest/src/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.html
+++ b/uitest/tb2/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.html
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowCaptionTest.html b/uitest/tb2/com/vaadin/tests/components/window/WindowCaptionTest.html
index 85ab67e4f6..85ab67e4f6 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowCaptionTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/window/WindowCaptionTest.html
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowClickEvents.html b/uitest/tb2/com/vaadin/tests/components/window/WindowClickEvents.html
index af5b9ec180..af5b9ec180 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowClickEvents.html
+++ b/uitest/tb2/com/vaadin/tests/components/window/WindowClickEvents.html
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.html b/uitest/tb2/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.html
index a27963a066..a27963a066 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.html
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.html b/uitest/tb2/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.html
index 4923bff58a..4923bff58a 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.html
+++ b/uitest/tb2/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.html
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowThemes.html b/uitest/tb2/com/vaadin/tests/components/window/WindowThemes.html
index 7e8d8af53d..7e8d8af53d 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowThemes.html
+++ b/uitest/tb2/com/vaadin/tests/components/window/WindowThemes.html
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowWithInvalidCloseListener.html b/uitest/tb2/com/vaadin/tests/components/window/WindowWithInvalidCloseListener.html
index 3ea1f8f732..3ea1f8f732 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowWithInvalidCloseListener.html
+++ b/uitest/tb2/com/vaadin/tests/components/window/WindowWithInvalidCloseListener.html
diff --git a/uitest/src/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.html b/uitest/tb2/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.html
index b5ccd53df0..b5ccd53df0 100644
--- a/uitest/src/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.html
+++ b/uitest/tb2/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.html
diff --git a/uitest/src/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.html b/uitest/tb2/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.html
index 8b955ce17d..8b955ce17d 100644
--- a/uitest/src/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.html
+++ b/uitest/tb2/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.html
diff --git a/uitest/src/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.html b/uitest/tb2/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.html
index 0bb576d76c..0bb576d76c 100644
--- a/uitest/src/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.html
+++ b/uitest/tb2/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.html
diff --git a/uitest/src/com/vaadin/tests/dd/DnDOnSubtree.html b/uitest/tb2/com/vaadin/tests/dd/DnDOnSubtree.html
index 844636cb02..844636cb02 100644
--- a/uitest/src/com/vaadin/tests/dd/DnDOnSubtree.html
+++ b/uitest/tb2/com/vaadin/tests/dd/DnDOnSubtree.html
diff --git a/uitest/src/com/vaadin/tests/dd/NotPaintedAcceptSource.html b/uitest/tb2/com/vaadin/tests/dd/NotPaintedAcceptSource.html
index 2fcede8be9..2fcede8be9 100644
--- a/uitest/src/com/vaadin/tests/dd/NotPaintedAcceptSource.html
+++ b/uitest/tb2/com/vaadin/tests/dd/NotPaintedAcceptSource.html
diff --git a/uitest/src/com/vaadin/tests/debug/DebugWindowPresent.html b/uitest/tb2/com/vaadin/tests/debug/DebugWindowPresent.html
index ff5c731e5c..ff5c731e5c 100644
--- a/uitest/src/com/vaadin/tests/debug/DebugWindowPresent.html
+++ b/uitest/tb2/com/vaadin/tests/debug/DebugWindowPresent.html
diff --git a/uitest/src/com/vaadin/tests/extensions/BasicExtensionTest.html b/uitest/tb2/com/vaadin/tests/extensions/BasicExtensionTest.html
index 85a5900b74..85a5900b74 100644
--- a/uitest/src/com/vaadin/tests/extensions/BasicExtensionTest.html
+++ b/uitest/tb2/com/vaadin/tests/extensions/BasicExtensionTest.html
diff --git a/uitest/src/com/vaadin/tests/extensions/JavascriptManagerTest.html b/uitest/tb2/com/vaadin/tests/extensions/JavascriptManagerTest.html
index 7bdb8cd50f..7bdb8cd50f 100644
--- a/uitest/src/com/vaadin/tests/extensions/JavascriptManagerTest.html
+++ b/uitest/tb2/com/vaadin/tests/extensions/JavascriptManagerTest.html
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/BooleanTextField.html b/uitest/tb2/com/vaadin/tests/fieldgroup/BooleanTextField.html
index 92c03e14f4..92c03e14f4 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/BooleanTextField.html
+++ b/uitest/tb2/com/vaadin/tests/fieldgroup/BooleanTextField.html
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/CommitHandlerFailures.html b/uitest/tb2/com/vaadin/tests/fieldgroup/CommitHandlerFailures.html
index aaaa0a6625..aaaa0a6625 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/CommitHandlerFailures.html
+++ b/uitest/tb2/com/vaadin/tests/fieldgroup/CommitHandlerFailures.html
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionError.html b/uitest/tb2/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionError.html
index 8681c6485e..8681c6485e 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionError.html
+++ b/uitest/tb2/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionError.html
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/DateForm.html b/uitest/tb2/com/vaadin/tests/fieldgroup/DateForm.html
index f141091805..f141091805 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/DateForm.html
+++ b/uitest/tb2/com/vaadin/tests/fieldgroup/DateForm.html
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/FieldGroupDiscard.html b/uitest/tb2/com/vaadin/tests/fieldgroup/FieldGroupDiscard.html
index a2ac1b748b..a2ac1b748b 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/FieldGroupDiscard.html
+++ b/uitest/tb2/com/vaadin/tests/fieldgroup/FieldGroupDiscard.html
diff --git a/uitest/src/com/vaadin/tests/fields/TabIndexes.html b/uitest/tb2/com/vaadin/tests/fields/TabIndexes.html
index a78be3045c..a78be3045c 100644
--- a/uitest/src/com/vaadin/tests/fields/TabIndexes.html
+++ b/uitest/tb2/com/vaadin/tests/fields/TabIndexes.html
diff --git a/uitest/src/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.html b/uitest/tb2/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.html
index 6dab84d718..6dab84d718 100644
--- a/uitest/src/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.html
+++ b/uitest/tb2/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.html
diff --git a/uitest/src/com/vaadin/tests/layouts/CssLayoutRemoveComponent.html b/uitest/tb2/com/vaadin/tests/layouts/CssLayoutRemoveComponent.html
index 0932be5d81..0932be5d81 100644
--- a/uitest/src/com/vaadin/tests/layouts/CssLayoutRemoveComponent.html
+++ b/uitest/tb2/com/vaadin/tests/layouts/CssLayoutRemoveComponent.html
diff --git a/uitest/src/com/vaadin/tests/layouts/GridLayoutSpanExpansion.html b/uitest/tb2/com/vaadin/tests/layouts/GridLayoutSpanExpansion.html
index 5237d5f49e..5237d5f49e 100644
--- a/uitest/src/com/vaadin/tests/layouts/GridLayoutSpanExpansion.html
+++ b/uitest/tb2/com/vaadin/tests/layouts/GridLayoutSpanExpansion.html
diff --git a/uitest/src/com/vaadin/tests/layouts/MarginWithExpandRatio.html b/uitest/tb2/com/vaadin/tests/layouts/MarginWithExpandRatio.html
index 3132bdd16d..3132bdd16d 100644
--- a/uitest/src/com/vaadin/tests/layouts/MarginWithExpandRatio.html
+++ b/uitest/tb2/com/vaadin/tests/layouts/MarginWithExpandRatio.html
diff --git a/uitest/src/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.html b/uitest/tb2/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.html
index e93332c0a5..e93332c0a5 100644
--- a/uitest/src/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.html
+++ b/uitest/tb2/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.html
diff --git a/uitest/src/com/vaadin/tests/layouts/MovingInvisibleField.html b/uitest/tb2/com/vaadin/tests/layouts/MovingInvisibleField.html
index a3f3f84dac..a3f3f84dac 100644
--- a/uitest/src/com/vaadin/tests/layouts/MovingInvisibleField.html
+++ b/uitest/tb2/com/vaadin/tests/layouts/MovingInvisibleField.html
diff --git a/uitest/src/com/vaadin/tests/layouts/TreeWithBordersInLayout.html b/uitest/tb2/com/vaadin/tests/layouts/TreeWithBordersInLayout.html
index e1034c2f0e..e1034c2f0e 100644
--- a/uitest/src/com/vaadin/tests/layouts/TreeWithBordersInLayout.html
+++ b/uitest/tb2/com/vaadin/tests/layouts/TreeWithBordersInLayout.html
diff --git a/uitest/src/com/vaadin/tests/layouts/VerticalLayoutSlotExpansionAndAlignment.html b/uitest/tb2/com/vaadin/tests/layouts/VerticalLayoutSlotExpansionAndAlignment.html
index e0b17ec8cf..e0b17ec8cf 100644
--- a/uitest/src/com/vaadin/tests/layouts/VerticalLayoutSlotExpansionAndAlignment.html
+++ b/uitest/tb2/com/vaadin/tests/layouts/VerticalLayoutSlotExpansionAndAlignment.html
diff --git a/uitest/src/com/vaadin/tests/navigator/NavigatorTest.html b/uitest/tb2/com/vaadin/tests/navigator/NavigatorTest.html
index 7eba02aa94..7eba02aa94 100644
--- a/uitest/src/com/vaadin/tests/navigator/NavigatorTest.html
+++ b/uitest/tb2/com/vaadin/tests/navigator/NavigatorTest.html
diff --git a/uitest/src/com/vaadin/tests/requesthandlers/AppResource404.html b/uitest/tb2/com/vaadin/tests/requesthandlers/AppResource404.html
index 543faa30dd..543faa30dd 100644
--- a/uitest/src/com/vaadin/tests/requesthandlers/AppResource404.html
+++ b/uitest/tb2/com/vaadin/tests/requesthandlers/AppResource404.html
diff --git a/uitest/src/com/vaadin/tests/serialization/ChangeStateWhenReattaching.html b/uitest/tb2/com/vaadin/tests/serialization/ChangeStateWhenReattaching.html
index 865f2bae0b..865f2bae0b 100644
--- a/uitest/src/com/vaadin/tests/serialization/ChangeStateWhenReattaching.html
+++ b/uitest/tb2/com/vaadin/tests/serialization/ChangeStateWhenReattaching.html
diff --git a/uitest/src/com/vaadin/tests/serialization/DelegateToWidgetTest.html b/uitest/tb2/com/vaadin/tests/serialization/DelegateToWidgetTest.html
index 12228eb9f0..12228eb9f0 100644
--- a/uitest/src/com/vaadin/tests/serialization/DelegateToWidgetTest.html
+++ b/uitest/tb2/com/vaadin/tests/serialization/DelegateToWidgetTest.html
diff --git a/uitest/src/com/vaadin/tests/serialization/DelegateWithoutStateClass.html b/uitest/tb2/com/vaadin/tests/serialization/DelegateWithoutStateClass.html
index 2ee77b2d9f..2ee77b2d9f 100644
--- a/uitest/src/com/vaadin/tests/serialization/DelegateWithoutStateClass.html
+++ b/uitest/tb2/com/vaadin/tests/serialization/DelegateWithoutStateClass.html
diff --git a/uitest/src/com/vaadin/tests/serialization/SerializerNamespaceTest.html b/uitest/tb2/com/vaadin/tests/serialization/SerializerNamespaceTest.html
index 70d0e905f5..70d0e905f5 100644
--- a/uitest/src/com/vaadin/tests/serialization/SerializerNamespaceTest.html
+++ b/uitest/tb2/com/vaadin/tests/serialization/SerializerNamespaceTest.html
diff --git a/uitest/src/com/vaadin/tests/themes/CSSInjectTest.html b/uitest/tb2/com/vaadin/tests/themes/CSSInjectTest.html
index 0c70d6f711..0c70d6f711 100644
--- a/uitest/src/com/vaadin/tests/themes/CSSInjectTest.html
+++ b/uitest/tb2/com/vaadin/tests/themes/CSSInjectTest.html
diff --git a/uitest/src/com/vaadin/tests/vaadincontext/BootstrapModifyUI.html b/uitest/tb2/com/vaadin/tests/vaadincontext/BootstrapModifyUI.html
index 83db83b5f7..83db83b5f7 100644
--- a/uitest/src/com/vaadin/tests/vaadincontext/BootstrapModifyUI.html
+++ b/uitest/tb2/com/vaadin/tests/vaadincontext/BootstrapModifyUI.html
diff --git a/uitest/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.html b/uitest/tb2/com/vaadin/tests/validation/EmptyFieldErrorIndicators.html
index c8fcb20411..c8fcb20411 100644
--- a/uitest/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.html
+++ b/uitest/tb2/com/vaadin/tests/validation/EmptyFieldErrorIndicators.html
diff --git a/uitest/src/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.html b/uitest/tb2/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.html
index 62d972e89f..62d972e89f 100644
--- a/uitest/src/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.html
+++ b/uitest/tb2/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.html
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/ReplaceComponent.html b/uitest/tb2/com/vaadin/tests/widgetset/server/ReplaceComponent.html
index 79b231949c..79b231949c 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/ReplaceComponent.html
+++ b/uitest/tb2/com/vaadin/tests/widgetset/server/ReplaceComponent.html
diff --git a/uitest/test.xml b/uitest/test.xml
index 2ee655ecf6..496e115c18 100644
--- a/uitest/test.xml
+++ b/uitest/test.xml
@@ -38,7 +38,7 @@
 
     <!-- fileset containing all TestBench tests to run -->
     <fileset dir="${test.xml.dir}" id="html-test-files">
-        <include name="src/**/*.html" />
+        <include name="tb2/**/*.html" />
         <exclude name="integration-testscripts/**/*.html" />
     </fileset>
author	Leif Åstrand <leif@vaadin.com>	2014-12-18 18:30:09 +0200
committer	Leif Åstrand <leif@vaadin.com>	2014-12-18 18:30:09 +0200
commit	e3d0fbbab68f9ef8642a975741d9f576993b1f38 (patch)
tree	5711a31c5af1d3773a86b4d25c9f8064aa435ecc /uitest
parent	434fb5bf5cf62490686367e9193b7898077bbd44 (diff)
parent	68eec666b55c42b4a55235c00bc78f6212eb2062 (diff)
download	vaadin-framework-e3d0fbbab68f9ef8642a975741d9f576993b1f38.tar.gz vaadin-framework-e3d0fbbab68f9ef8642a975741d9f576993b1f38.zip