Change-Id: I1c6d830c8a71674c264738f709ad12da3b91cd5c

8 years ago · 8c0733d756
--- a/uitest/build.xml
+++ b/uitest/build.xml
@@ -194,23 +194,10 @@
                <ant antfile="${uitest.dir}/vaadin-server.xml"
                    target="wait-for-startup" />

                <!-- Run all different kinds of TestBench tests in parallel -->
                <parallel>

                    <!-- Legacy TestBench 2 tests -->
                    <sequential>
                        <ant antfile="${uitest.dir}/test.xml"
                            target="tb2-tests" />
                        <echo message="TestBench 2 tests complete" />
                    </sequential>

                    <!-- TestBench 3 tests -->
                    <sequential>
                        <ant antfile="${uitest.dir}/tb3test.xml"
                            target="run-all-tb3-tests" inheritall="true" />
                        <echo message="TestBench 3 tests complete" />
                    </sequential>
                </parallel>
                    <ant antfile="${uitest.dir}/tb3test.xml"
                        target="run-all-tb3-tests" inheritall="true" />
                    <echo message="TestBench 3 tests complete" />
            </sequential>
        </parallel>
    </target>
@@ -233,22 +220,6 @@
        </parallel>
    </target>

    <target name="test-tb2" depends="clean-testbench-errors">
        <property name="war.file"
            location="${vaadin.basedir}/result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" />
        <parallel>
            <daemons>
                <ant antfile="${uitest.dir}/vaadin-server.xml"
                    inheritall="true" inheritrefs="true" target="deploy-and-start" />
            </daemons>
            <sequential>
                <ant antfile="${uitest.dir}/vaadin-server.xml"
                    target="wait-for-startup" />
                <ant antfile="${uitest.dir}/test.xml" target="tb2-tests" />
            </sequential>
        </parallel>
    </target>

    <target name="test-tb3" depends="clean-testbench-errors">
        <property name="war.file"
            location="${vaadin.basedir}/result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" />
--- a/uitest/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html
+++ b/uitest/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html
@@ -1,318 +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>integration-test-GateIn-3.1.0-portlet2</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">integration-test-GateIn-3.1.0-portlet2</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/portal/public/classic/</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClickAndWait</td>
 	<td>link=Administrator</td>
 	<td>27,7</td>
 </tr>
 <tr>
 	<td>mouseClickAndWait</td>
 	<td>link=Application Registry</td>
 	<td>93,13</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>link=Portlet</td>
 	<td>33,11</td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
 	<td>link=Vaadin Portlet 2.0 Test</td>
 	<td>59,9</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>link=Vaadin Portlet 2.0 Test</td>
 	<td>59,9</td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
 	<td>link=Click here to add into categories</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>link=Click here to add into categories</td>
 	<td>48,3</td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
 	<td>name=category_Gadgets</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>name=category_Gadgets</td>
 	<td>10,16</td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
 	<td>link=Save</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>link=Save</td>
 	<td>4,6</td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
 	<td>link=Vaadin Liferay Theme</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>link=Vaadin Liferay Theme</td>
 	<td>64,13</td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
 	<td>link=Click here to add into categories</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>link=Click here to add into categories</td>
 	<td>96,9</td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
 	<td>name=category_Gadgets</td>
 	<td>7,12</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>name=category_Gadgets</td>
 	<td>7,12</td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
 	<td>link=Save</td>
 	<td>4,6</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>link=Save</td>
 	<td>4,6</td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
 	<td>link=Add New Page</td>
 	<td>55,11</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>link=Add New Page</td>
 	<td>55,11</td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
 	<td>pageName</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>pageName</td>
 	<td>33,16</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>pageName</td>
 	<td>Portlet2</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
 	<td>36,12</td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
 	<td>//div[@id='UIDropDownPageTemp']/div[1]/div/div/div/div/div/div</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
 	<td>21,13</td>
 </tr>
 <!--Drag JSR286 test portlet to page-->
 <tr>
 	<td>waitForElementPresent</td>
 	<td>//div[@id='Gadgets/JSR286TestPortlet']/div/div/div/div</td>
 	<td></td>
 </tr>
 <tr>
 	<td>drag</td>
 	<td>//div[@id='Gadgets/JSR286TestPortlet']/div/div/div/div</td>
 	<td></td>
 </tr>
 <tr>
 	<td>drop</td>
 	<td>//div[2]/div/div/div[1]/div/div[2]/div/div/div/div</td>
 	<td>113,9</td>
 </tr>
 <tr>
 	<td>waitForTextPresent</td>
 	<td>Vaadin Portlet 2.0 Test</td>
 	<td></td>
 </tr>
 <!--Switch to portlet user mode-->
 <tr>
 	<td>mouseClickAndWait</td>
 	<td>//a[@onclick='eXo.core.DOMUtil.disableOnClick(this);']</td>
 	<td>13,5</td>
 </tr>
 <!--Start of actual portlet test-->
 <tr>
 	<td>waitForElementPresent</td>
 	<td>//div[contains(@class,'PORTLET-FRAGMENT')]/div[contains(@class,'v-app')]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTextPresent</td>
 	<td>Test of ApplicationResources with full path</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>//body/div[2]/div//p</td>
 	<td>exact:Mode: view State: normal</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>initial</td>
 </tr>
 <tr>
 	<td>closeNotification</td>
 	<td>//body/div[2]/div</td>
 	<td>0,0</td>
 </tr>
 <tr>
 	<td>assertTextNotPresent</td>
 	<td>Action * received</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>//div[@class=&quot;v-link v-widget&quot;]/a/span</td>
 	<td>Edit</td>
 </tr>
 <!--Send an action-->
 <tr>
 	<td>mouseClickAndWait</td>
 	<td>//div[8]/div/a/span</td>
 	<td>32,9</td>
 </tr>
 <tr>
 	<td>assertTextPresent</td>
 	<td>Action 'someAction' received</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>//body/div[2]/div//p</td>
 	<td>exact:Mode: view State: normal</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>//div[@class=&quot;v-link v-widget&quot;]/a/span</td>
 	<td>Edit</td>
 </tr>
 <tr>
 	<td>closeNotification</td>
 	<td>//body/div[2]/div</td>
 	<td>0,0</td>
 </tr>
 <!--Switch to edit mode-->
 <tr>
 	<td>mouseClickAndWait</td>
 	<td>//div[5]/div/a/span</td>
 	<td>12,3</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>//body/div[2]/div//p</td>
 	<td>exact:Mode: edit State: normal</td>
 </tr>
 <tr>
 	<td>closeNotification</td>
 	<td>//body/div[2]/div</td>
 	<td>0,0</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>//div[@class=&quot;v-link v-widget&quot;]/a/span</td>
 	<td>Done</td>
 </tr>
 <!--Maximize-->
 <tr>
 	<td>mouseClickAndWait</td>
 	<td>//div[6]/div/a/span</td>
 	<td>16,7</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>//body/div[2]/div//p</td>
 	<td>exact:Mode: edit State: normal</td>
 </tr>
 <tr>
 	<td>closeNotification</td>
 	<td>//body/div[2]/div</td>
 	<td>0,0</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>//div[6]/div/a/span</td>
 	<td>Maximize</td>
 </tr>
 <!--Restore back to normal-->
 <tr>
 	<td>mouseClickAndWait</td>
 	<td>//div[6]/div/a/span</td>
 	<td>71,8</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>//body/div[2]/div//p</td>
 	<td>exact:Mode: edit State: normal</td>
 </tr>
 <tr>
 	<td>closeNotification</td>
 	<td>//body/div[2]/div</td>
 	<td>0,0</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>//div[@class=&quot;v-link v-widget&quot;]/a/span</td>
 	<td>Done</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>//div[6]/div/a/span</td>
 	<td>Maximize</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>final</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/integration-testscripts/GoogleAppEngine/integration-test-GAE.html
+++ b/uitest/integration-testscripts/GoogleAppEngine/integration-test-GAE.html
@@ -1,42 +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="http://vaadin-integration-test.appspot.com/" />
 <title>integration-test-GAE</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">integration-test-GAE</td></tr>
 </thead><tbody>
 <tr>
 	<td>openAndWait</td>
 	<td>/integration/?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>pause</td>
 	<td>5000</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=integration::/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
 	<td>51,13</td>
 </tr>
 <tr>
 	<td>pause</td>
 	<td>5000</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=integration::/VVerticalLayout[0]/ChildComponentContainer[1]/VLabel[0]</td>
 	<td>FI</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html
+++ b/uitest/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html
@@ -1,221 +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>integration-test-liferay-5.2.3-portlet2</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">integration-test-liferay-5.2.3-portlet2</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/web/guest/home</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClickAndWait</td>
 	<td>link=Login as bruno</td>
 	<td>43,14</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>//div[@id='add-page']/a/span</td>
 	<td>51,17</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>new_page</td>
 	<td>portlet2</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>link=Save</td>
 	<td>35,10</td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
 	<td>//div[@id='navigation']/ul/li[2]/a/span</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClickAndWait</td>
 	<td>//div[@id='navigation']/ul/li[2]/a/span</td>
 	<td>19,8</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>link=Layout Template</td>
 	<td>122,21</td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
 	<td>layoutTemplateId1</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>layoutTemplateId1</td>
 	<td>65,78</td>
 </tr>
 <tr>
 	<td>mouseClickAndWait</td>
 	<td>document.forms[1].elements[14]</td>
 	<td>23,12</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>link=Add Application</td>
 	<td>134,16</td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
 	<td>//div[@id='Vaadin']/h2/span</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClickAndWait</td>
 	<td>//div[@id='Vaadin-VaadinPortlet20Test']/p/a</td>
 	<td>16,11</td>
 </tr>
 <!--Start of actual portlet test-->
 <tr>
 	<td>waitForElementPresent</td>
 	<td>//div[2]/div/div/div/span</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>//div[2]/div/div/div/span</td>
 	<td>Test of ApplicationResources with full path</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>//body/div[2]/div//p</td>
 	<td>exact:Mode: view State: normal</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>initial</td>
 </tr>
 <tr>
 	<td>closeNotification</td>
 	<td>//body/div[2]/div</td>
 	<td>0,0</td>
 </tr>
 <tr>
 	<td>assertTextNotPresent</td>
 	<td>Action * received</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>//div[@class=&quot;v-link v-widget&quot;]/a/span</td>
 	<td>Edit</td>
 </tr>
 <!--Send an action-->
 <tr>
 	<td>mouseClickAndWait</td>
 	<td>//div[8]/div/a/span</td>
 	<td>32,9</td>
 </tr>
 <tr>
 	<td>assertTextPresent</td>
 	<td>Action 'someAction' received</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>//body/div[2]/div//p</td>
 	<td>exact:Mode: view State: normal</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>//div[@class=&quot;v-link v-widget&quot;]/a/span</td>
 	<td>Edit</td>
 </tr>
 <tr>
 	<td>closeNotification</td>
 	<td>//body/div[2]/div</td>
 	<td>0,0</td>
 </tr>
 <!--Switch to edit mode-->
 <tr>
 	<td>mouseClickAndWait</td>
 	<td>//div[5]/div/a/span</td>
 	<td>12,3</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>//body/div[2]/div//p</td>
 	<td>exact:Mode: edit State: normal</td>
 </tr>
 <tr>
 	<td>closeNotification</td>
 	<td>//body/div[2]/div</td>
 	<td>0,0</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>//div[@class=&quot;v-link v-widget&quot;]/a/span</td>
 	<td>Done</td>
 </tr>
 <!--Maximize-->
 <tr>
 	<td>mouseClickAndWait</td>
 	<td>//div[6]/div/a/span</td>
 	<td>16,7</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>//body/div[2]/div//p</td>
 	<td>exact:Mode: edit State: maximized</td>
 </tr>
 <tr>
 	<td>closeNotification</td>
 	<td>//body/div[2]/div</td>
 	<td>0,0</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>//div[6]/div/a/span</td>
 	<td>Back to normal</td>
 </tr>
 <!--Restore back to normal-->
 <tr>
 	<td>mouseClickAndWait</td>
 	<td>//div[6]/div/a/span</td>
 	<td>71,8</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>//body/div[2]/div//p</td>
 	<td>exact:Mode: edit State: normal</td>
 </tr>
 <tr>
 	<td>closeNotification</td>
 	<td>//body/div[2]/div</td>
 	<td>0,0</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>//div[@class=&quot;v-link v-widget&quot;]/a/span</td>
 	<td>Done</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>//div[6]/div/a/span</td>
 	<td>Maximize</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>final</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/integration-testscripts/Liferay-6EE/Liferay6EE-theme.html
+++ b/uitest/integration-testscripts/Liferay-6EE/Liferay6EE-theme.html
@@ -1,384 +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>integration-test-liferay-6.0.5</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">integration-test-liferay-6.0.5</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/web/guest/vaadin-liferay-theme</td>
 	<td></td>
 </tr>
 <!--Start actual test-->
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>labels</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>33,-133</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>buttons</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>19,-131</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>textfields</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>34,-130</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>selects</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>
 	<td>6,-128</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>selects-openedcombobox</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[4]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>38,-129</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>datefields</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[1]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VPopupCalendar[0]/domChild[1]</td>
 	<td>5,-131</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>datefields-popup</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[5]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>23,-127</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>sliders</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[6]/domChild[0]/domChild[0]</td>
 	<td>9,-146</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>tabs</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
 	<td>8,-145</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
 	<td>8,-145</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
 	<td>8,-145</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
 	<td>8,-145</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
 	<td>8,-145</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
 	<td>8,-145</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
 	<td>8,-145</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
 	<td>8,-145</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
 	<td>8,-145</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
 	<td>8,-145</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
 	<td>8,-145</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
 	<td>8,-145</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>
 	<td>5,-147</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[2]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[7]/domChild[0]/domChild[0]/domChild[1]</td>
 	<td>3,-147</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>tabs-scrolled-closabletabs-selectedtab</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[7]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>24,-144</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>accordions</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[4]/AbsolutePanel[0]/ChildComponentContainer[0]/VAccordion[0]/domChild[3]/domChild[0]/domChild[0]</td>
 	<td>148,-142</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>accordions-opensheet4</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[8]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>10,-147</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>panels</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[9]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>14,-148</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>tables</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[6]/AbsolutePanel[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[0]/domChild[1]</td>
 	<td>10,-139</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>tables-columnselection</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[10]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>6,-147</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>trees</td>
 </tr>
 <!--
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[7]/AbsolutePanel[0]/ChildComponentContainer[0]/VTree[0]/domChild[0]/domChild[0]</td>
 	<td>5,-143</td>
 </tr>
 <tr>
 	<td>contextmenu</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[7]/AbsolutePanel[0]/ChildComponentContainer[0]/VTree[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[1]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>trees-openednode-contextmenu</td>
 </tr>
 -->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[11]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>14,-146</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>windows</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
 	<td>6,-146</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
 	<td>6,-146</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
 	<td>6,-146</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[12]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>20,-141</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>splitpanels</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[8]/AbsolutePanel[0]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>
 	<td>11,-145</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>splitpanels-locked</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[13]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>17,-147</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>notifications</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>notifications-humanized</td>
 </tr>
 <tr>
 	<td>closeNotification</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[0]/VButton[1]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>notifications-warning</td>
 </tr>
 <tr>
 	<td>closeNotification</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[0]/VButton[2]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>notifications-error</td>
 </tr>
 <tr>
 	<td>closeNotification</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[0]/VButton[3]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>notifications-tray</td>
 </tr>
 <tr>
 	<td>closeNotification</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]#item0</td>
 	<td>3,-146</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>openedmenu</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/integration-testscripts/Liferay-6EE/integration-test-liferay-6ee.html
+++ b/uitest/integration-testscripts/Liferay-6EE/integration-test-liferay-6ee.html
@@ -1,21 +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>integration-test-liferay-6ee</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">integration-test-liferay-6ee</td></tr>
 </thead><tbody>
 <tr>
 	<td>includeTest</td>
 	<td></td>
 	<td>../Liferay-6/integration-test-liferay-6.0.5.html</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/integration_tests.xml
+++ b/uitest/integration_tests.xml
@@ -81,29 +81,6 @@
        </subant>
    </target>

    <!-- Run integration test on GAE -->
    <target name="integration-test-test-GAE">
        <fileset dir="integration-testscripts" id="html-test-files" includes="GoogleAppEngine/integration-test-GAE.html" />
        <pathconvert pathsep=" " property="test-GAE" refid="html-test-files" />

        <subant target="run-tb2-tests" failonerror="false" antfile="test.xml">
            <property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />
            <property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />
            <property name="com.vaadin.testbench.deployment.url" value="http://vaadin-integration-test-hrd.appspot.com/" />
            <property name="server.start.succeeded" value="1" />
            <property name="browsers" value="${test_browsers}" />
            <property name="testfiles" value="${test-GAE}" />
            <property name="test-output-dir" value="../build/integration-test-gae-output" />
            <property name="report.qualifier" value="integration-gae-tb2/${server-name}" />

            <fileset dir="." includes="test.xml" />
        </subant>
    </target>

    <target name="integration-test-deploy-to-GAE">
        <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} deploy-to-GAE" />
    </target>

    <target name="run-tb3-servlet-test">
        <antcall target="run-tb3-test" inheritall="true">
            <param name="junit.test.suite" value="com.vaadin.tests.tb3.ServletIntegrationTests" />
@@ -275,7 +252,6 @@
        <fileset dir="integration-testscripts" id="html-theme-files" includes="Liferay-6/Liferay6-theme.html" />
        <pathconvert pathsep=" " property="testfiles-theme" refid="html-theme-files" />


        <antcall target="run-generic-integration-test">
            <param name="startDelay" value="600" />
            <param name="test_browsers" value="winxp-firefox17-esr" />
@@ -283,27 +259,6 @@
        </antcall>
    </target>

    <target name="integration-test-liferay5">
        <fileset dir="integration-testscripts" id="html-test-files" includes="Liferay-5/integration-test-liferay-5.2.3-portlet2.html" />
        <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />

        <antcall target="run-generic-integration-test">
            <param name="startDelay" value="600" />
            <param name="test_browsers" value="winxp-firefox17-esr" />
            <param name="target-server" value="liferay5" />
        </antcall>
    </target>

    <target name="integration-test-gatein3">
        <fileset dir="integration-testscripts" id="html-test-files" includes="GateIn-3/integration-test-GateIn-3.1.0-portlet2.html" />
        <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
        <antcall target="run-generic-integration-test">
            <param name="startDelay" value="600" />
            <param name="test_browsers" value="winxp-googlechrome21" />
            <param name="target-server" value="gatein3" />
        </antcall>
    </target>

    <target name="integration-test-websphere8">
        <antcall target="run-generic-integration-test">
            <param name="startDelay" value="600" />
@@ -353,11 +308,6 @@
        </antcall>
    </target>

    <target name="integration-test-GAE">
        <antcall target="integration-test-deploy-to-GAE" />
        <antcall target="integration-test-test-GAE" />
    </target>

    <!-- Upload demo, clean error screenshots and test deployment on all
        servers -->
    <target name="integration-test-all" unless="tests.integration.skip">
@@ -368,37 +318,11 @@
        <mkdir dir="${report.dir}" />

        <parallel>
            <antcontrib:trycatch property="tried">
                <try>
                    <!-- Still running GAE test from the old server which
                    requires its own lock -->

                    <echo message="Getting lock" />
                    <antcall target="integration-test-get-lock" />
                    <echo message="Got lock" />
                    <antcall target="integration-test-upload-demo" />

                    <antcall target="run-integration-test">
                        <param name="target-server" value="GAE" />
                    </antcall>

                    <antcall target="integration-test-clean" />
                    <echo message="Getting lock" />
                    <antcall target="integration-test-release-lock" />
                    <echo message="Lock released" />

                </try>
                <catch>
                    <echo message="Uploading of demo.war failed. ${tried}" />
                </catch>
            </antcontrib:trycatch>
            <antcall target="integration-test-liferay6" />
            <antcall target="integration-test-liferay6-theme" />
            <antcall target="integration-test-weblogicPortal" />
            <antcall target="integration-test-liferay5" />
            <antcall target="integration-test-weblogic10" />
            <antcall target="integration-test-weblogic12" />
            <antcall target="integration-test-gatein3" />
            <antcall target="integration-test-glassfish3" />
            <antcall target="integration-test-glassfish4" />
            <antcall target="integration-test-jboss4" />
@@ -418,8 +342,6 @@
            <antcall target="integration-test-osgi" />
            <antcall target="integration-test-tomcat7apacheproxy" />
            <antcall target="integration-test-websphere8" />
            <!-- Currently the test system does not have a server for automatic testing of WebSphere Portal 8 -->
            <!-- <antcall target="integration-test-websphereportal8" /> -->
        </parallel>

    </target>
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.htm
+++ b/uitest/src/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.htm
@@ -1,71 +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>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
    <td>open</td>
    <td>/run/com.vaadin.tests.components.calendar.CalendarActionsMenuTest?restartApplication</td>
    <td></td>
 </tr>
 <tr>
    <td>contextmenu</td>
    <td>vaadin=runcomvaadintestscomponentscalendarCalendarActionsMenuTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[1]</td>
    <td></td>
 </tr>
 <tr>
    <td>assertText</td>
    <td>//td[@class='gwt-MenuItem']/div</td>
    <td>ACTION</td>
 </tr>
 <tr>
    <td>mouseClick</td>
    <td>vaadin=runcomvaadintestscomponentscalendarCalendarActionsMenuTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[2]</td>
    <td>127,5</td>
 </tr>
 <tr>
    <td>mouseClick</td>
    <td>vaadin=runcomvaadintestscomponentscalendarCalendarActionsMenuTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[0]</td>
    <td>155,9</td>
 </tr>
 <tr>
    <td>contextmenu</td>
    <td>vaadin=runcomvaadintestscomponentscalendarCalendarActionsMenuTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]/domChild[34]/domChild[1]</td>
    <td></td>
 </tr>
 <tr>
    <td>assertText</td>
    <td>//td[@class='gwt-MenuItem']/div</td>
    <td>ACTION</td>
 </tr>
 <tr>
    <td>mouseClick</td>
    <td>vaadin=runcomvaadintestscomponentscalendarCalendarActionsMenuTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]/domChild[13]</td>
    <td>139,0</td>
 </tr>
 <tr>
    <td>contextmenu</td>
    <td>vaadin=runcomvaadintestscomponentscalendarCalendarActionsMenuTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]/domChild[14]</td>
    <td></td>
 </tr>
 <tr>
    <td>assertText</td>
    <td>//td[@class='gwt-MenuItem']/div</td>
    <td>ACTION</td>
 </tr>
 <tr>
    <td>mouseClick</td>
    <td>vaadin=runcomvaadintestscomponentscalendarCalendarActionsMenuTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]/domChild[13]</td>
    <td>139,0</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInPopup.htm
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInPopup.htm
@@ -1,48 +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>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.combobox.ComboBoxInPopup?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxInPopup::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>
 	<td>12,13</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxInPopup::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item1</td>
 	<td>Yes</td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxInPopup::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item1</td>
 	<td>esc</td>
 </tr>
 <!--ensure the sub window is still open but the popup is not-->
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxInPopup::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>A combo box</td>
 </tr>
 <tr>
 	<td>assertElementNotPresent</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxInPopup::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item1</td>
 	<td></td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/VerifyBrowserVersion.html
+++ b/uitest/tb2/com/vaadin/tests/VerifyBrowserVersion.html
@@ -1,26 +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="http://localhost:8080/" />
 <title>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.VerifyBrowserVersion?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>userAgent</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/browserfeatures/FullHeightScrollbar.html
+++ b/uitest/tb2/com/vaadin/tests/browserfeatures/FullHeightScrollbar.html
@@ -1,47 +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="http://192.168.2.41:8888/" />
 <title>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/statictestfiles/browserfeatures/fullHeightScrollbar.html</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>1-withScrolling</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>disableScrolling</td>
 	<td>34,7</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>2-withoutScrolling</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>triggerReflow</td>
 	<td>34,7</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>3-afterReflow</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.html
+++ b/uitest/tb2/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.html
@@ -1,32 +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>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
    <td>open</td>
    <td>/run/com.vaadin.tests.browserfeatures.WebkitScrollbarTest?restartApplication</td>
    <td></td>
 </tr>
 <tr>
    <td>click</td>
    <td>vaadin=runcomvaadintestsbrowserfeaturesWebkitScrollbarTest::/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
    <td></td>
 </tr>
 <tr>
    <td>screenCapture</td>
    <td></td>
    <td>windowShouldNotHaveScrollbars</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/componentlocator/TestDetachedNotPresent.html
+++ b/uitest/tb2/com/vaadin/tests/componentlocator/TestDetachedNotPresent.html
@@ -1,61 +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>New Test</title> 
 </head> 
 <body> 
 <table cellpadding="1" cellspacing="1" border="1"> 
 <thead> 
 <tr><td rowspan="1" colspan="3">New Test</td></tr> 
 </thead><tbody> 
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.table.Tables?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>
 	<td>40,10</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item8</td>
 	<td>29,8</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item2</td>
 	<td>103,3</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item1</td>
 	<td>34,6</td>
 </tr>
 <tr>
 	<td>contextmenu</td>
 	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertElementPresent</td>
 	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VContextMenu[0]#option0</td>
 	<td>15,8</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[2]/domChild[0]</td>
 	<td>37,9</td>
 </tr>
 <tr>
 	<td>assertElementNotPresent</td>
 	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VContextMenu[0]#option0</td>
 	<td>15,8</td>
 </tr>
 </tbody></table> 
 </body> 
 </html> 
--- a/uitest/tb2/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.html
@@ -1,456 +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="http://localhost:8888/" />
 <title>AddRemoveSetStyleNamesTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">AddRemoveSetStyleNamesTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>run/com.vaadin.tests.components.AddRemoveSetStyleNamesTest?restartApplication</td>
 	<td></td>
 </tr>
 <!--add style 1. assert style1-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>v-datefield-style1</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>style1</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]#popupButton</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>v-datefield-popup-style1</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>style1</td>
 </tr>
 <!--add style 2. assert style1, style2-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[1]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>v-datefield-style1</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>style1</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>v-datefield-style2</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>style2</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]#popupButton</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>v-datefield-popup-style1</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>style1</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>v-datefield-popup-style2</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>style2</td>
 </tr>
 <!--remove style 1. assertNot style1. assert style2-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>v-datefield-style1</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>style1</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>v-datefield-style2</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>style2</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]#popupButton</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>v-datefield-popup-style1</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>style1</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>v-datefield-popup-style2</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>style2</td>
 </tr>
 <!--remove style 2. assertNot style1, style2-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[1]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>v-datefield-style1</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>style1</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>v-datefield-style2</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>style2</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]#popupButton</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>v-datefield-popup-style1</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>style1</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>v-datefield-popup-style2</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>style2</td>
 </tr>
 <!--add style1. set thestyle. assertNot style1. assert thestyle.-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[2]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>v-datefield-style1</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>style1</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>thestyle</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>v-datefield-thestyle</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]#popupButton</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>v-datefield-popup-style1</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>style1</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>v-datefield-popup-thestyle</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>thestyle</td>
 </tr>
 <!--remove thestyle. assertNot thestyle-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[2]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>thestyle</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>v-datefield-thestyle</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]#popupButton</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>v-datefield-popup-thestyle</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>thestyle</td>
 </tr>
 <!--set thestyle. add style1. assert thestyle, style1-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[2]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>thestyle</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>v-datefield-thestyle</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>v-datefield-style1</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>style1</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]#popupButton</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>v-datefield-popup-style1</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>style1</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>v-datefield-popup-thestyle</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>thestyle</td>
 </tr>
 <!--remove style 1. assertNot style1. assert thestyle-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>v-datefield-style1</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>style1</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>v-datefield-thestyle</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>thestyle</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]#popupButton</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>v-datefield-popup-style1</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>style1</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>v-datefield-popup-thestyle</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>thestyle</td>
 </tr>
 <!--add style 1. remove thestyle. assertNot style1, thestyle-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[2]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>v-datefield-style1</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>style1</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>v-datefield-thestyle</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td>
 	<td>thestyle</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]#popupButton</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>v-datefield-popup-style1</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>style1</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>v-datefield-popup-thestyle</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td>
 	<td>thestyle</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/AddressFormExample.html
+++ b/uitest/tb2/com/vaadin/tests/components/AddressFormExample.html
@@ -1,72 +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="http://localhost:8888/" />
 <title>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.customfield.AddressFormExample?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscustomfieldAddressFormExample::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VCustomComponent[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Ruukinkatu 2-4</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscustomfieldAddressFormExample::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VCustomComponent[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[1]</td>
 	<td>20,540</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscustomfieldAddressFormExample::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VCustomComponent[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[2]</td>
 	<td>Turku</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscustomfieldAddressFormExample::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td>Save</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscustomfieldAddressFormExample::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VCustomComponent[0]/VForm[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>Address</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscustomfieldAddressFormExample::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VCustomComponent[0]/VForm[0]/VFormLayout[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>Street Address</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscustomfieldAddressFormExample::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VCustomComponent[0]/VForm[0]/VFormLayout[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>Postal Code</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscustomfieldAddressFormExample::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VCustomComponent[0]/VForm[0]/VFormLayout[0]/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>City</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscustomfieldAddressFormExample::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/domChild[0]/domChild[1]/domChild[0]</td>
 	<td>exact:*</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentscustomfieldAddressFormExample::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/domChild[0]/domChild[1]/domChild[0]</td>
 	<td>v-required-field-indicator</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/DisableEnableCascade.html
+++ b/uitest/tb2/com/vaadin/tests/components/DisableEnableCascade.html
@@ -1,86 +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>DisableEnableCascade</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">DisableEnableCascade</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.DisableEnableCascade?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascade::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>panel-disabled</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascade::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[1]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascade::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>tabsheet-disabled</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascade::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[1]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>all-enabled</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascade::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[2]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascade::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[1]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>tabsheet-button-disabled</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascade::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[2]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascade::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[1]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>all-enabled2</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/DisableEnableCascadeStyles.html
+++ b/uitest/tb2/com/vaadin/tests/components/DisableEnableCascadeStyles.html
@@ -1,250 +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="http://localhost:8888/" />
 <title>DisableEnableCascadeStyles</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">DisableEnableCascadeStyles</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.DisableEnableCascadeStyles?restartApplication</td>
 	<td></td>
 </tr>
 <!--disable tabsheet-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[1]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!--assert css class names for bottom level components-->
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VButton[0]</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VNativeButton[0]</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VTextField[0]</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VTextArea[0]</td>
 	<td>v-disabled</td>
 </tr>
 <!--assert css class name for component captions-->
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/domChild[2]/domChild[0]</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/domChild[3]/domChild[0]</td>
 	<td>v-disabled</td>
 </tr>
 <!--enable tabsheet-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[1]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!--assert css class names for bottom level components-->
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VButton[0]</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VNativeButton[0]</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VTextField[0]</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VTextArea[0]</td>
 	<td>v-disabled</td>
 </tr>
 <!--assert css class name for component captions-->
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/domChild[2]/domChild[0]</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/domChild[3]/domChild[0]</td>
 	<td>v-disabled</td>
 </tr>
 <!--disable layout containing components-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[2]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!--assert css class names for bottom level components-->
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VButton[0]</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VNativeButton[0]</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VTextField[0]</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VTextArea[0]</td>
 	<td>v-disabled</td>
 </tr>
 <!--assert css class name for component captions-->
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/domChild[2]/domChild[0]</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/domChild[3]/domChild[0]</td>
 	<td>v-disabled</td>
 </tr>
 <!--enable layout containing components-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[2]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!--assert css class names for bottom level components-->
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VButton[0]</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VNativeButton[0]</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VTextField[0]</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VTextArea[0]</td>
 	<td>v-disabled</td>
 </tr>
 <!--assert css class name for component captions-->
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/domChild[2]/domChild[0]</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/domChild[3]/domChild[0]</td>
 	<td>v-disabled</td>
 </tr>
 <!--disable all bottom level components-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[3]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!--assert css class names for bottom level components-->
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VButton[0]</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VNativeButton[0]</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VTextField[0]</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VTextArea[0]</td>
 	<td>v-disabled</td>
 </tr>
 <!--assert css class name for component captions-->
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/domChild[2]/domChild[0]</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/domChild[3]/domChild[0]</td>
 	<td>v-disabled</td>
 </tr>
 <!--enable all bottom level components-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[3]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!--assert css class names for bottom level components-->
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VButton[0]</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VNativeButton[0]</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VTextField[0]</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VTextArea[0]</td>
 	<td>v-disabled</td>
 </tr>
 <!--assert css class name for component captions-->
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/domChild[2]/domChild[0]</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsDisableEnableCascadeStyles::/VVerticalLayout[0]/VVerticalLayout[0]/VPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/domChild[3]/domChild[0]</td>
 	<td>v-disabled</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/ErrorMessages.html
+++ b/uitest/tb2/com/vaadin/tests/components/ErrorMessages.html
@@ -1,72 +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="http://localhost:8888/" />
 <title>ErrorMessages</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">ErrorMessages</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.ErrorMessages?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>showTooltip</td>
 	<td>vaadin=runcomvaadintestscomponentsErrorMessages::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>tooltip1</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>showTooltip</td>
 	<td>vaadin=runcomvaadintestscomponentsErrorMessages::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTextField[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>tooltip2</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>showTooltip</td>
 	<td>vaadin=runcomvaadintestscomponentsErrorMessages::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VFilterSelect[0]/domChild[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>tooltip3</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/HierarchyChangeForRemovedComponentContainers.html
+++ b/uitest/tb2/com/vaadin/tests/components/HierarchyChangeForRemovedComponentContainers.html
@@ -1,32 +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="http://localhost:8888/" />
 <title>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
    <td>open</td>
    <td>/run/com.vaadin.tests.components.HierarchyChangeForRemovedComponentContainers?restartApplication</td>
    <td></td>
 </tr>
 <tr>
    <td>click</td>
    <td>vaadin=runcomvaadintestscomponentsHierarchyChangeForRemovedComponentContainers::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VButton[0]/domChild[0]/domChild[0]</td>
    <td></td>
 </tr>
 <tr>
    <td>screenCapture</td>
    <td></td>
    <td>two-buttons-no-NPE</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/LayoutAttachListenerInfo.html
+++ b/uitest/tb2/com/vaadin/tests/components/LayoutAttachListenerInfo.html
@@ -1,86 +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>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.LayoutAttachListenerInfo?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsLayoutAttachListenerInfo::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>Top50pxLeft50px</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsLayoutAttachListenerInfo::Root/VNotification[0]/HTML[0]/domChild[0]</td>
 	<td>351,23</td>
 </tr>
 <tr>
 	<td>pause</td>
 	<td>1000</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsLayoutAttachListenerInfo::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VOptionGroup[0]/domChild[1]/domChild[0]</td>
 	<td>8,7</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsLayoutAttachListenerInfo::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>AttachedToIndex0</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsLayoutAttachListenerInfo::Root/VNotification[0]/HTML[0]/domChild[0]</td>
 	<td>351,23</td>
 </tr>
 <tr>
 	<td>pause</td>
 	<td>1000</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsLayoutAttachListenerInfo::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VOptionGroup[0]/domChild[2]/domChild[0]</td>
 	<td>3,5</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsLayoutAttachListenerInfo::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>pause</td>
 	<td>1000</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>AttachedTo23</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/TooltipsOnScrollingWindow.html
+++ b/uitest/tb2/com/vaadin/tests/components/TooltipsOnScrollingWindow.html
@@ -1,40 +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="http://localhost:8888/" />
 <title>TooltipsOnScrollingWindow</title>
 </head>
 <body>
 	<table cellpadding="1" cellspacing="1" border="1">
 		<thead>
 			<tr>
 				<td rowspan="1" colspan="3">TooltipsOnScrollingWindow</td>
 			</tr>
 		</thead>
 		<tbody>
 			<tr>
 				<td>open</td>
 				<td>/run/com.vaadin.tests.components.TooltipsOnScrollingWindow?restartApplication</td>
 				<td></td>
 			</tr>
 			<tr>
 				<td>showTooltip</td>
 				<td>vaadin=runcomvaadintestscomponentsTooltipsOnScrollingWindow::PID_Shoverable-label</td>
 				<td></td>
 			</tr>
 			<tr>
 				<td>waitForVisible</td>
 				<td>vaadin=runcomvaadintestscomponentsTooltipsOnScrollingWindow::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td>
 				<td></td>
 			</tr>
 			<tr>
 				<td>screenCapture</td>
 				<td></td>
 				<td>tooltip-is-positioned-correctly</td>
 			</tr>
 		</tbody>
 	</table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.html
+++ b/uitest/tb2/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.html
@@ -1,27 +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>AbsoluteLayoutClipping</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">AbsoluteLayoutClipping</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.absolutelayout.AbsoluteLayoutClipping</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutCorrectPositioningOfHiddenField.html
+++ b/uitest/tb2/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutCorrectPositioningOfHiddenField.html
@@ -1,52 +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="http://localhost:8888/" />
 <title>AbsoluteLayoutCorrectPositioningOfHiddenField</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">AbsoluteLayoutCorrectPositioningOfHiddenField</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.absolutelayout.AbsoluteLayoutCorrectPositioningOfHiddenField?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertElementNotPresent</td>
 	<td>vaadin=runcomvaadintestscomponentsabsolutelayoutAbsoluteLayoutCorrectPositioningOfHiddenField::PID_SpositionedLabel</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsabsolutelayoutAbsoluteLayoutCorrectPositioningOfHiddenField::PID_SactionButton</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertElementPresent</td>
 	<td>vaadin=runcomvaadintestscomponentsabsolutelayoutAbsoluteLayoutCorrectPositioningOfHiddenField::PID_SpositionedLabel</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>AbsoluteLayoutLabelPositionNotOrigo</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsabsolutelayoutAbsoluteLayoutCorrectPositioningOfHiddenField::PID_SactionButton</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>AbsoluteLayoutLabelMovedDown</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutPrimaryStylename.html
+++ b/uitest/tb2/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutPrimaryStylename.html
@@ -1,67 +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="http://localhost:8888/" />
 <title>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
    <td>open</td>
    <td>/run/com.vaadin.tests.components.absolutelayout.AbsoluteLayoutPrimaryStylename?restartApplication</td>
    <td></td>
 </tr>
 <tr>
    <td>assertNotCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsabsolutelayoutAbsoluteLayoutPrimaryStylename::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAbsoluteLayout[0]/</td>
    <td>v-absolute-layout</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsabsolutelayoutAbsoluteLayoutPrimaryStylename::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAbsoluteLayout[0]/</td>
    <td>my-absolute-layout</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsabsolutelayoutAbsoluteLayoutPrimaryStylename::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAbsoluteLayout[0]/domChild[0]/domChild[0]</td>
    <td>my-absolute-layout-margin</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsabsolutelayoutAbsoluteLayoutPrimaryStylename::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAbsoluteLayout[0]/VAbsoluteLayout$AbsoluteWrapper[0]/</td>
    <td>my-absolute-layout-wrapper</td>
 </tr>
 <tr>
    <td>click</td>
    <td>vaadin=runcomvaadintestscomponentsabsolutelayoutAbsoluteLayoutPrimaryStylename::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VButton[0]/domChild[0]/domChild[0]</td>
    <td></td>
 </tr>
 <tr>
    <td>assertNotCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsabsolutelayoutAbsoluteLayoutPrimaryStylename::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAbsoluteLayout[0]/</td>
    <td>my-absolute-layout</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsabsolutelayoutAbsoluteLayoutPrimaryStylename::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAbsoluteLayout[0]/</td>
    <td>my-second-absolute-layout</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsabsolutelayoutAbsoluteLayoutPrimaryStylename::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAbsoluteLayout[0]/domChild[0]/domChild[0]</td>
    <td>my-second-absolute-layout-margin</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsabsolutelayoutAbsoluteLayoutPrimaryStylename::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAbsoluteLayout[0]/VAbsoluteLayout$AbsoluteWrapper[0]/</td>
    <td>my-second-absolute-layout-wrapper</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutResizing.html
+++ b/uitest/tb2/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutResizing.html
@@ -1,37 +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="http://localhost:8888/" />
 <title>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
    <td>open</td>
    <td>/run/com.vaadin.tests.components.absolutelayout.AbsoluteLayoutResizing?restartApplication</td>
    <td></td>
 </tr>
 <tr>
    <td>dragAndDrop</td>
    <td>vaadin=runcomvaadintestscomponentsabsolutelayoutAbsoluteLayoutResizing::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VSplitPanelVertical[0]/domChild[0]/domChild[1]/domChild[0]</td>
    <td>0,294</td>
 </tr>
 <tr>
    <td>dragAndDrop</td>
    <td>vaadin=runcomvaadintestscomponentsabsolutelayoutAbsoluteLayoutResizing::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VSplitPanelVertical[0]/VSplitPanelHorizontal[0]/domChild[0]/domChild[1]/domChild[0]</td>
    <td>588,0</td>
 </tr>
 <tr>
    <td>screenCapture</td>
    <td></td>
    <td>resized</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutWrapperStyles.html
+++ b/uitest/tb2/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutWrapperStyles.html
@@ -1,52 +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="http://localhost:8888/" />
 <title>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
    <td>open</td>
    <td>/run/com.vaadin.tests.components.absolutelayout.AbsoluteLayoutWrapperStyles?restartApplication</td>
    <td></td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsabsolutelayoutAbsoluteLayoutWrapperStyles::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAbsoluteLayout[0]/VAbsoluteLayout$AbsoluteWrapper[0]</td>
    <td>v-absolutelayout-wrapper</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsabsolutelayoutAbsoluteLayoutWrapperStyles::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAbsoluteLayout[0]/VAbsoluteLayout$AbsoluteWrapper[0]</td>
    <td>v-absolutelayout-wrapper-my-label</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsabsolutelayoutAbsoluteLayoutWrapperStyles::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAbsoluteLayout[0]/VAbsoluteLayout$AbsoluteWrapper[0]</td>
    <td>v-absolutelayout-wrapper-my-second-label</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsabsolutelayoutAbsoluteLayoutWrapperStyles::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAbsoluteLayout[0]/VAbsoluteLayout$AbsoluteWrapper[1]</td>
    <td>v-absolutelayout-wrapper</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsabsolutelayoutAbsoluteLayoutWrapperStyles::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAbsoluteLayout[0]/VAbsoluteLayout$AbsoluteWrapper[1]</td>
    <td>v-absolutelayout-wrapper-my-button</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsabsolutelayoutAbsoluteLayoutWrapperStyles::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAbsoluteLayout[0]/VAbsoluteLayout$AbsoluteWrapper[1]</td>
    <td>v-absolutelayout-wrapper-my-second-button</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html
+++ b/uitest/tb2/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html
@@ -1,37 +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>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.absolutelayout.MoveComponentsFromAbsoluteLayoutToInnerLayout?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsabsolutelayoutMoveComponentsFromAbsoluteLayoutToInnerLayout::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VAbsoluteLayout[0]/VAbsoluteLayout$AbsoluteWrapper[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsabsolutelayoutMoveComponentsFromAbsoluteLayoutToInnerLayout::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>buttons-with-captions</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/abstractcomponent/EnableState.html
+++ b/uitest/tb2/com/vaadin/tests/components/abstractcomponent/EnableState.html
@@ -1,87 +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>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.abstractcomponent.EnableState</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractcomponentEnableState::/VVerticalLayout[0]/ChildComponentContainer[3]/VCheckBox[0]/domChild[0]</td>
 	<td>58,5</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>disable-cascade</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractcomponentEnableState::/VVerticalLayout[0]/ChildComponentContainer[3]/VCheckBox[0]/domChild[0]</td>
 	<td>49,7</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractcomponentEnableState::/VVerticalLayout[0]/ChildComponentContainer[2]/VCheckBox[0]/domChild[0]</td>
 	<td>55,7</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractcomponentEnableState::/VVerticalLayout[0]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>
 	<td>76,8</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractcomponentEnableState::/VVerticalLayout[0]/ChildComponentContainer[2]/VCheckBox[0]/domChild[0]</td>
 	<td>58,8</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>button-disabled</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.html
@@ -1,32 +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>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.abstractcomponent.RemSizeUnitTest?restartApplication&amp;debug</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertElementHeight</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractcomponentRemSizeUnitTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VLabel[0]</td>
 	<td>80</td>
 </tr>
 <tr>
 	<td>assertElementWidth</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractcomponentRemSizeUnitTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VLabel[0]</td>
 	<td>168</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/abstractcomponent/TooltipTests.html
+++ b/uitest/tb2/com/vaadin/tests/components/abstractcomponent/TooltipTests.html
@@ -1,92 +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="http://localhost:8888/" />
 <title>TooltipTests</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">TooltipTests</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.abstractcomponent.TooltipTests?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>showTooltip</td>
 	<td>//div[@id='label']</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>no_tooltip</td>
 </tr>
 <tr>
 	<td>showTooltip</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractcomponentTooltipTests::/VVerticalLayout[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractcomponentTooltipTests::/VVerticalLayout[0]/VVerticalLayout[0]/VHorizontalLayout[0]/VCheckBox[0]/domChild[0]</td>
 	<td>10,7</td>
 </tr>
 <tr>
 	<td>showTooltip</td>
 	<td>//div[@id='label']</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>panel_tooltip</td>
 </tr>
 <tr>
 	<td>showTooltip</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractcomponentTooltipTests::/VVerticalLayout[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractcomponentTooltipTests::/VVerticalLayout[0]/VVerticalLayout[0]/VHorizontalLayout[0]/VCheckBox[1]/domChild[0]</td>
 	<td>8,6</td>
 </tr>
 <tr>
 	<td>showTooltip</td>
 	<td>//div[@id='label']</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>layout_tooltip</td>
 </tr>
 <tr>
 	<td>showTooltip</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractcomponentTooltipTests::/VVerticalLayout[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractcomponentTooltipTests::/VVerticalLayout[0]/VVerticalLayout[0]/VHorizontalLayout[0]/VCheckBox[2]/domChild[0]</td>
 	<td>5,5</td>
 </tr>
 <tr>
 	<td>showTooltip</td>
 	<td>//div[@id='label']</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>label_tooltip</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/abstractcomponent/UseStateFromHierarchy.html
+++ b/uitest/tb2/com/vaadin/tests/components/abstractcomponent/UseStateFromHierarchy.html
@@ -1,31 +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></title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">UIScrollTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.abstractcomponent.UseStateFromHierachy?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractcomponentUseStateFromHierachy::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertElementNotPresent</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractcomponentUseStateFromHierachy::Root/VNotification[0]/HTML[0]/domChild[0]</td>
 	<td></td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.html
+++ b/uitest/tb2/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.html
@@ -1,62 +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>AbstractFieldCommitWithInvalidValues</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">AbstractFieldCommitWithInvalidValues</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.abstractfield.AbstractFieldCommitWithInvalidValues</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>focus</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractfieldAbstractFieldCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractfieldAbstractFieldCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>clickAt</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractfieldAbstractFieldCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>type</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractfieldAbstractFieldCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
 	<td>long</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractfieldAbstractFieldCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.html
+++ b/uitest/tb2/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.html
@@ -1,42 +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="http://localhost:8888/run/com.vaadin.tests.components.abstractfield.AbstractFieldDataSourceReadOnly" />
 <title>AbstractFieldDataSourceReadOnly</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">AbstractFieldDataSourceReadOnly</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.abstractfield.AbstractFieldDataSourceReadOnly</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractfieldAbstractFieldDataSourceReadOnly::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.html
+++ b/uitest/tb2/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.html
@@ -1,109 +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="http://localhost:8888/" />
 <title>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.abstractfield.RequiredIndicatorForFieldsWithoutCaption?debug&amp;restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractfieldRequiredIndicatorForFieldsWithoutCaption::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VGridLayout[0]/domChild[2]/domChild[0]/domChild[0]</td>
 	<td>v-required-field-indicator</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>//div[3]/div/div[2]/div/div/span</td>
 	<td>v-required-field-indicator</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>//div[4]/div/div[2]/div/div/span</td>
 	<td>v-required-field-indicator</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractfieldRequiredIndicatorForFieldsWithoutCaption::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VAbsoluteLayout[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]</td>
 	<td>v-required-field-indicator</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractfieldRequiredIndicatorForFieldsWithoutCaption::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[5]/VCssLayout[0]/domChild[1]/domChild[0]</td>
 	<td>v-required-field-indicator</td>
 </tr>
 <!--Set to not required-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractfieldRequiredIndicatorForFieldsWithoutCaption::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VCheckBox[0]/domChild[0]</td>
 	<td>9,4</td>
 </tr>
 <tr>
 	<td>assertElementNotPresent</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractfieldRequiredIndicatorForFieldsWithoutCaption::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VGridLayout[0]/domChild[2]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertElementNotPresent</td>
 	<td>//div[3]/div/div[2]/div/div/span</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertElementNotPresent</td>
 	<td>//div[4]/div/div[2]/div/div/span</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertElementNotPresent</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractfieldRequiredIndicatorForFieldsWithoutCaption::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VAbsoluteLayout[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertElementNotPresent</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractfieldRequiredIndicatorForFieldsWithoutCaption::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[5]/VCssLayout[0]/domChild[1]/domChild[0]</td>
 	<td></td>
 </tr>
 <!--Set to required again-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractfieldRequiredIndicatorForFieldsWithoutCaption::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VCheckBox[0]/domChild[0]</td>
 	<td>9,4</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractfieldRequiredIndicatorForFieldsWithoutCaption::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VGridLayout[0]/domChild[2]/domChild[0]/domChild[0]</td>
 	<td>v-required-field-indicator</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>//div[3]/div/div[2]/div/div/span</td>
 	<td>v-required-field-indicator</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>//div[4]/div/div[2]/div/div/span</td>
 	<td>v-required-field-indicator</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractfieldRequiredIndicatorForFieldsWithoutCaption::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VAbsoluteLayout[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]</td>
 	<td>v-required-field-indicator</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsabstractfieldRequiredIndicatorForFieldsWithoutCaption::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[5]/VCssLayout[0]/domChild[1]/domChild[0]</td>
 	<td>v-required-field-indicator</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.html
+++ b/uitest/tb2/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.html
@@ -1,48 +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>com.vaadin.tests.components.accordion.AccordionInactiveTabSize</title></head><body><table cellpadding="1" cellspacing="1" border="1"><thead><tr><td rowspan="1" colspan="3">com.vaadin.tests.components.accordion.AccordionInactiveTabSize</td></tr></thead><tbody><tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.accordion.AccordionInactiveTabSize?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsaccordionAccordionInactiveTabSize::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VSplitPanelHorizontal[0]/VAccordion[0]/domChild[1]/domChild[0]/domChild[0]</td>
 	<td>285,11</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>center-second-tab</td>
 </tr>
 <tr>
 	<td>dragAndDrop</td>
 	<td>vaadin=runcomvaadintestscomponentsaccordionAccordionInactiveTabSize::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VSplitPanelHorizontal[0]/domChild[0]/domChild[1]/domChild[0]</td>
 	<td>150,-36</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>splitter-right-second-tab</td>
 </tr>
 <tr>
 	<td>dragAndDrop</td>
 	<td>vaadin=runcomvaadintestscomponentsaccordionAccordionInactiveTabSize::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VSplitPanelHorizontal[0]/domChild[0]/domChild[1]/domChild[0]</td>
 	<td>-300,-36</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>splitter-left-second-tab</td>
 </tr>

 <!--back to original pos-->
 <tr>
 	<td>dragAndDrop</td>
 	<td>vaadin=runcomvaadintestscomponentsaccordionAccordionInactiveTabSize::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VSplitPanelHorizontal[0]/domChild[0]/domChild[1]/domChild[0]</td>
 	<td>150,-36</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>center-second-tab</td>
 </tr>
 </tbody></table></body></html>
--- a/uitest/tb2/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.html
+++ b/uitest/tb2/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.html
@@ -1,107 +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="http://localhost:8888/" />
 <title>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
    <td>open</td>
    <td>/run/com.vaadin.tests.components.accordion.AccordionPrimaryStylenames?restartApplication</td>
    <td></td>
 </tr>
 <tr>
    <td>assertNotCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]</td>
    <td>v-accordion</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]</td>
    <td>my-accordion</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]/domChild[0]</td>
    <td>my-accordion-item</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]/domChild[0]</td>
    <td>my-accordion-item-first</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]/domChild[0]</td>
    <td>my-accordion-item-open</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]/domChild[0]/domChild[0]</td>
    <td>my-accordion-item-caption</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]/domChild[0]/domChild[1]</td>
    <td>my-accordion-item-content</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]/domChild[1]</td>
    <td>my-accordion-item</td>
 </tr>
 <tr>
    <td>click</td>
    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VButton[0]/domChild[0]/domChild[0]</td>
    <td></td>
 </tr>
 <tr>
    <td>assertNotCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]</td>
    <td>my-accordion</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]</td>
    <td>my-second-accordion</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]/domChild[0]</td>
    <td>my-second-accordion-item</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]/domChild[0]</td>
    <td>my-second-accordion-item-first</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]/domChild[0]</td>
    <td>my-second-accordion-item-open</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]/domChild[0]/domChild[0]</td>
    <td>my-second-accordion-item-caption</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]/domChild[0]/domChild[1]</td>
    <td>my-second-accordion-item-content</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]/domChild[1]</td>
    <td>my-second-accordion-item</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/accordion/AccordionTabStylenames.html
+++ b/uitest/tb2/com/vaadin/tests/components/accordion/AccordionTabStylenames.html
@@ -1,41 +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="http://localhost:8888/" />
 <title>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
    <td>open</td>
    <td>/run/com.vaadin.tests.components.accordion.AccordionTabStylenames?restartApplication</td>
    <td></td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionTabStylenames::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VAccordion[0]/domChild[0]</td>
    <td>v-accordion-item-tab0</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionTabStylenames::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VAccordion[0]/domChild[1]</td>
    <td>v-accordion-item-tab1</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionTabStylenames::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VAccordion[0]/domChild[2]</td>
    <td>v-accordion-item-tab2</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionTabStylenames::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VAccordion[0]/domChild[3]</td>
    <td>v-accordion-item-tab3</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/accordion/AccordionTheme.html
+++ b/uitest/tb2/com/vaadin/tests/components/accordion/AccordionTheme.html
@@ -1,60 +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>com.vaadin.tests.components.accordion.AccordionInactiveTabSize</title>
 </head>
 <body>
 	<table cellpadding="1" cellspacing="1" border="1">
 		<thead>
 			<tr>
 				<td rowspan="1" colspan="3">com.vaadin.tests.components.accordion.AccordionInactiveTabSize</td>
 			</tr>
 		</thead>
 		<tbody>
 			<tr>
 				<td>open</td>
 				<td>/run/com.vaadin.tests.components.accordion.AccordionInactiveTabSize?restartApplication&amp;theme=base</td>
 				<td></td>
 			</tr>
 			<tr>
 				<td>screenCapture</td>
 				<td></td>
 				<td>base</td>
 			</tr>
 			<tr>
 				<td>open</td>
 				<td>/run/com.vaadin.tests.components.accordion.AccordionInactiveTabSize?restartApplication&amp;theme=runo</td>
 				<td></td>
 			</tr>
 			<tr>
 				<td>screenCapture</td>
 				<td></td>
 				<td>runo</td>
 			</tr>
 			<tr>
 				<td>open</td>
 				<td>/run/com.vaadin.tests.components.accordion.AccordionInactiveTabSize?restartApplication&amp;theme=chameleon</td>
 				<td></td>
 			</tr>
 			<tr>
 				<td>screenCapture</td>
 				<td></td>
 				<td>chameleon</td>
 			</tr>
 			<tr>
 				<td>open</td>
 				<td>/run/com.vaadin.tests.components.accordion.AccordionInactiveTabSize?restartApplication&amp;theme=liferay</td>
 				<td></td>
 			</tr>
 			<tr>
 				<td>screenCapture</td>
 				<td></td>
 				<td>liferay</td>
 			</tr>
 		</tbody>
 	</table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/accordion/RemoveTabs.html
+++ b/uitest/tb2/com/vaadin/tests/components/accordion/RemoveTabs.html
@@ -1,122 +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>RemoveTabsTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">RemoveTabsTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.accordion.RemoveTabs</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsaccordionRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsaccordionRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VAccordion[0]/domChild[2]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsaccordionRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsaccordionRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsaccordionRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsaccordionRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.html
+++ b/uitest/tb2/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.html
@@ -1,64 +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>com.vaadin.tests.components.beanitemcontainer.BeanItemContainerNullValues</title></head><body><table cellpadding="1" cellspacing="1" border="1"><thead><tr><td rowspan="1" colspan="3">com.vaadin.tests.components.beanitemcontainer.BeanItemContainerNullValues</td></tr></thead><tbody><tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.beanitemcontainer.BeanItemContainerNullValues?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbeanitemcontainerBeanItemContainerNullValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>85,9</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>initial</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbeanitemcontainerBeanItemContainerNullValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[3]/domChild[1]</td>
 	<td>40,9</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>sort-country-asc</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbeanitemcontainerBeanItemContainerNullValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[3]/domChild[1]</td>
 	<td>29,9</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>sort-country-desc</td>
 </tr>
 <!--  Disable sorting -->
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsbeanitemcontainerBeanItemContainerNullValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!--  Try to sort -->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbeanitemcontainerBeanItemContainerNullValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[1]</td>
 	<td>39,8</td>
 </tr>
 <!--  Enable sorting to get the same screenshot as before -->
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsbeanitemcontainerBeanItemContainerNullValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbeanitemcontainerBeanItemContainerNullValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>79,4</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>sort-country-desc</td>
 </tr>
 </tbody></table></body></html>
--- a/uitest/tb2/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html
+++ b/uitest/tb2/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html
@@ -1,32 +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>TestBeanItemContainerUsage</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">TestBeanItemContainerUsage</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.beanitemcontainer.TestBeanItemContainerUsage</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/button/ButtonDisableEnableOnClick.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/ButtonDisableEnableOnClick.html
@@ -1,128 +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="http://localhost:8888/" />
 <title>ButtonDisableEnableOnClick</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">ButtonDisableEnableOnClick</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.button.Buttons3?restartApplication</td>
 	<td></td>
 </tr>
 <!--setDisableOnClick(true)-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons3::PID_Smenu#item0</td>
 	<td>17,12</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons3::Root/VOverlay[0]/VMenuBar[0]#item4</td>
 	<td>19,10</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons3::Root/VOverlay[1]/VMenuBar[0]#item0</td>
 	<td>24,8</td>
 </tr>
 <!--addClickListener where onClick() { button.setEnabled(true) }-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons3::PID_Smenu#item0</td>
 	<td>38,8</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons3::Root/VOverlay[0]/VMenuBar[0]#item3</td>
 	<td>18,10</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons3::Root/VOverlay[1]/VMenuBar[0]#item2</td>
 	<td>37,11</td>
 </tr>
 <!--click should not disable button-->
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons3::PID_StestComponent/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>id=Log_row_0</td>
 	<td>2. ClickEvent</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons3::PID_StestComponent</td>
 	<td>v-disabled</td>
 </tr>
 <!--another click should not disable button-->
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons3::PID_StestComponent/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>id=Log_row_0</td>
 	<td>3. ClickEvent</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons3::PID_StestComponent</td>
 	<td>v-disabled</td>
 </tr>
 <!--another click should not disable button-->
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons3::PID_StestComponent/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>id=Log_row_0</td>
 	<td>4. ClickEvent</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons3::PID_StestComponent</td>
 	<td>v-disabled</td>
 </tr>
 <!--remove clickListener-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons3::PID_Smenu#item0</td>
 	<td>29,7</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons3::Root/VOverlay[0]/VMenuBar[0]#item3</td>
 	<td>20,8</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons3::Root/VOverlay[1]/VMenuBar[0]#item2</td>
 	<td>26,6</td>
 </tr>
 <!--click should now disable the button-->
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons3::PID_StestComponent/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons3::PID_StestComponent</td>
 	<td>v-disabled</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/button/ButtonDisableOnClick.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/ButtonDisableOnClick.html
@@ -1,156 +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="http://localhost:8888/" />
 <title>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.button.Buttons2?restartApplication</td>
 	<td></td>
 </tr>
 <!--click listener-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::PID_Smenu#item0</td>
 	<td>37,10</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::Root/VOverlay[0]/VMenuBar[0]#item3</td>
 	<td>28,7</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::Root/VOverlay[1]/VMenuBar[0]#item2</td>
 	<td>35,8</td>
 </tr>
 <!--disable on click-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::PID_Smenu#item0</td>
 	<td>39,10</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::Root/VOverlay[0]/VMenuBar[0]#item4</td>
 	<td>33,7</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::Root/VOverlay[1]/VMenuBar[0]#item0</td>
 	<td>22,4</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::PID_SLog_row_0</td>
 	<td>1. Command: /Disable on click(true)</td>
 </tr>
 <!--click button-->
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::PID_StestComponent/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::PID_StestComponent</td>
 	<td>v-disabled</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::PID_SLog_row_0</td>
 	<td>2. ClickEvent</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::PID_StestComponent/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::PID_SLog_row_0</td>
 	<td>2. ClickEvent</td>
 </tr>
 <!--re-enable-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::PID_Smenu#item0</td>
 	<td>35,13</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::Root/VOverlay[0]/VMenuBar[0]#item0</td>
 	<td>34,12</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::Root/VOverlay[1]/VMenuBar[0]#item1</td>
 	<td>15,13</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::PID_Smenu#item0</td>
 	<td>43,4</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::Root/VOverlay[0]/VMenuBar[0]#item0</td>
 	<td>37,8</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::Root/VOverlay[1]/VMenuBar[0]#item1</td>
 	<td>33,6</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::PID_SLog_row_0</td>
 	<td>4. Command: /Enabled(true)</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::PID_StestComponent</td>
 	<td>v-disabled</td>
 </tr>
 <!--no longer disable on click-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::PID_Smenu#item0</td>
 	<td>25,9</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::Root/VOverlay[0]/VMenuBar[0]#item4</td>
 	<td>39,13</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::Root/VOverlay[1]/VMenuBar[0]#item0</td>
 	<td>36,3</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::PID_StestComponent/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::PID_SLog_row_0</td>
 	<td>6. ClickEvent</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons2::PID_StestComponent</td>
 	<td>v-disabled</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.html
@@ -1,62 +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>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.button.ButtonEnterWithWindowShortcut?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonEnterWithWindowShortcut::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]</td>
 	<td>enter</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonEnterWithWindowShortcut::PID_SLog_row_0</td>
 	<td>1. button click listener fired</td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonEnterWithWindowShortcut::</td>
 	<td>enter</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonEnterWithWindowShortcut::PID_SLog_row_0</td>
 	<td>2. enter pressed in window</td>
 </tr>
 <!-- Can't test using space because of #8827 --> 
 <!-- <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonEnterWithWindowShortcut::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]</td>
 	<td>space</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonEnterWithWindowShortcut::PID_SLog_row_0</td>
 	<td>3. button click listener fired</td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonEnterWithWindowShortcut::</td>
 	<td>space</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonEnterWithWindowShortcut::PID_SLog_row_0</td>
 	<td>4. space pressed in window</td>
 </tr> -->
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/button/ButtonHtml.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/ButtonHtml.html
@@ -1,47 +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>ButtonHtml</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">ButtonHtml</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.button.ButtonHtml?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>initial</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonHtml::/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>after_1_click</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonHtml::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>after_2_clicks</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/button/ButtonToggleIcons.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/ButtonToggleIcons.html
@@ -1,72 +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="http://localhost:8888/" />
 <title>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.button.ButtonToggleIcons?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonToggleIcons::/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td>v-icon</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonToggleIcons::/VVerticalLayout[0]/Slot[1]/VNativeButton[0]/domChild[0]</td>
 	<td>v-icon</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonToggleIcons::/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonToggleIcons::/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td>v-icon</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonToggleIcons::/VVerticalLayout[0]/Slot[1]/VNativeButton[0]</td>
 	<td>40,14</td>
 </tr>
 <tr>
 	<td>assertCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonToggleIcons::/VVerticalLayout[0]/Slot[1]/VNativeButton[0]/domChild[0]</td>
 	<td>v-icon</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonToggleIcons::/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonToggleIcons::/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td>v-icon</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonToggleIcons::/VVerticalLayout[0]/Slot[1]/VNativeButton[0]</td>
 	<td>40,14</td>
 </tr>
 <tr>
 	<td>assertNotCSSClass</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonToggleIcons::/VVerticalLayout[0]/Slot[1]/VNativeButton[0]/domChild[0]</td>
 	<td>v-icon</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/button/ButtonUpdateAltText.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/ButtonUpdateAltText.html
@@ -1,46 +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="http://localhost:7171/" />
 <title>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.button.ButtonUpdateAltText?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertAttribute</td>
 	<td>//div[@id='button']//img[@class='v-icon']@alt</td>
 	<td>initial alt text</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonUpdateAltText::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[0]</td>
 	<td>10,14</td>
 </tr>
 <tr>
 	<td>assertAttribute</td>
 	<td>//div[@id='button']//img[@class='v-icon']@alt</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonUpdateAltText::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[0]</td>
 	<td>10,14</td>
 </tr>
 <tr>
 	<td>assertAttribute</td>
 	<td>//div[@id='button']//img[@class='v-icon']@alt</td>
 	<td>alt text</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/button/ButtonWithShortcutNotRendered.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/ButtonWithShortcutNotRendered.html
@@ -1,42 +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="http://localhost:9999/" />
 <title>ButtonWithShortcutNotRendered</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">ButtonWithShortcutNotRendered</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.button.ButtonWithShortcutNotRendered?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonWithShortcutNotRendered::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VSplitPanelVertical[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
 	<td>190,7</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>button-initial</td>
 </tr>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.button.ButtonWithShortcutNotRendered</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>button-with-caption</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/button/Buttons-chameleon.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/Buttons-chameleon.html
@@ -1,32 +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>com.vaadin.tests.components.button.Buttons</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">com.vaadin.tests.components.button.Buttons</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.button.Buttons?theme=chameleon</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/button/Buttons-reindeer.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/Buttons-reindeer.html
@@ -1,32 +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>com.vaadin.tests.components.button.Buttons</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">com.vaadin.tests.components.button.Buttons</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.button.Buttons</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/button/Buttons-runo.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/Buttons-runo.html
@@ -1,32 +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>com.vaadin.tests.components.button.Buttons</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">com.vaadin.tests.components.button.Buttons</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.button.Buttons?theme=runo</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/button/ButtonsAndIcons-chameleon.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/ButtonsAndIcons-chameleon.html
@@ -1,32 +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>IE7ButtonWithIcon</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">ButtonsAndIcons</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.button.ButtonsAndIcons?theme=chameleon</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/button/ButtonsAndIcons-reindeer.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/ButtonsAndIcons-reindeer.html
@@ -1,32 +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>IE7ButtonWithIcon</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">ButtonsAndIcons</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.button.ButtonsAndIcons</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/button/ButtonsAndIcons-runo.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/ButtonsAndIcons-runo.html
@@ -1,32 +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>IE7ButtonWithIcon</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">ButtonsAndIcons</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.button.ButtonsAndIcons?theme=runo</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.html
@@ -1,47 +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>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.button.ButtonsInHorizontalLayout?restartApplication&amp;theme=reindeer</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>reindeer</td>
 </tr>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.button.ButtonsInHorizontalLayout?restartApplication&amp;theme=runo</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>runo</td>
 </tr>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.button.ButtonsInHorizontalLayout?restartApplication&amp;theme=chameleon</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>chameleon</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/button/ButtonsWaiAria.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/ButtonsWaiAria.html
@@ -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="http://127.0.0.1:8080/" />
 <title>ButtonsWaiAria</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">ButtonsWaiAria</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.button.ButtonsWaiAria?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonsWaiAria::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VButton[0]/</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertAttribute</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonsWaiAria::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VButton[0]@role</td>
 	<td>button</td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonsWaiAria::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]/</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertElementPresent</td>
 	<td>xpath=/html/body/div/div/div[2]/div/div[2]/div/div[5]/div/span/img[@alt='']</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonsWaiAria::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]/</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertAttribute</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonsWaiAria::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]@alt</td>
 	<td>user icon</td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonsWaiAria::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VButton[0]/</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonsWaiAria::PID_Scheckboxaction-Enabled/domChild[0]</td>
 	<td>7,7</td>
 </tr>
 <tr>
 	<td>assertAttribute</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonsWaiAria::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VButton[0]/@aria-disabled</td>
 	<td>true</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtonsWaiAria::PID_Scheckboxaction-Enabled/domChild[0]</td>
 	<td>7,7</td>
 </tr>
 <tr>
 	<td>assertElementNotPresent</td>
 	<td>/html/body/div/div/div[2]/div/div[2]/div/div[3]/div[@aria-disabled]</td>
 	<td></td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/button/DisabledButtons.html
+++ b/uitest/tb2/com/vaadin/tests/components/button/DisabledButtons.html
@@ -1,32 +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>DisabledButtons</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">DisabledButtons</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.button.DisabledButtons</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/calendar/CalendarActions.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarActions.html
@@ -1,51 +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="http://localhost:8080/" />
 <title>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.calendar.CalendarActionsUI?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>contextMenuAt</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarActionsUI::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[7]</td>
 	<td>100,20</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>addEventContextMenu</td>
 </tr>
 <tr>
 	<td>contextMenuAt</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarActionsUI::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[8]</td>
 	<td>100,20</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>removeEventContextMenu</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarActionsUI::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]/domChild[8]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>NoContextMenu</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/calendar/CalendarBasicNavigation.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarBasicNavigation.html
@@ -1,236 +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>basicNavigation</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">basicNavigation</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.calendar.CalendarTest?testBench&amp;width=1000px&amp;height=600px&amp;restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[1]/Slot[1]/VLabel[0]</td>
 	<td>Jan 2000</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[1]/Slot[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[1]/Slot[1]/VLabel[0]</td>
 	<td>Feb 2000</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[1]/Slot[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[1]/Slot[1]/VLabel[0]</td>
 	<td>Mar 2000</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[1]/Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[1]/Slot[1]/VLabel[0]</td>
 	<td>Feb 2000</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[1]/Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[1]/Slot[1]/VLabel[0]</td>
 	<td>Jan 2000</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>26</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[5]/domChild[6]/domChild[0]/domChild[0]</td>
 	<td>5</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]</td>
 	<td>9,44</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
 	<td>Sunday 1/9/00</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[7]/domChild[0]</td>
 	<td>Saturday 1/15/00</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]</td>
 	<td>1 AM</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[23]</td>
 	<td>11 PM</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[8]/domChild[0]</td>
 	<td>4,6</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[8]/domChild[0]</td>
 	<td>4,5</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
 	<td>Sunday 1/23/00</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[7]/domChild[0]</td>
 	<td>Saturday 1/29/00</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>9,7</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>9,7</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
 	<td>Sunday 1/9/00</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[7]/domChild[0]</td>
 	<td>Saturday 1/15/00</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[3]/domChild[0]</td>
 	<td>77,5</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
 	<td>Tuesday 1/11/00</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>8,8</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>10,9</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>10,9</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>10,9</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>10,9</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>10,9</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>10,9</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>10,9</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>10,9</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>10,9</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>10,9</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
 	<td>Friday 12/31/99</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[1]/Slot[3]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
 	<td>Sunday 1/30/00</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[7]/domChild[0]</td>
 	<td>Saturday 2/5/00</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[1]/Slot[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>26</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/calendar/CalendarDragAndDrop.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarDragAndDrop.html
@@ -1,58 +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" />
 <title>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.calendar.CalendarDragAndDrop?restartApplication</td>
 	<td></td>
 </tr>
 <!--// Test drag and drop in month view-->
 <tr>
 	<td>drag</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarDragAndDrop::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VHorizontalLayout[0]/Slot[1]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[9]/domChild[0]/domChild[0]</td>
 	<td>76,7</td>
 </tr>
 <tr>
 	<td>drop</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarDragAndDrop::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VHorizontalLayout[0]/Slot[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[1]/domChild[5]/domChild[0]/domChild[2]</td>
 	<td>40,9</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarDragAndDrop::PID_SCalendar/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[1]/domChild[5]/domChild[0]/domChild[1]</td>
 	<td>12:00 AM Event 10</td>
 </tr>
 <!--//Test drag and drop in week view-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarDragAndDrop::PID_SCalendar/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[0]</td>
 	<td>7,85</td>
 </tr>
 <tr>
 	<td>drag</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarDragAndDrop::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VHorizontalLayout[0]/Slot[1]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[11]/domChild[0]/domChild[0]</td>
 	<td>34,12</td>
 </tr>
 <tr>
 	<td>drop</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarDragAndDrop::PID_SCalendar/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]/domChild[15]</td>
 	<td>0,0</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarDragAndDrop::PID_SCalendar/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]/domChild[48]/domChild[0]</td>
 	<td>7:30 AM: Event 13</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/calendar/CalendarEventSizingNoOverlap.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarEventSizingNoOverlap.html
@@ -1,110 +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>eventSizingNoOverlap</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">eventSizingNoOverlap</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.calendar.CalendarTest?testBench&amp;firstDay=1&amp;lastDay=5&amp;firstHour=8&amp;lastHour=16&amp;restartApplication</td>
 	<td></td>
 </tr>
 <!-- Go to week view -->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]</td>
 	<td>4,57</td>
 </tr>
 <!-- Open add-event popup, enter event between 12:45-13:15 -->
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[0]/Slot[7]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>1/9/00 12:45 PM</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/9/00 13:15 PM</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>12:45-13:15</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!-- Open add-event popup, enter event between 13:15-13:25 -->
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[0]/Slot[7]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>1/9/00 13:15 PM</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/9/00 13:25 PM</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>13:15-13:25</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!-- Open add-event popup, enter event between 13:25-13:55 -->
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[0]/Slot[7]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>1/9/00 13:25 PM</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/9/00 13:55 PM</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>13:25-13:55</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/calendar/CalendarMidnightEventsTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarMidnightEventsTest.html
@@ -1,116 +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>midnightEventsTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">midnightEventsTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.calendar.CalendarTest?testBench&amp;width=1000px&amp;height=600px&amp;secondsResolution&amp;restartApplication</td>
 	<td></td>
 </tr>
 <!--Add event from 0:00 to 0:00-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[1]/domChild[1]/domChild[0]/domChild[2]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>1/3/00 12:00:00 AM</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/4/00 12:00:00 AM</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Midnight to midnight</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!--Add event from 00:00 to 00:00 on the same day-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[1]/domChild[1]/domChild[0]/domChild[2]</td>
 	<td>84,10</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/7/00 12:00:00 AM</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Zero-length midnight event</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>
 <!--Go to weekly view-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[0]</td>
 	<td>10,48</td>
 </tr>
 <!--Assert zero-length event exists-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]/domChild[48]/domChild[0]</td>
 	<td>50,4</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Zero-length midnight event</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!--Assert that the the all day event does not overflow to the next day by checking that the first time-cell is empty-->
 <tr>
 	<td>dragAndDrop</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]/domChild[5]</td>
 	<td>+0,+5</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[1]/VHorizontalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/calendar/CalendarMonthlyViewNewEvent.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarMonthlyViewNewEvent.html
@@ -1,170 +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>monthlyViewNewEvent</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">monthlyViewNewEvent</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.calendar.CalendarTest?testBench&amp;width=1000px&amp;height=600px&amp;restartApplication</td>
 	<td></td>
 </tr>
 <!--Create new event with the button-->
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[0]/Slot[7]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VCheckBox[0]/domChild[0]</td>
 	<td>10,5</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>52,8</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>12/26/99</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/1/00</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Test event</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextArea[0]</td>
 	<td>Test description</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!--Open previously created event, assert values-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[1]</td>
 	<td>91,9</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>12/26/99</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/1/00</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VCheckBox[0]/domChild[0]</td>
 	<td>on</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Test event</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextArea[0]</td>
 	<td>Test description</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>Green</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!--Open previously created event, assert values and shorten the event-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[1]</td>
 	<td>41,8</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>12/26/99</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/1/00</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VCheckBox[0]/domChild[0]</td>
 	<td>on</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Test event</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextArea[0]</td>
 	<td>Test description</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>Green</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>12/27/99</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>12/31/99</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!--Click the calendar where the event previously was, assert new event creation-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]</td>
 	<td>107,8</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/calendar/CalendarMonthlyViewNewEvents.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarMonthlyViewNewEvents.html
@@ -1,410 +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>monthlyViewNewEvents</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">monthlyViewNewEvents</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.calendar.CalendarTest?testBench&amp;width=1000px&amp;height=600px&amp;restartApplication</td>
 	<td></td>
 </tr>
 <!--Create new event by dragging, make it all-day-->
 <tr>
 	<td>drag</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>drop</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[5]/domChild[0]/domChild[2]</td>
 	<td>98,83</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VCheckBox[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>12/27/99</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>12/31/99</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VCheckBox[0]/domChild[0]</td>
 	<td>on</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Test event</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextArea[0]</td>
 	<td>Description</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[1]/VHorizontalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!--Create new event by dragging-->
 <tr>
 	<td>drag</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[1]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>drop</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]</td>
 	<td>38,8</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VCheckBox[0]/domChild[0]</td>
 	<td>7,9</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Second test event</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextArea[0]</td>
 	<td>Desc</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[1]/VHorizontalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!--Create new event by dragging, make it blue-->
 <tr>
 	<td>drag</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[0]/domChild[4]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>drop</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[6]/domChild[0]/domChild[3]</td>
 	<td>125,80</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VCheckBox[0]/domChild[0]</td>
 	<td>10,8</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Third test event</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextArea[0]</td>
 	<td>Testing</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]#button</td>
 	<td>6,9</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item2</td>
 	<td>49,10</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[1]/VHorizontalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]/domChild[4]</td>
 	<td>45,85</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VCheckBox[0]/domChild[0]</td>
 	<td>5,9</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Fourth test event</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextArea[0]</td>
 	<td>Fourth event</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]#button</td>
 	<td>13,18</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item3</td>
 	<td>57,9</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[1]/VHorizontalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!--Start asserting the previously entered events-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]</td>
 	<td>12,7</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>12/27/99</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>12/31/99</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VCheckBox[0]/domChild[0]</td>
 	<td>on</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Test event</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextArea[0]</td>
 	<td>Description</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>Green</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]</td>
 	<td>72,6</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>12/27/99</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>12/31/99</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
 	<td>44,10</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>12/26/99</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>12/29/99</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Second test event</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextArea[0]</td>
 	<td>Desc</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>Green</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
 	<td>79,5</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>12/26/99</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>12/29/99</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Second test event</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextArea[0]</td>
 	<td>Desc</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>Green</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[0]/domChild[2]</td>
 	<td>47,9</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>12/30/99</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/1/00</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Third test event</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextArea[0]</td>
 	<td>Testing</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>Blue</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[0]/domChild[2]</td>
 	<td>72,9</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>12/30/99</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/1/00</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Third test event</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextArea[0]</td>
 	<td>Testing</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>Blue</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]/domChild[3]</td>
 	<td>37,9</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>12/29/99</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>12/29/99</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Fourth test event</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextArea[0]</td>
 	<td>Fourth event</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>Red</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[0]</td>
 	<td></td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTest1000x600px.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTest1000x600px.html
@@ -1,41 +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>sizeTest1000x600px</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">sizeTest1000x600px</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.calendar.CalendarTest?testBench&amp;restartApplication&amp;width=1000px&amp;height=600px</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[1]/Slot[1]/VLabel[0]</td>
 	<td>Jan 2000</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>month</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]</td>
 	<td>7,53</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>week</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTest100percentXundefined.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTest100percentXundefined.html
@@ -1,41 +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>sizeTest100percentXundefined</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">sizeTest100percentXundefined</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.calendar.CalendarTest?testBench&amp;restartApplication&amp;width=100%25</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[1]/Slot[1]/VLabel[0]</td>
 	<td>Jan 2000</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>month</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]</td>
 	<td>10,53</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>week</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTest100x100percent.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTest100x100percent.html
@@ -1,41 +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>sizeTest100x100percent</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">sizeTest100x100percent</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.calendar.CalendarTest?testBench&amp;restartApplication&amp;width=100%25&amp;height=100%25</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[1]/Slot[1]/VLabel[0]</td>
 	<td>Jan 2000</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>month</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]</td>
 	<td>12,54</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>week</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTest300pxXundefined.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTest300pxXundefined.html
@@ -1,41 +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>sizeTest300pxXundefined</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">sizeTest300pxXundefined</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.calendar.CalendarTest?testBench&amp;restartApplication&amp;width=300px</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[1]/Slot[1]/VLabel[0]</td>
 	<td>Jan 2000</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>month</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]</td>
 	<td>11,52</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>week</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTestUndefinedX100percent.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTestUndefinedX100percent.html
@@ -1,41 +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>sizeTestUndefinedX100percent</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">sizeTestUndefinedX100percent</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.calendar.CalendarTest?testBench&amp;restartApplication&amp;height=100%25</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[1]/Slot[1]/VLabel[0]</td>
 	<td>Jan 2000</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>month</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]</td>
 	<td>9,53</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>week</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTestUndefinedX300px.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTestUndefinedX300px.html
@@ -1,41 +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>sizeTestUndefinedX300px</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">sizeTestUndefinedX300px</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.calendar.CalendarTest?testBench&amp;restartApplication&amp;height=300px</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[1]/Slot[1]/VLabel[0]</td>
 	<td>Jan 2000</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>month</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]</td>
 	<td>9,26</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>week</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTestUndefinedXUndefined.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarSizeTestUndefinedXUndefined.html
@@ -1,41 +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>sizeTestUndefinedXUndefined</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">sizeTestUndefinedXUndefined</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.calendar.CalendarTest?testBench&amp;restartApplication&amp;width=&amp;height=</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[1]/Slot[1]/VLabel[0]</td>
 	<td>Jan 2000</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>month</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]</td>
 	<td>8,52</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>week</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/calendar/CalendarVisibleHours24H.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarVisibleHours24H.html
@@ -1,46 +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>visibleHours24H</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">visibleHours24H</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.calendar.CalendarTest?testBench&amp;firstDay=1&amp;lastDay=5&amp;firstHour=8&amp;lastHour=16&amp;restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[1]/domChild[1]/domChild[0]/domChild[0]</td>
 	<td>9,55</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[0]/Slot[2]/VFilterSelect[0]#button</td>
 	<td>14,5</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[2]/table/tbody/tr[4]/td</td>
 	<td>120,15</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]</td>
 	<td>9:00</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[8]</td>
 	<td>16:00</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/calendar/CalendarWeeklyViewNewEvents.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/CalendarWeeklyViewNewEvents.html
@@ -1,657 +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>weeklyViewNewEvents</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">weeklyViewNewEvents</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.calendar.CalendarTest?testBench&amp;width=1000px&amp;height=600px&amp;restartApplication</td>
 	<td></td>
 </tr>
 <!--Go to weekly view-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]</td>
 	<td>3,49</td>
 </tr>
 <!--Assert the default event contents-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]/domChild[48]/domChild[0]/domChild[0]</td>
 	<td>26,5</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>1/10/00 09:30 AM</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/10/00 02:00 PM</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VCheckBox[0]/domChild[0]</td>
 	<td>off</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Appointment</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[1]</td>
 	<td>Office</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextArea[0]</td>
 	<td>A longer description, which should display correctly.</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>Green</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[3]/domChild[0]/domChild[48]/domChild[0]/domChild[0]</td>
 	<td>21,12</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>1/11/00 11:00 AM</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/11/00 07:00 PM</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Training</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>Blue</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[7]/domChild[0]/domChild[48]/domChild[0]/domChild[0]</td>
 	<td>19,9</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>1/15/00 09:00 AM</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/15/00 06:00 PM</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Free time</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[6]/domChild[0]/domChild[0]</td>
 	<td>22,6</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>1/9/00</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/15/00</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VCheckBox[0]/domChild[0]</td>
 	<td>on</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Whole week event</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextArea[0]</td>
 	<td>Description for the whole week event.</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>Orange</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!--Assert the all-day events-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[3]/domChild[0]/domChild[1]</td>
 	<td>78,3</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>1/12/00</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/12/00</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Allday event</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextArea[0]</td>
 	<td>Some description.</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>Red</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[4]/domChild[0]/domChild[1]</td>
 	<td>57,7</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>1/13/00</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/13/00</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Second allday event</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextArea[0]</td>
 	<td>Some description.</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>Blue</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!--Enter new event-->
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[0]/Slot[7]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>1/13/00 9:00 AM</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/13/00 2:00 PM</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Test event</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextArea[0]</td>
 	<td>Test event description</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[1]</td>
 	<td>3,15</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item4</td>
 	<td>36,6</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!--Assert previously created event-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[5]/domChild[0]/domChild[48]/domChild[0]</td>
 	<td>47,21</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>1/13/00 09:00 AM</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/13/00 02:00 PM</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Test event</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextArea[0]</td>
 	<td>Test event description</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>Orange</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]/domChild[1]</td>
 	<td>8,9</td>
 </tr>
 <!--Edit previously created events and change properties-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[5]/domChild[0]/domChild[48]/domChild[0]</td>
 	<td>33,16</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#popupButton</td>
 	<td>10,11</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::Root/VOverlay[0]/VCalendarPanel[0]#day11</td>
 	<td>16,11</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#popupButton</td>
 	<td>14,14</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::Root/VOverlay[0]/VCalendarPanel[0]#day11</td>
 	<td>14,10</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!--Assert the edited values-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[3]/domChild[0]/domChild[49]/domChild[0]</td>
 	<td>34,21</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>1/11/00 09:00 AM</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/11/00 02:00 PM</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!--Create new event-->
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[0]/Slot[7]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>1/11/00 10:00 AM</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/11/00 8:00 PM</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Test event 2</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextArea[0]</td>
 	<td>Second test event</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!--Assert previously created event still exists in the right place (as multiple events occupy the same time)-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[3]/domChild[0]/domChild[50]/domChild[0]</td>
 	<td>7,73</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>1/11/00 09:00 AM</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/11/00 02:00 PM</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!--Assert previously created event still exists in the right place (as multiple events occupy the same time)-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[3]/domChild[0]/domChild[49]/domChild[0]/domChild[0]</td>
 	<td>12,32</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>1/11/00 11:00 AM</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/11/00 07:00 PM</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]/domChild[1]</td>
 	<td>11,8</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[3]/domChild[0]/domChild[48]/domChild[1]</td>
 	<td>4,9</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>1/11/00 10:00 AM</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/11/00 08:00 PM</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[3]/domChild[0]/domChild[50]/domChild[0]</td>
 	<td>14,71</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>1/11/00 09:00 AM</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/11/00 02:00 PM</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Test event</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[3]/domChild[0]/domChild[48]/domChild[0]</td>
 	<td>16,111</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>1/11/00 10:00 AM</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/11/00 08:00 PM</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Test event 2</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[3]/domChild[0]/domChild[48]/domChild[0]</td>
 	<td>14,209</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>1/11/00 10:00 AM</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/11/00 08:00 PM</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Test event 2</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[3]/domChild[0]/domChild[49]/domChild[0]/domChild[0]</td>
 	<td>20,113</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>1/11/00 11:00 AM</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/11/00 07:00 PM</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Training</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]/domChild[1]</td>
 	<td>7,8</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[3]/domChild[0]/domChild[50]/domChild[0]</td>
 	<td>21,87</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#field</td>
 	<td>1/11/00 09:00 AM</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[1]#field</td>
 	<td>1/11/00 02:00 PM</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Test event</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]/domChild[1]</td>
 	<td>12,10</td>
 </tr>
 <!--Go to monthly view and assert inserted events-->
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VHorizontalLayout[1]/Slot[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[2]/domChild[2]/domChild[0]/domChild[4]</td>
 	<td>36,10</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Test event</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[2]/domChild[2]/domChild[0]/domChild[3]</td>
 	<td>53,6</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Training</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[2]/domChild[2]/domChild[0]/domChild[2]/domChild[0]</td>
 	<td>48,7</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Test event 2</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VGridLayout[0]/VCalendar[0]/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[1]/domChild[2]/domChild[4]/domChild[0]/domChild[1]</td>
 	<td>50,6</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
 	<td>Whole week event</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscalendarCalendarTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.html
+++ b/uitest/tb2/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.html
@@ -1,47 +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="http://localhost:8888/" />
    <title>TestHideTimeAndSeparator</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
    <thead>
    <tr><td rowspan="1" colspan="3">TestHideTimeAndSeparator</td></tr>
    </thead><tbody>
 <tr>
    <td>open</td>
    <td>/run/com.vaadin.tests.components.calendar.TestHideTimeAndSeparator?restartApplication</td>
    <td></td>
 </tr>
 <tr>
    <td>assertNotVisible</td>
    <td>vaadin=runcomvaadintestscomponentscalendarTestHideTimeAndSeparator::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]/domChild[35]/domChild[0]/domChild[0]</td>
    <td></td>
 </tr>
 <tr>
    <td>assertNotVisible</td>
    <td>vaadin=runcomvaadintestscomponentscalendarTestHideTimeAndSeparator::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]/domChild[34]/domChild[0]/domChild[0]</td>
    <td></td>
 </tr>
 <tr>
    <td>assertVisible</td>
    <td>vaadin=runcomvaadintestscomponentscalendarTestHideTimeAndSeparator::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[3]/domChild[0]/domChild[35]/domChild[0]/domChild[0]</td>
    <td></td>
 </tr>
 <tr>
    <td>assertVisible</td>
    <td>vaadin=runcomvaadintestscomponentscalendarTestHideTimeAndSeparator::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[3]/domChild[0]/domChild[34]/domChild[0]/domChild[0]</td>
    <td></td>
 </tr>
 <tr>
    <td>assertText</td>
    <td>vaadin=runcomvaadintestscomponentscalendarTestHideTimeAndSeparator::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VCalendar[0]/domChild[0]/domChild[3]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[3]/domChild[0]/domChild[35]/domChild[0]/domChild[0]</td>
    <td>8:00 AM:</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/caption/EmptyCaptions.html
+++ b/uitest/tb2/com/vaadin/tests/components/caption/EmptyCaptions.html
@@ -1,32 +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="http://localhost:8888/" />
 <title>EmptyCaptions</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">EmptyCaptions</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.caption.EmptyCaptions</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>initial</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/caption/LargeCaptionIcon.html
+++ b/uitest/tb2/com/vaadin/tests/components/caption/LargeCaptionIcon.html
@@ -1,47 +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>LargeCaptionIcon</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">LargeCaptionIcon</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.caption.LargeCaptionIcon</td>
 	<td></td>
 </tr>
 <tr>
 	<td>pause</td>
 	<td>750</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>refresh</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pause</td>
 	<td>750</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/checkbox/CheckBoxDisabledReadOnlyValueChange.html
+++ b/uitest/tb2/com/vaadin/tests/components/checkbox/CheckBoxDisabledReadOnlyValueChange.html
@@ -1,147 +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="http://localhost:8888/" />
 <title>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.checkbox.CheckBoxes2?restartApplication</td>
 	<td></td>
 </tr>
 <!--add icon-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes2::PID_Smenu#item0</td>
 	<td>32,11</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes2::Root/VOverlay[0]/VMenuBar[0]#item1</td>
 	<td>50,4</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes2::Root/VOverlay[1]/VMenuBar[0]#item3</td>
 	<td>48,6</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes2::Root/VOverlay[2]/VMenuBar[0]#item1</td>
 	<td>24,9</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes2::PID_StestComponent/domChild[0]</td>
 	<td>off</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes2::PID_StestComponent/domChild[1]</td>
 	<td>9,7</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes2::PID_StestComponent/domChild[0]</td>
 	<td>on</td>
 </tr>
 <!--disable-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes2::PID_Smenu#item0</td>
 	<td>22,11</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes2::Root/VOverlay[0]/VMenuBar[0]#item0</td>
 	<td>33,5</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes2::Root/VOverlay[1]/VMenuBar[0]#item1</td>
 	<td>51,9</td>
 </tr>
 <!--click on caption and icon and assert checked state does not change. Cannot test checkbox click due to Opera problems-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes2::PID_StestComponent/domChild[2]</td>
 	<td>8,7</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes2::PID_StestComponent/domChild[0]</td>
 	<td>on</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes2::PID_StestComponent/domChild[1]</td>
 	<td>5,10</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes2::PID_StestComponent/domChild[0]</td>
 	<td>on</td>
 </tr>
 <!--enable and set to read only-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes2::PID_Smenu#item0</td>
 	<td>33,14</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes2::Root/VOverlay[0]/VMenuBar[0]#item0</td>
 	<td>30,3</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes2::Root/VOverlay[1]/VMenuBar[0]#item1</td>
 	<td>62,4</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes2::PID_Smenu#item0</td>
 	<td>42,4</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes2::Root/VOverlay[0]/VMenuBar[0]#item0</td>
 	<td>40,9</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes2::Root/VOverlay[1]/VMenuBar[0]#item2</td>
 	<td>58,14</td>
 </tr>
 <!--click on caption and icon and assert checked state does not change. Cannot test checkbox click due to Opera problems-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes2::PID_StestComponent/domChild[2]</td>
 	<td>8,7</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes2::PID_StestComponent/domChild[0]</td>
 	<td>on</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes2::PID_StestComponent/domChild[1]</td>
 	<td>5,10</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes2::PID_StestComponent/domChild[0]</td>
 	<td>on</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/checkbox/CheckBoxRevertValueChange.html
+++ b/uitest/tb2/com/vaadin/tests/components/checkbox/CheckBoxRevertValueChange.html
@@ -1,82 +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="http://localhost:8888/" />
 <title>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.checkbox.CheckBoxRevertValueChange?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxRevertValueChange::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[0]/VCheckBox[0]/domChild[0]</td>
 	<td>10,5</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxRevertValueChange::PID_SLog_row_0</td>
 	<td>1. I said no checking!</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxRevertValueChange::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[0]/VCheckBox[0]/domChild[0]</td>
 	<td>off</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxRevertValueChange::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[0]/VCheckBox[0]/domChild[1]</td>
 	<td>93,10</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxRevertValueChange::PID_SLog_row_0</td>
 	<td>2. I said no checking!</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxRevertValueChange::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[0]/VCheckBox[0]/domChild[0]</td>
 	<td>off</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxRevertValueChange::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[0]</td>
 	<td>5,8</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxRevertValueChange::PID_SLog_row_0</td>
 	<td>3. I said no unchecking!</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxRevertValueChange::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[0]</td>
 	<td>on</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxRevertValueChange::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[1]</td>
 	<td>78,12</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxRevertValueChange::PID_SLog_row_0</td>
 	<td>4. I said no unchecking!</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxRevertValueChange::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[0]</td>
 	<td>on</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/checkbox/CheckBoxes.html
+++ b/uitest/tb2/com/vaadin/tests/components/checkbox/CheckBoxes.html
@@ -1,156 +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>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.checkbox.CheckBoxes?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>enabled</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes::PID_Scheckboxaction-Error indicators/domChild[0]</td>
 	<td>31,8</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>enabled-error</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes::PID_Scheckboxaction-Required/domChild[0]</td>
 	<td>38,13</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>enabled-error-required</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes::PID_Scheckboxaction-Readonly/domChild[0]</td>
 	<td>7,9</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>enabled-error-required-readonly</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes::PID_Scheckboxaction-Error indicators/domChild[0]</td>
 	<td>6,4</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>enabled-required-readonly</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes::PID_Scheckboxaction-Required/domChild[0]</td>
 	<td>8,6</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>enabled-readonly</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes::PID_Scheckboxaction-Enabled/domChild[0]</td>
 	<td>8,6</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>disabled-readonly</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes::PID_Scheckboxaction-Required/domChild[0]</td>
 	<td>12,4</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>disabled-required-readonly</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes::PID_Scheckboxaction-Error indicators/domChild[0]</td>
 	<td>10,11</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>disabled-error-required-readonly</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes::PID_Scheckboxaction-Required/domChild[0]</td>
 	<td>6,6</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>disabled-error-readonly</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes::PID_Scheckboxaction-Readonly/domChild[0]</td>
 	<td>9,10</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>disabled-error</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes::PID_Scheckboxaction-Required/domChild[0]</td>
 	<td>9,10</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>disabled-error-required</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes::PID_Scheckboxaction-Error indicators/domChild[0]</td>
 	<td>10,3</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>disabled-required</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscheckboxCheckBoxes::PID_Scheckboxaction-Required/domChild[0]</td>
 	<td>10,7</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>disabled</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.html
+++ b/uitest/tb2/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.html
@@ -1,32 +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>CheckboxCaptionWrapping</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">CheckboxCaptionWrapping</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.checkbox.CheckboxCaptionWrapping</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/colorpicker/ColorPickerHsvTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/colorpicker/ColorPickerHsvTest.html
@@ -1,37 +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>ColorPickerTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">ColorPickerTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.colorpicker.ColorPickerHsvTest?restartApplication</td>
 	<td></td>
 </tr>
 <!-- verify HSV sliders when initially opening the tab, ticket #7863 -->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerHsvTest::PID_Scolorpicker/domChild[1]</td>
 	<td>20,16</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerHsvTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>16,5</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>hsv-initial-sliders</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/colorpicker/ColorPickerTest.html
+++ b/uitest/tb2/com/vaadin/tests/components/colorpicker/ColorPickerTest.html
@@ -1,344 +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>ColorPickerTestUI</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">ColorPickerTestUI</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.colorpicker.ColorPickerTestUI?restartApplication</td>
 	<td></td>
 </tr>

 <!-- change foreground color -->
 <tr>
 	<td>click</td>
 	<td>colorpicker1</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/Slot[1]/VColorPickerGradient[0]#clicklayer</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/Slot[1]/VColorPickerGradient[0]#clicklayer</td>
 	<td>190,87</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[3]/VHorizontalLayout[0]/VOrderedLayout$Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>

 <!-- change background color -->
 <tr>
 	<td>click</td>
 	<td>colorpicker2</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/Slot[1]/VColorPickerGradient[0]#clicklayer</td>
 	<td>51,33</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[3]/VHorizontalLayout[0]/VOrderedLayout$Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>pink-on-yellow</td>
 </tr>

 <!-- change foreground color with area button -->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::PID_Scolorpicker5/domChild[1]</td>
 	<td>10,15</td>
 </tr>
 <!-- expand history -->
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[2]/VButton[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <!-- choose from history -->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VCustomComponent[0]/VColorPickerGrid[0]/domChild[0]/domChild[1]/domChild[0]/domChild[3]</td>
 	<td>9,9</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[3]/VHorizontalLayout[0]/VOrderedLayout$Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>

 <!-- change background color with area button -->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::PID_Scolorpicker6/domChild[1]</td>
 	<td>12,24</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VCustomComponent[0]/VColorPickerGrid[0]/domChild[0]/domChild[1]/domChild[0]/domChild[1]</td>
 	<td>9,12</td>
 </tr>
 <!-- choose from history -->
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[3]/VHorizontalLayout[0]/VOrderedLayout$Slot[0]/VButton[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>black-on-white</td>
 </tr>

 <!-- open and close -->
 <tr>
 	<td>click</td>
 	<td>colorpicker1</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>colorpicker1</td>
 	<td></td>
 </tr>

 <!-- open and close using area button -->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::PID_Scolorpicker5/domChild[1]</td>
 	<td>11,17</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::PID_Scolorpicker5/domChild[1]</td>
 	<td>11,17</td>
 </tr>

 <!-- open background (using area button) to display HSV effects -->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::PID_Scolorpicker6/domChild[1]</td>
 	<td>21,15</td>
 </tr>
 <!-- HSV tab -->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>12,6</td>
 </tr>
 <!-- hue slider -->
 <tr>
 	<td>dragAndDrop</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[2]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VSlider[0]/domChild[2]/domChild[0]</td>
 	<td>136,0</td>
 </tr>
 <!-- saturation slider -->
 <tr>
 	<td>dragAndDrop</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[2]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VSlider[0]/domChild[2]/domChild[0]</td>
 	<td>100,0</td>
 </tr>
 <!-- value slider -->
 <tr>
 	<td>dragAndDrop</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[2]/VVerticalLayout[0]/VOrderedLayout$Slot[2]/VSlider[0]/domChild[2]/domChild[0]</td>
 	<td>-60,0</td>
 </tr>
 <!-- Swatches tab (choose color) -->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>43,8</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VCustomComponent[0]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VColorPickerGrid[0]/domChild[0]/domChild[1]/domChild[11]/domChild[9]</td>
 	<td>12,10</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[3]/VHorizontalLayout[0]/VOrderedLayout$Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>black-on-purple</td>
 </tr>

 <!-- open foreground (using area button) to display checkbox effects -->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::PID_Scolorpicker5/domChild[1]</td>
 	<td>14,25</td>
 </tr>
 <!-- remove Swatches tab -->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::PID_SswaBox/domChild[0]</td>
 	<td>9,6</td>
 </tr>
 <!-- remove css field -->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::PID_StxtBox/domChild[0]</td>
 	<td>6,9</td>
 </tr>
 <!-- remove history -->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::PID_ShisBox/domChild[0]</td>
 	<td>6,7</td>
 </tr>
 <!-- remove RGB tab -->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::PID_SrgbBox/domChild[0]</td>
 	<td>6,7</td>
 </tr>
 <!-- return RGB tab -->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::PID_SrgbBox/domChild[0]</td>
 	<td>6,7</td>
 </tr>
 <!-- remove HSV tab -->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::PID_ShsvBox/domChild[0]</td>
 	<td>6,9</td>
 </tr>
 <!-- return HSV tab -->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::PID_ShsvBox/domChild[0]</td>
 	<td>6,9</td>
 </tr>
 <!-- return css field -->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::PID_StxtBox/domChild[0]</td>
 	<td>8,8</td>
 </tr>
 <!-- return history -->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::PID_ShisBox/domChild[0]</td>
 	<td>6,8</td>
 </tr>
 <!-- return Swatches tab -->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::PID_SswaBox/domChild[0]</td>
 	<td>4,8</td>
 </tr>
 <!-- close without choosing a new color -->
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[3]/VHorizontalLayout[0]/VOrderedLayout$Slot[1]/VButton[0]/domChild[0]</td>
 	<td></td>
 </tr>

 <!-- change color of the first shade button -->
 <tr>
 	<td>click</td>
 	<td>shadebutton_1</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/Slot[1]/VColorPickerGradient[0]#clicklayer</td>
 	<td>148,127</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[3]/VHorizontalLayout[0]/VOrderedLayout$Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>blue-first-button</td>
 </tr>

 <!-- reset the color back to black -->
 <tr>
 	<td>click</td>
 	<td>shadebutton_1</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VCustomComponent[0]/VColorPickerGrid[0]/domChild[0]/domChild[1]/domChild[0]/domChild[6]</td>
 	<td>10,7</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[3]/VHorizontalLayout[0]/VOrderedLayout$Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>

 <!-- change color of the last shade area -->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::PID_Sshadearea_16/domChild[1]</td>
 	<td>10,-65</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/Slot[1]/VColorPickerGradient[0]#clicklayer</td>
 	<td>36,93</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[3]/VHorizontalLayout[0]/VOrderedLayout$Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>yellow-last-area</td>
 </tr>

 <!-- reset the color back to white -->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::PID_Sshadearea_16/domChild[1]</td>
 	<td>19,-65</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VCustomComponent[0]/VColorPickerGrid[0]/domChild[0]/domChild[1]/domChild[0]/domChild[4]</td>
 	<td>6,7</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscolorpickerColorPickerTestUI::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[3]/VHorizontalLayout[0]/VOrderedLayout$Slot[0]/VButton[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>final</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.html
@@ -1,97 +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>ComboBoxDataSourceChange</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">ComboBoxDataSourceChange</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.combobox.ComboBoxDataSourceChange?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxDataSourceChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxDataSourceChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>
 	<td>4,10</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxDataSourceChange::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item4</td>
 	<td>108,0</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>value-should-be-ds1-3</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxDataSourceChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>
 	<td>11,15</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxDataSourceChange::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[2]/domChild[0]</td>
 	<td>84,6</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxDataSourceChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/domChild[0]/domChild[0]</td>
 	<td>260,245</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>combo-should-have-ds1-3-text</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxDataSourceChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[5]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>container-changed-value-null</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxDataSourceChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>
 	<td>12,18</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxDataSourceChange::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item3</td>
 	<td>106,10</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxDataSourceChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>
 	<td>10,22</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxDataSourceChange::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[2]/domChild[0]</td>
 	<td>91,4</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>value-ds2-2</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.html
@@ -1,67 +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>ComboBoxInvalidNullSelection</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">ComboBoxInvalidNullSelection</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.combobox.ComboBoxInvalidNullSelection?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxInvalidNullSelection::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxInvalidNullSelection::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VFilterSelect[0]/domChild[1]</td>
 	<td>10,10</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxInvalidNullSelection::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item3</td>
 	<td>101,11</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxInvalidNullSelection::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxInvalidNullSelection::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxInvalidNullSelection::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VFilterSelect[0]/domChild[0]</td>
 	<td>100,14</td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxInvalidNullSelection::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxInvalidNullSelection::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VFilterSelect[0]/domChild[0]</td>
 	<td>80,11</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxInvalidNullSelection::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
 	<td>3. Value is now: Item 3</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxNavigation.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxNavigation.html
@@ -1,392 +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>ComboBoxNavigation</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">ComboBoxNavigation</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.combobox.ComboBoxNavigation</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>setSpeed</td>
 	<td>200</td>
 	<td>Needed because of #3409</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>41,10</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>e</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>down</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>down</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>down</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>down</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>down</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>down</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>down</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>down</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>down</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>down</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>down</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>down</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>down</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>down</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>down</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>down</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>down</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>down</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>down</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>up</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>up</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>up</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>up</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>up</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>up</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>up</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>up</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>up</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>up</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>up</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>up</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>up</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>enter</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyValue</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>Item 7</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxNullItem.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxNullItem.html
@@ -1,62 +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="http://arturwin.office.itmill.com:8888/" />
 <title>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.combobox.ComboBoxNavigation?restartApplication&amp;theme=chameleon</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>
 	<td>5,9</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>combobox-with-null-item-chameleon</td>
 </tr>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.combobox.ComboBoxNavigation?restartApplication&amp;theme=runo</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>
 	<td>5,9</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>combobox-with-null-item-runo</td>
 </tr>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.combobox.ComboBoxNavigation?restartApplication&amp;theme=reindeer</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>
 	<td>5,9</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>combobox-with-null-item-reindeer</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxPageLength.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxPageLength.html
@@ -1,176 +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>SelectPageLength</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">SelectPageLength</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.combobox.ComboBoxPageLength?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::/VVerticalLayout[0]/VVerticalLayout[0]/VFilterSelect[0]#button</td>
 	<td>9,12</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item7</td>
 	<td>61,8</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::/VVerticalLayout[0]/VVerticalLayout[0]/VFilterSelect[0]#button</td>
 	<td>10,14</td>
 </tr>
 <tr>
 	<td>assertElementPresent</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item7</td>
 	<td>pagelength-8-page-1</td>
 </tr>
 <tr>
 	<td>assertElementNotPresent</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[8]</td>
 	<td>pagelength-8-page-1</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[2]/domChild[0]</td>
 	<td>68,7</td>
 </tr>
 <tr>
 	<td>assertElementPresent</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item0</td>
 	<td>pagelength-8-page-2</td>
 </tr>
 <tr>
 	<td>assertElementPresent</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item7</td>
 	<td>pagelength-8-page-2</td>
 </tr>
 <tr>
 	<td>assertElementNotPresent</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[8]</td>
 	<td>pagelength-8-page-2</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[2]/domChild[0]</td>
 	<td>68,7</td>
 </tr>
 <tr>
 	<td>assertElementPresent</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item0</td>
 	<td>pagelength-8-page-3</td>
 </tr>
 <tr>
 	<td>assertElementPresent</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item3</td>
 	<td>pagelength-8-page-3</td>
 </tr>
 <tr>
 	<td>waitForElementNotPresent</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[4]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertElementNotPresent</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[4]</td>
 	<td>pagelength-8-page-3</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item3</td>
 	<td>38,6</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::/VVerticalLayout[0]/VVerticalLayout[0]/VFilterSelect[0]#button</td>
 	<td>7,9</td>
 </tr>
 <tr>
 	<td>assertElementPresent</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item0</td>
 	<td>pagelength-20-page-1</td>
 </tr>
 <tr>
 	<td>assertElementPresent</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item19</td>
 	<td>pagelength-20-page-1</td>
 </tr>
 <tr>
 	<td>assertElementNotPresent</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[20]</td>
 	<td>pagelength-20-page-1</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item1</td>
 	<td>126,7</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::/VVerticalLayout[0]/VVerticalLayout[0]/VMenuBar[0]#item0</td>
 	<td>40,5</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VOverlay[0]/VMenuBar[0]#item4</td>
 	<td>18,11</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VOverlay[1]/VMenuBar[0]#item0</td>
 	<td>51,10</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::/VVerticalLayout[0]/VVerticalLayout[0]/VFilterSelect[0]#button</td>
 	<td>11,13</td>
 </tr>
 <tr>
 	<td>assertElementPresent</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item0</td>
 	<td>pagelength-2-page-2</td>
 </tr>
 <tr>
 	<td>assertElementPresent</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item1</td>
 	<td>pagelength-2-page-2</td>
 </tr>
 <tr>
 	<td>assertElementNotPresent</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[2]</td>
 	<td>pagelength-2-page-2</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>78,4</td>
 </tr>
 <tr>
 	<td>assertElementPresent</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item0</td>
 	<td>pagelength-2-page-1</td>
 </tr>
 <tr>
 	<td>assertElementPresent</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item1</td>
 	<td>pagelength-2-page-1</td>
 </tr>
 <tr>
 	<td>assertElementNotPresent</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxPageLength::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[2]</td>
 	<td>pagelength-2-page-1</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxParentDisable.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxParentDisable.html
@@ -1,125 +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="http://localhost:8888/" />
 <title>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.combobox.ComboBoxParentDisable?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxParentDisable::/VVerticalLayout[0]/Slot[1]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]#button</td>
 	<td>6,16</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[2]/table/tbody/tr[2]/td/span</td>
 	<td>Item 1</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxParentDisable::/VVerticalLayout[0]/domChild[1]</td>
 	<td>371,22</td>
 </tr>
 <tr>
 	<td>assertElementNotPresent</td>
 	<td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']</td>
 	<td>Item 1</td>
 </tr>
 <!--Disable combobox-->
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxParentDisable::/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxParentDisable::/VVerticalLayout[0]/Slot[1]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]#button</td>
 	<td>8,12</td>
 </tr>
 <tr>
 	<td>assertElementNotPresent</td>
 	<td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']</td>
 	<td>Item 1</td>
 </tr>
 <!--Enable combobox-->
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxParentDisable::/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>pause</td>
 	<td></td>
 	<td>100</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxParentDisable::/VVerticalLayout[0]/Slot[1]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]#button</td>
 	<td>8,12</td>
 </tr>
 <tr>
 	<td>assertElementPresent</td>
 	<td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']</td>
 	<td>Item 1</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxParentDisable::/VVerticalLayout[0]/domChild[1]</td>
 	<td>371,22</td>
 </tr>
 <!--Disable parent-->
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxParentDisable::/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxParentDisable::/VVerticalLayout[0]/Slot[1]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]#button</td>
 	<td>8,12</td>
 </tr>
 <tr>
 	<td>assertElementNotPresent</td>
 	<td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']</td>
 	<td>Item 1</td>
 </tr>
 <!--Enable parent-->
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxParentDisable::/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>pause</td>
 	<td></td>
 	<td>100</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxParentDisable::/VVerticalLayout[0]/Slot[1]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]#button</td>
 	<td>8,12</td>
 </tr>
 <tr>
 	<td>assertElementPresent</td>
 	<td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']</td>
 	<td>Item 1</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxParentDisable::/VVerticalLayout[0]/domChild[1]</td>
 	<td>371,22</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html
@@ -1,116 +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>Ticket4607</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">Ticket4607</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.combobox.ComboBoxReapperingOldValue?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxReapperingOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[1]</td>
 	<td>7,8</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[2]/table/tbody/tr[2]/td</td>
 	<td>176,10</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxReapperingOldValue::/VVerticalLayout[0]/ChildComponentContainer[2]/VFilterSelect[0]/domChild[1]</td>
 	<td>12,15</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[2]/table/tbody/tr[6]/td</td>
 	<td>163,13</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxReapperingOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[1]</td>
 	<td>7,17</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[2]/table/tbody/tr[3]/td</td>
 	<td>186,5</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxReapperingOldValue::/VVerticalLayout[0]/ChildComponentContainer[2]/VFilterSelect[0]/domChild[1]</td>
 	<td>10,15</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxReapperingOldValue::/VVerticalLayout[0]</td>
 	<td>10,15</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxRemoveAllItems.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxRemoveAllItems.html
@@ -1,91 +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="http://arturwin.office.itmill.com:8888/" />
 <title>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.combobox.ComboBoxes2?restartApplication</td>
 	<td></td>
 </tr>
 <!--Disable event log-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxes2::PID_Smenu#item1</td>
 	<td>18,9</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxes2::Root/VOverlay[0]/VMenuBar[0]#item0</td>
 	<td>49,12</td>
 </tr>
 <!--16x16 icons-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxes2::PID_Smenu#item0</td>
 	<td>46,13</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxes2::Root/VOverlay[0]/VMenuBar[0]#item5</td>
 	<td>46,11</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxes2::Root/VOverlay[1]/VMenuBar[0]#item2</td>
 	<td>45,7</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxes2::Root/VOverlay[2]/VMenuBar[0]#item1</td>
 	<td>31,2</td>
 </tr>
 <!--select item 5-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxes2::PID_StestComponent/domChild[1]</td>
 	<td>12,15</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxes2::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item4</td>
 	<td>64,8</td>
 </tr>
 <!--remove all items from the combobox-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxes2::PID_Smenu#item0</td>
 	<td>11,6</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxes2::Root/VOverlay[0]/VMenuBar[0]#item5</td>
 	<td>60,10</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxes2::Root/VOverlay[1]/VMenuBar[0]#item1</td>
 	<td>53,3</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxes2::Root/VOverlay[2]/VMenuBar[0]#item0</td>
 	<td>62,4</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>no-selection</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.html
@@ -1,37 +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="http://localhost:8888/" />
 <title>ComboBoxSQLContainerFilteredValueChange</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">ComboBoxSQLContainerFilteredValueChange</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.combobox.ComboBoxSQLContainerFilteredValueChange?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxSQLContainerFilteredValueChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]#textbox</td>
 	<td>a</td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxSQLContainerFilteredValueChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]#textbox</td>
 	<td>enter</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxSQLContainerFilteredValueChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VLabel[0]</td>
 	<td>Selected: 1</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.html
@@ -1,31 +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>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.combobox.ComboBoxSuggestionOnDetach?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxSuggestionOnDetach::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>
 	<td>11,12</td>
 </tr>
 <tr>
 	<td>assertElementNotPresent</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxSuggestionOnDetach::Root/VFilterSelect$SuggestionPopup[0]</td>
 	<td></td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.html
@@ -1,101 +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="http://localhost:8888/" />
 <title>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.combobox.ComboBoxUndefinedWidthAndIcon?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxUndefinedWidthAndIcon::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>
 	<td>13,14</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxUndefinedWidthAndIcon::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item1</td>
 	<td>32,5</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>item1-selected</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxUndefinedWidthAndIcon::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[2]</td>
 	<td>12,5</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxUndefinedWidthAndIcon::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[2]/domChild[0]</td>
 	<td>81,6</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>page2</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxUndefinedWidthAndIcon::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[2]/domChild[0]</td>
 	<td>78,6</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>page3</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxUndefinedWidthAndIcon::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[2]/domChild[0]</td>
 	<td>78,6</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>page4</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxUndefinedWidthAndIcon::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item3</td>
 	<td>68,8</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>item33-selected</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxUndefinedWidthAndIcon::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[2]</td>
 	<td>8,7</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxUndefinedWidthAndIcon::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[2]/domChild[0]</td>
 	<td>116,3</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxUndefinedWidthAndIcon::</td>
 	<td>338,241</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>item33-selected-after-popup-opened-and-closed</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.html
@@ -1,133 +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>ComboFocusBlurEvents</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">ComboFocusBlurEvents</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.combobox.ComboFocusBlurEvents?restartApplication</td>
 	<td></td>
 </tr>
 <!--Testing selecting several items, the focus should stay on the combo and only one focus event should trigger-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboFocusBlurEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>
 	<td>9,14</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboFocusBlurEvents::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item4</td>
 	<td>142,2</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboFocusBlurEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>
 	<td>17,12</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboFocusBlurEvents::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item7</td>
 	<td>143,6</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboFocusBlurEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>
 	<td>13,9</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboFocusBlurEvents::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item3</td>
 	<td>147,11</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboFocusBlurEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>
 	<td>16,11</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboFocusBlurEvents::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item5</td>
 	<td>146,4</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboFocusBlurEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VLabel[0]</td>
 	<td>exact:0: Focus event!</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>OneFocusEvent</td>
 </tr>
 <!--Test ended.-->
 <!--Testing keyboard navigation-->
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboFocusBlurEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>down</td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboFocusBlurEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>down</td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboFocusBlurEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>down</td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboFocusBlurEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>down</td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboFocusBlurEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>down</td>
 </tr>
 <tr>
 	<td>pressSpecialKey</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboFocusBlurEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>enter</td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboFocusBlurEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VLabel[0]</td>
 	<td>exact:0: Focus event!</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>StillOneFocusEvent</td>
 </tr>
 <!--Test ended.-->
 <!--Move focus out with mouse-->
 <tr>
 	<td>focus</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboFocusBlurEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTextField[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboFocusBlurEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VLabel[0]</td>
 	<td>0: Focus event!<br />1: Blur event!</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>OneFocusOneBlur</td>
 </tr>
 <!--End test.-->

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.html
@@ -1,42 +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="http://localhost:8888/" />
 <title>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
    <td>open</td>
    <td>/run/com.vaadin.tests.components.combobox.ComboboxInPopupViewWithItems?restartApplication</td>
    <td></td>
 </tr>
 <tr>
    <td>mouseClick</td>
    <td>vaadin=runcomvaadintestscomponentscomboboxComboboxInPopupViewWithItems::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VPopupView[0]</td>
    <td>26,6</td>
 </tr>
 <tr>
    <td>mouseClick</td>
    <td>//input[@type='text']</td>
    <td>52,13</td>
 </tr>
 <tr>
    <td>pressSpecialKey</td>
    <td>//input[@type='text']</td>
    <td>down</td>
 </tr>
 <tr>
    <td>screenCapture</td>
    <td></td>
    <td>popup-open</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/combobox/ComboboxPrimaryStyleName.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/ComboboxPrimaryStyleName.html
@@ -1,131 +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="http://localhost:8888/" />
 <title>New Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
 <tr>
    <td>open</td>
    <td>/run/com.vaadin.tests.components.combobox.ComboboxPrimaryStyleNames?restartApplication</td>
    <td></td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentscomboboxComboboxPrimaryStyleNames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VFilterSelect[0]</td>
    <td>my-combobox</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentscomboboxComboboxPrimaryStyleNames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VFilterSelect[0]/domChild[0]</td>
    <td>my-combobox-input</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentscomboboxComboboxPrimaryStyleNames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VFilterSelect[0]/domChild[1]</td>
    <td>my-combobox-button</td>
 </tr>
 <tr>
    <td>mouseClick</td>
    <td>vaadin=runcomvaadintestscomponentscomboboxComboboxPrimaryStyleNames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VFilterSelect[0]#textbox</td>
    <td>98,8</td>
 </tr>
 <tr>
    <td>pressSpecialKey</td>
    <td>vaadin=runcomvaadintestscomponentscomboboxComboboxPrimaryStyleNames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VFilterSelect[0]#textbox</td>
    <td>down</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']</td>
    <td>my-combobox-suggestpopup</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[1]</td>
    <td>my-combobox-prevpage-off</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[2]</td>
    <td>my-combobox-suggestmenu</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[3]</td>
    <td>my-combobox-nextpage-off</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[4]</td>
    <td>my-combobox-status</td>
 </tr>
 <tr>
    <td>mouseClick</td>
    <td>vaadin=runcomvaadintestscomponentscomboboxComboboxPrimaryStyleNames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VFilterSelect[0]#textbox</td>
    <td>98,8</td>
 </tr>
 <tr>
    <td>click</td>
    <td>vaadin=runcomvaadintestscomponentscomboboxComboboxPrimaryStyleNames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VButton[0]/domChild[0]/domChild[0]</td>
    <td></td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentscomboboxComboboxPrimaryStyleNames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VFilterSelect[0]</td>
    <td>my-second-combobox</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentscomboboxComboboxPrimaryStyleNames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VFilterSelect[0]/domChild[0]</td>
    <td>my-second-combobox-input</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>vaadin=runcomvaadintestscomponentscomboboxComboboxPrimaryStyleNames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VFilterSelect[0]/domChild[1]</td>
    <td>my-second-combobox-button</td>
 </tr>
 <tr>
    <td>mouseClick</td>
    <td>vaadin=runcomvaadintestscomponentscomboboxComboboxPrimaryStyleNames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VFilterSelect[0]#textbox</td>
    <td>98,8</td>
 </tr>
 <tr>
    <td>pressSpecialKey</td>
    <td>vaadin=runcomvaadintestscomponentscomboboxComboboxPrimaryStyleNames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VFilterSelect[0]#textbox</td>
    <td>down</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']</td>
    <td>my-second-combobox-suggestpopup</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[1]</td>
    <td>my-second-combobox-prevpage-off</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[2]</td>
    <td>my-second-combobox-suggestmenu</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[3]</td>
    <td>my-second-combobox-nextpage-off</td>
 </tr>
 <tr>
    <td>assertCSSClass</td>
    <td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[4]</td>
    <td>my-second-combobox-status</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/combobox/Comboboxes.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/Comboboxes.html
@@ -1,288 +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>Comboboxes</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">Comboboxes</td></tr>
 </thead><tbody>
 <tr>
 	<td>setSpeed</td>
 	<td>200</td>
 	<td>To avoid sporadic failures</td>
 </tr>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.combobox.Comboboxes?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>initial</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[1]</td>
 	<td>14,14</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>empty-open</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VFilterSelect[0]/domChild[1]</td>
 	<td>14,11</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VFilterSelect[0]/domChild[1]</td>
 	<td>10,9</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>undefined-wide-open</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VFilterSelect[0]/domChild[1]</td>
 	<td>12,19</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>undefined-wide-select-wide-popup</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[3]/span</td>
 	<td>163,4</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[3]/span</td>
 	<td>163,4</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>undefined-wide-select-wide-popup-page-3</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[5]/VFilterSelect[0]/domChild[1]</td>
 	<td>5,11</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[6]/VFilterSelect[0]/domChild[1]</td>
 	<td>9,9</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[7]/VFilterSelect[0]/domChild[1]</td>
 	<td>13,10</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[8]/VFilterSelect[0]/domChild[1]</td>
 	<td>11,12</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>fixed-select-wide-popup</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[3]/span</td>
 	<td>184,2</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[3]/span</td>
 	<td>184,2</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>fixed-select-wide-popup-page-3</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[8]/VFilterSelect[0]/domChild[1]</td>
 	<td>11,12</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <!--Open pagelength 0 combobox and capture-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[9]/VFilterSelect[0]/domChild[1]</td>
 	<td>9,13</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>pagelength-0-popup-open</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <!--Start testing modes-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::PID_Scheckboxaction-Readonly/domChild[0]</td>
 	<td>23,5</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>readonly</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::PID_Scheckboxaction-Error indicators/domChild[0]</td>
 	<td>35,3</td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>readonly-error</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::PID_Scheckboxaction-Required/domChild[0]</td>
 	<td>12,-8</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::PID_Scheckboxaction-Error indicators/domChild[0]</td>
 	<td>7,-8</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>readonly-required</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::PID_Scheckboxaction-Readonly/domChild[0]</td>
 	<td>26,10</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::PID_Scheckboxaction-Required/domChild[0]</td>
 	<td>3,-7</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::PID_Scheckboxaction-Error indicators/domChild[0]</td>
 	<td>7,-8</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>error</td>
 </tr>
 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/combobox/EscapeClosesComboboxNotWindow.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/EscapeClosesComboboxNotWindow.html
@@ -1,42 +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>EscapeClosesComboboxNotWindow</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">EscapeClosesComboboxNotWindow</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/EscapeClosesComboboxNotWindow?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runEscapeClosesComboboxNotWindow::/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runEscapeClosesComboboxNotWindow::/VWindow[0]/FocusableScrollPanel[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[1]</td>
 	<td>10,16</td>
 </tr>
 <tr>
 	<td>keyDown</td>
 	<td>vaadin=runEscapeClosesComboboxNotWindow::/VWindow[0]/FocusableScrollPanel[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[0]</td>
 	<td>\27</td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Window</td>
 	<td></td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/combobox/PopUpWidth.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/PopUpWidth.html
@@ -1,57 +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>PopUpWidth</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
 <tr><td rowspan="1" colspan="3">PopUpWidth</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
 	<td>/run/com.vaadin.tests.components.combobox.PopUpWidth</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxPopUpWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[1]</td>
 	<td>9,14</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxPopUpWidth::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[2]/domChild[0]</td>
 	<td>106,5</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxPopUpWidth::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[2]/domChild[0]</td>
 	<td>103,5</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxPopUpWidth::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[2]/domChild[0]</td>
 	<td>103,5</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxPopUpWidth::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[2]/domChild[0]</td>
 	<td>103,5</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentscomboboxPopUpWidth::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[2]/domChild[0]</td>
 	<td>103,5</td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td>combos-and-popup-with-same-width</td>
 </tr>

 </tbody></table>
 </body>
 </html>
--- a/uitest/tb2/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.html
+++ b/uitest/tb2/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.html