[merge from 6.7] #8311 Converted CRLF -> LF in css/html/xml files

svn changeset:22853/svn branch:6.8

66 files changed, 9799 insertions, 9799 deletions

diff --git a/build/maven/pom-template.xml b/build/maven/pom-template.xml
index b3fe5119e9..03af6338da 100644
--- a/build/maven/pom-template.xml
+++ b/build/maven/pom-template.xml
@@ -1,63 +1,63 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-  <modelVersion>4.0.0</modelVersion>

-  <groupId>com.vaadin</groupId>

-  <artifactId>vaadin</artifactId>

-  <version>@MAVEN-VERSION@</version>

-  <name>Vaadin</name>

-  <organization>

-    <name>Vaadin Ltd</name>

-    <url>http://vaadin.com</url>

-  </organization>

-  <url>http://vaadin.com</url>

-  <description>

-      Vaadin is a web application framework for Rich Internet Applications (RIA).

-

-      Vaadin enables easy development and maintenance of fast and secure rich web

-      applications with a stunning look and feel and a wide browser support.

-      It features a server-side architecture with the majority of the logic running

-      on the server. Ajax technology is used at the browser-side to ensure a rich

-      and interactive user experience.

-  </description>

-  <licenses>

-    <license>

-      <name>Apache License Version 2.0</name>

-      <distribution>repo</distribution>

-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>

-    </license>

-  </licenses>

-  <distributionManagement>

-    <repository>

-      <id>vaadin-releases</id>

-      <name>Vaadin release repository</name>

-      <url>http://oss.sonatype.org/content/repositories/vaadin-releases/</url>

-    </repository>

-    <snapshotRepository>

-      <id>vaadin-snapshots</id>

-      <name>Vaadin snapshot repository</name>

-      <url>http://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>

-    </snapshotRepository>

-  </distributionManagement>

-  <repositories>

-    <repository>

-      <id>vaadin-snapshots</id>

-      <url>http://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>

-      <releases>

-        <enabled>false</enabled>

-      </releases>

-      <snapshots>

-        <enabled>true</enabled>

-      </snapshots>

-    </repository>

-    <repository>

-      <id>vaadin-releases</id>

-      <url>http://oss.sonatype.org/content/repositories/vaadin-releases/</url>

-      <releases>

-        <enabled>true</enabled>

-      </releases>

-      <snapshots>

-        <enabled>false</enabled>

-      </snapshots>

-    </repository>

-  </repositories>

-  

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.vaadin</groupId>
+  <artifactId>vaadin</artifactId>
+  <version>@MAVEN-VERSION@</version>
+  <name>Vaadin</name>
+  <organization>
+    <name>Vaadin Ltd</name>
+    <url>http://vaadin.com</url>
+  </organization>
+  <url>http://vaadin.com</url>
+  <description>
+      Vaadin is a web application framework for Rich Internet Applications (RIA).
+
+      Vaadin enables easy development and maintenance of fast and secure rich web
+      applications with a stunning look and feel and a wide browser support.
+      It features a server-side architecture with the majority of the logic running
+      on the server. Ajax technology is used at the browser-side to ensure a rich
+      and interactive user experience.
+  </description>
+  <licenses>
+    <license>
+      <name>Apache License Version 2.0</name>
+      <distribution>repo</distribution>
+      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+    </license>
+  </licenses>
+  <distributionManagement>
+    <repository>
+      <id>vaadin-releases</id>
+      <name>Vaadin release repository</name>
+      <url>http://oss.sonatype.org/content/repositories/vaadin-releases/</url>
+    </repository>
+    <snapshotRepository>
+      <id>vaadin-snapshots</id>
+      <name>Vaadin snapshot repository</name>
+      <url>http://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>
+    </snapshotRepository>
+  </distributionManagement>
+  <repositories>
+    <repository>
+      <id>vaadin-snapshots</id>
+      <url>http://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>vaadin-releases</id>
+      <url>http://oss.sonatype.org/content/repositories/vaadin-releases/</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+  
 </project>
\ No newline at end of file
diff --git a/build/package/build.xml b/build/package/build.xml
index b7ece66174..f270b3b7c3 100644
--- a/build/package/build.xml
+++ b/build/package/build.xml
@@ -1,80 +1,80 @@
-<!--

-

-Creates two packages:

-

-1. WAR package that can be deployed to application server or servlet container.

-

-2. JAR package which requires JRE only, includes embedded web server.

-

--->

-<project name="vaadin-examples" basedir="." default="package">

-

-	<target name="init">

-		<echo message="Creating two packages:" />

-		<echo message="1. WAR package that can be deployed to application server or servlet container." />

-		<echo message="2. JAR package which requires JRE only, includes embedded web server." />

-		<property name="server.main.class" value="com.vaadin.demo.DesktopServer" />

-		<property name="webserver.jar" value="WebServer/winstone-0.9.9.jar" />

-		<property file="build.properties" />

-		<mkdir dir="build" />

-	</target>

-

-	<target name="clean">

-		<delete dir="build" />

-	</target>

-

-	<!-- Compiles your Vaadin application -->

-	<target name="compile" depends="init">

-		<echo message="Compiling Vaadin application sources." />

-		<path id="compile.class.path">

-			<fileset dir="WebContent">

-				<include name="WEB-INF/lib/*.jar" />

-			</fileset>

-			<fileset dir="WebServer">

-				<include name="*.jar" />

-			</fileset>

-		</path>

-

-		<javac srcdir="WebContent/src" destdir="WebContent/WEB-INF/classes" classpathref="compile.class.path">

-		</javac>

-		<javac srcdir="WebServer/src" destdir="WebServer/classes" classpathref="compile.class.path">

-		</javac>

-	</target>

-

-	<!-- Creates Vaadin WAR package (requires Application Server / Servlet Container)-->

-	<target name="war-package" depends="compile">

-		<echo message="Creating WAR package." />

-		<war warfile="build/${ant.project.name}.war" webxml="WebContent/WEB-INF/web.xml">

-			<fileset dir="WebContent">

-				<include name="**/*" />

-				<exclude name="WEB-INF/web.xml" />

-			</fileset>

-		</war>

-	</target>

-

-	<!-- Creates Vaadin JAR package that contains embedded WebServer -->

-	<target name="jar-package" depends="war-package">

-		<echo message="Creating JAR package." />

-		<copy tofile="build/WebServer-temp/embedded.war" file="build/${ant.project.name}.war" />

-		<unjar src="${webserver.jar}" dest="build/WebServer-temp" />

-		<manifest file="build/WebServer-temp/META-INF/MANIFEST.MF">

-			<attribute name="Main-Class" value="${server.main.class}" />

-		</manifest>

-		<copy todir="build/WebServer-temp">

-			<fileset dir="WebServer/classes">

-				<include name="**/*" />

-			</fileset>

-		</copy>

-	</target>

-

-	<!-- Creates both Vaadin WAR and JAR packages -->

-	<target name="package" depends="jar-package">

-		<jar destfile="build/${ant.project.name}.jar" basedir="build/WebServer-temp" manifest="build/WebServer-temp/META-INF/MANIFEST.MF" />

-		<echo message="Created WAR-file to build/${ant.project.name}.war." />

-		<echo message="Deploy this file to your application server or servlet container." />

-		<echo message=" " />

-		<echo message="Created JAR-file to build/${ant.project.name}.jar" />

-		<echo message="Run your application using command like: java -jar build/${ant.project.name}.jar" />

-	</target>

-

-</project>

+<!--
+
+Creates two packages:
+
+1. WAR package that can be deployed to application server or servlet container.
+
+2. JAR package which requires JRE only, includes embedded web server.
+
+-->
+<project name="vaadin-examples" basedir="." default="package">
+
+	<target name="init">
+		<echo message="Creating two packages:" />
+		<echo message="1. WAR package that can be deployed to application server or servlet container." />
+		<echo message="2. JAR package which requires JRE only, includes embedded web server." />
+		<property name="server.main.class" value="com.vaadin.demo.DesktopServer" />
+		<property name="webserver.jar" value="WebServer/winstone-0.9.9.jar" />
+		<property file="build.properties" />
+		<mkdir dir="build" />
+	</target>
+
+	<target name="clean">
+		<delete dir="build" />
+	</target>
+
+	<!-- Compiles your Vaadin application -->
+	<target name="compile" depends="init">
+		<echo message="Compiling Vaadin application sources." />
+		<path id="compile.class.path">
+			<fileset dir="WebContent">
+				<include name="WEB-INF/lib/*.jar" />
+			</fileset>
+			<fileset dir="WebServer">
+				<include name="*.jar" />
+			</fileset>
+		</path>
+
+		<javac srcdir="WebContent/src" destdir="WebContent/WEB-INF/classes" classpathref="compile.class.path">
+		</javac>
+		<javac srcdir="WebServer/src" destdir="WebServer/classes" classpathref="compile.class.path">
+		</javac>
+	</target>
+
+	<!-- Creates Vaadin WAR package (requires Application Server / Servlet Container)-->
+	<target name="war-package" depends="compile">
+		<echo message="Creating WAR package." />
+		<war warfile="build/${ant.project.name}.war" webxml="WebContent/WEB-INF/web.xml">
+			<fileset dir="WebContent">
+				<include name="**/*" />
+				<exclude name="WEB-INF/web.xml" />
+			</fileset>
+		</war>
+	</target>
+
+	<!-- Creates Vaadin JAR package that contains embedded WebServer -->
+	<target name="jar-package" depends="war-package">
+		<echo message="Creating JAR package." />
+		<copy tofile="build/WebServer-temp/embedded.war" file="build/${ant.project.name}.war" />
+		<unjar src="${webserver.jar}" dest="build/WebServer-temp" />
+		<manifest file="build/WebServer-temp/META-INF/MANIFEST.MF">
+			<attribute name="Main-Class" value="${server.main.class}" />
+		</manifest>
+		<copy todir="build/WebServer-temp">
+			<fileset dir="WebServer/classes">
+				<include name="**/*" />
+			</fileset>
+		</copy>
+	</target>
+
+	<!-- Creates both Vaadin WAR and JAR packages -->
+	<target name="package" depends="jar-package">
+		<jar destfile="build/${ant.project.name}.jar" basedir="build/WebServer-temp" manifest="build/WebServer-temp/META-INF/MANIFEST.MF" />
+		<echo message="Created WAR-file to build/${ant.project.name}.war." />
+		<echo message="Deploy this file to your application server or servlet container." />
+		<echo message=" " />
+		<echo message="Created JAR-file to build/${ant.project.name}.jar" />
+		<echo message="Run your application using command like: java -jar build/${ant.project.name}.jar" />
+	</target>
+
+</project>
diff --git a/tests/testbench/com/vaadin/tests/components/ErrorMessages.html b/tests/testbench/com/vaadin/tests/components/ErrorMessages.html
index a33cb484f9..5379ff59e0 100644
--- a/tests/testbench/com/vaadin/tests/components/ErrorMessages.html
+++ b/tests/testbench/com/vaadin/tests/components/ErrorMessages.html
@@ -1,72 +1,72 @@
-<?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://artur-laptop.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.ErrorMessages</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>

+<?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://artur-laptop.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.ErrorMessages</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>
diff --git a/tests/testbench/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html b/tests/testbench/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html
index e1fbf29b37..bb74775912 100644
--- a/tests/testbench/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html
+++ b/tests/testbench/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html
@@ -1,37 +1,37 @@
-<?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>

+<?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>
diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.html b/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.html
index f4bebcf859..dacd5c5009 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.html
+++ b/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.html
@@ -1,87 +1,87 @@
-<?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>

+<?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>
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.html b/tests/testbench/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.html
index e61f227939..cad194d37a 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.html
+++ b/tests/testbench/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.html
@@ -1,209 +1,209 @@
-<?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://artur-laptop.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.abstractfield.ShortcutAddAndRemove?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/domChild[0]/domChild[1]</td>

-	<td>316,58</td>

-</tr>

-<!--Enter on background - should cause event-->

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::</td>

-	<td>enter</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>1. Log button was clicked</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>

-	<td>102,51</td>

-</tr>

-<!--Enter in textfield - should cause event-->

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>

-	<td>enter</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>2. Log button was clicked</td>

-</tr>

-<!--Remove shortcut-->

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>

-	<td>110,62</td>

-</tr>

-<!--Enter in field - should not cause event-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>

-	<td>97,26</td>

-</tr>

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>

-	<td>up</td>

-</tr>

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>

-	<td>down</td>

-</tr>

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>

-	<td>down</td>

-</tr>

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>

-	<td>row1</td>

-</tr>

-<tr>

-	<td>keyPress</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>

-	<td>13</td>

-</tr>

-<tr>

-	<td>keyPress</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>

-	<td>r</td>

-</tr>

-<tr>

-	<td>keyPress</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>

-	<td>o</td>

-</tr>

-<tr>

-	<td>keyPress</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>

-	<td>w</td>

-</tr>

-<tr>

-	<td>keyPress</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>

-	<td>2</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>2. Log button was clicked</td>

-</tr>

-<!-- Commented out because TestBench does not enter the text correctly using keyPress in any browser except Firefox -->

-<!-- <tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>

-	<td>row1<br />row2</td>

-</tr>-->

-<!--Add shortcut again-->

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VButton[0]/domChild[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>

-	<td>85,46</td>

-</tr>

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>

-	<td>enter</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>3. Log button was clicked</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[2]/domChild[0]</td>

-	<td>625,2</td>

-</tr>

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::</td>

-	<td>enter</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>4. Log button was clicked</td>

-</tr>

-<!--Remove shortcut once more-->

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[2]</td>

-	<td>631,52</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[2]</td>

-	<td>597,57</td>

-</tr>

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::</td>

-	<td>enter</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>4. Log button was clicked</td>

-</tr>

-

-</tbody></table>

-</body>

-</html>

+<?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://artur-laptop.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.abstractfield.ShortcutAddAndRemove?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/domChild[0]/domChild[1]</td>
+	<td>316,58</td>
+</tr>
+<!--Enter on background - should cause event-->
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::</td>
+	<td>enter</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>1. Log button was clicked</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>
+	<td>102,51</td>
+</tr>
+<!--Enter in textfield - should cause event-->
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>
+	<td>enter</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>2. Log button was clicked</td>
+</tr>
+<!--Remove shortcut-->
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>
+	<td>110,62</td>
+</tr>
+<!--Enter in field - should not cause event-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>
+	<td>97,26</td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>
+	<td>up</td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>
+	<td>down</td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>
+	<td>down</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>
+	<td>row1</td>
+</tr>
+<tr>
+	<td>keyPress</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>
+	<td>13</td>
+</tr>
+<tr>
+	<td>keyPress</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>
+	<td>r</td>
+</tr>
+<tr>
+	<td>keyPress</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>
+	<td>o</td>
+</tr>
+<tr>
+	<td>keyPress</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>
+	<td>w</td>
+</tr>
+<tr>
+	<td>keyPress</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>
+	<td>2</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>2. Log button was clicked</td>
+</tr>
+<!-- Commented out because TestBench does not enter the text correctly using keyPress in any browser except Firefox -->
+<!-- <tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>
+	<td>row1<br />row2</td>
+</tr>-->
+<!--Add shortcut again-->
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>
+	<td>85,46</td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextArea[0]</td>
+	<td>enter</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>3. Log button was clicked</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[2]/domChild[0]</td>
+	<td>625,2</td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::</td>
+	<td>enter</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>4. Log button was clicked</td>
+</tr>
+<!--Remove shortcut once more-->
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[2]</td>
+	<td>631,52</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[2]</td>
+	<td>597,57</td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::</td>
+	<td>enter</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsabstractfieldShortcutAddAndRemove::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>4. Log button was clicked</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/caption/EmptyCaptions.html b/tests/testbench/com/vaadin/tests/components/caption/EmptyCaptions.html
index dc98bbacbb..f1ede9a04b 100644
--- a/tests/testbench/com/vaadin/tests/components/caption/EmptyCaptions.html
+++ b/tests/testbench/com/vaadin/tests/components/caption/EmptyCaptions.html
@@ -1,32 +1,32 @@
-<?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>

+<?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>
diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes.html b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes.html
index 40596a49fd..601be4e1cb 100644
--- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes.html
+++ b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes.html
@@ -1,156 +1,156 @@
-<?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>

+<?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>
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.html b/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.html
index 2c2dc1bd42..61ff29d1c5 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.html
@@ -1,524 +1,524 @@
-<?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://artur-laptop.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.datefield.CustomDateFormats?restartApplication</td>

-	<td></td>

-</tr>

-<!--fr_FR-->

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyyy/domChild[0]</td>

-	<td>1 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MM yyyy/domChild[0]</td>

-	<td>1 02 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[0]</td>

-	<td>1 févr. 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[0]</td>

-	<td>1 février 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sdd M yyyy/domChild[0]</td>

-	<td>01 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sddd M yyyy/domChild[0]</td>

-	<td>001 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M y/domChild[0]</td>

-	<td>1 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yy/domChild[0]</td>

-	<td>1 2 10</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyy/domChild[0]</td>

-	<td>1 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyyy-/domChild[0]</td>

-	<td>1 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy-/domChild[0]</td>

-	<td>1 février 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy-/domChild[0]</td>

-	<td>1 févr. 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_SddXMMXyy/domChild[0]</td>

-	<td>01/02/10</td>

-</tr>

-<!--Test parsing-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[0]</td>

-	<td>109,12</td>

-</tr>

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[0]</td>

-	<td>26 sept. 2010</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[0]</td>

-	<td>15,8</td>

-</tr>

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[0]</td>

-	<td>26 septembre 2010</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[1]</td>

-	<td>10,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]</td>

-	<td>10,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[1]</td>

-	<td>9,12</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]</td>

-	<td>9,12</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[0]</td>

-	<td>26 sept. 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[0]</td>

-	<td>26 septembre 2010</td>

-</tr>

-<!--Parsing for fi_FI-->

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VNativeSelect[0]/domChild[0]</td>

-	<td>label=fi_FI</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[0]</td>

-	<td>109,12</td>

-</tr>

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[0]</td>

-	<td>10 maalis 1999</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[0]</td>

-	<td>15,8</td>

-</tr>

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[0]</td>

-	<td>26 syyskuu 1980</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[11]/VLabel[0]</td>

-	<td>10 maalis 1999</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[15]/VLabel[0]</td>

-	<td>26 syyskuu 1980</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[1]</td>

-	<td>10,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[1]</td>

-	<td>10,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[1]</td>

-	<td>9,12</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[1]</td>

-	<td>9,12</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[0]</td>

-	<td>10 maalis 1999</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[0]</td>

-	<td>26 syyskuu 1980</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd. MMMM'ta 'yyyy/domChild[0]</td>

-	<td>124,13</td>

-</tr>

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd. MMMM'ta 'yyyy/domChild[0]</td>

-	<td>10. tammikuuta 2011</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[43]/VLabel[0]</td>

-	<td>10. tammikuuta 2011</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd. MMMM'ta 'yyyy/domChild[1]</td>

-	<td>5,10</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>

-	<td>tammikuu 2011</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]</td>

-	<td>5,10</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd. MMMM'ta 'yyyy/domChild[0]</td>

-	<td>10. tammikuuta 2011</td>

-</tr>

-<!--zh-->

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VNativeSelect[0]/domChild[0]</td>

-	<td>label=zh</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyyy/domChild[0]</td>

-	<td>1 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MM yyyy/domChild[0]</td>

-	<td>1 02 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[0]</td>

-	<td>1 二月 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[0]</td>

-	<td>1 二月 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sdd M yyyy/domChild[0]</td>

-	<td>01 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sddd M yyyy/domChild[0]</td>

-	<td>001 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M y/domChild[0]</td>

-	<td>1 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yy/domChild[0]</td>

-	<td>1 2 10</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyy/domChild[0]</td>

-	<td>1 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyyy-/domChild[0]</td>

-	<td>1 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Syyyy'年'M'月'd'日'/domChild[0]</td>

-	<td>2010年2月1日</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Syyyy-M-d/domChild[0]</td>

-	<td>2010-2-1</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Syy-M-d/domChild[0]</td>

-	<td>10-2-1</td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VNativeSelect[0]/domChild[0]</td>

-	<td>label=en_US</td>

-</tr>

-<!--en_US-->

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyyy/domChild[0]</td>

-	<td>1 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MM yyyy/domChild[0]</td>

-	<td>1 02 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[0]</td>

-	<td>1 Feb 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[0]</td>

-	<td>1 February 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sdd M yyyy/domChild[0]</td>

-	<td>01 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sddd M yyyy/domChild[0]</td>

-	<td>001 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M y/domChild[0]</td>

-	<td>1 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yy/domChild[0]</td>

-	<td>1 2 10</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyy/domChild[0]</td>

-	<td>1 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyyy-/domChild[0]</td>

-	<td>1 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_SMMMM d, yyyy/domChild[0]</td>

-	<td>February 1, 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_SMMM d, yyyy/domChild[0]</td>

-	<td>Feb 1, 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_SMXdXyy/domChild[0]</td>

-	<td>2/1/10</td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VNativeSelect[0]/domChild[0]</td>

-	<td>label=en_GB</td>

-</tr>

-<!--en_GB-->

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyyy/domChild[0]</td>

-	<td>1 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MM yyyy/domChild[0]</td>

-	<td>1 02 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[0]</td>

-	<td>1 Feb 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[0]</td>

-	<td>1 February 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sdd M yyyy/domChild[0]</td>

-	<td>01 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sddd M yyyy/domChild[0]</td>

-	<td>001 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M y/domChild[0]</td>

-	<td>1 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yy/domChild[0]</td>

-	<td>1 2 10</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyy/domChild[0]</td>

-	<td>1 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyyy-/domChild[0]</td>

-	<td>1 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sdd MMMM yyyy/domChild[0]</td>

-	<td>01 February 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sdd-MMM-yyyy/domChild[0]</td>

-	<td>01-Feb-2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_SddXMMXyy/domChild[0]</td>

-	<td>01/02/10</td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VNativeSelect[0]/domChild[0]</td>

-	<td>label=fi_FI</td>

-</tr>

-<!--fi_FI-->

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyyy/domChild[0]</td>

-	<td>1 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MM yyyy/domChild[0]</td>

-	<td>1 02 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[0]</td>

-	<td>1 helmi 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[0]</td>

-	<td>1 helmikuu 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sdd M yyyy/domChild[0]</td>

-	<td>01 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sddd M yyyy/domChild[0]</td>

-	<td>001 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M y/domChild[0]</td>

-	<td>1 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yy/domChild[0]</td>

-	<td>1 2 10</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyy/domChild[0]</td>

-	<td>1 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyyy-/domChild[0]</td>

-	<td>1 2 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd. MMMM'ta 'yyyy/domChild[0]</td>

-	<td>1. helmikuuta 2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd.M.yyyy/domChild[0]</td>

-	<td>1.2.2010</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd.M.yyyy-/domChild[0]</td>

-	<td>1.2.2010</td>

-</tr>

-<!---->

-</tbody></table>

-</body>

-</html>

+<?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://artur-laptop.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.datefield.CustomDateFormats?restartApplication</td>
+	<td></td>
+</tr>
+<!--fr_FR-->
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyyy/domChild[0]</td>
+	<td>1 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MM yyyy/domChild[0]</td>
+	<td>1 02 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[0]</td>
+	<td>1 févr. 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[0]</td>
+	<td>1 février 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sdd M yyyy/domChild[0]</td>
+	<td>01 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sddd M yyyy/domChild[0]</td>
+	<td>001 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M y/domChild[0]</td>
+	<td>1 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yy/domChild[0]</td>
+	<td>1 2 10</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyy/domChild[0]</td>
+	<td>1 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyyy-/domChild[0]</td>
+	<td>1 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy-/domChild[0]</td>
+	<td>1 février 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy-/domChild[0]</td>
+	<td>1 févr. 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_SddXMMXyy/domChild[0]</td>
+	<td>01/02/10</td>
+</tr>
+<!--Test parsing-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[0]</td>
+	<td>109,12</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[0]</td>
+	<td>26 sept. 2010</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[0]</td>
+	<td>15,8</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[0]</td>
+	<td>26 septembre 2010</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[1]</td>
+	<td>10,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]</td>
+	<td>10,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[1]</td>
+	<td>9,12</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]</td>
+	<td>9,12</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[0]</td>
+	<td>26 sept. 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[0]</td>
+	<td>26 septembre 2010</td>
+</tr>
+<!--Parsing for fi_FI-->
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VNativeSelect[0]/domChild[0]</td>
+	<td>label=fi_FI</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[0]</td>
+	<td>109,12</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[0]</td>
+	<td>10 maalis 1999</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[0]</td>
+	<td>15,8</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[0]</td>
+	<td>26 syyskuu 1980</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[11]/VLabel[0]</td>
+	<td>10 maalis 1999</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[15]/VLabel[0]</td>
+	<td>26 syyskuu 1980</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[1]</td>
+	<td>10,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[1]</td>
+	<td>10,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[1]</td>
+	<td>9,12</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[1]</td>
+	<td>9,12</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[0]</td>
+	<td>10 maalis 1999</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[0]</td>
+	<td>26 syyskuu 1980</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd. MMMM'ta 'yyyy/domChild[0]</td>
+	<td>124,13</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd. MMMM'ta 'yyyy/domChild[0]</td>
+	<td>10. tammikuuta 2011</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[43]/VLabel[0]</td>
+	<td>10. tammikuuta 2011</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd. MMMM'ta 'yyyy/domChild[1]</td>
+	<td>5,10</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>
+	<td>tammikuu 2011</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]</td>
+	<td>5,10</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd. MMMM'ta 'yyyy/domChild[0]</td>
+	<td>10. tammikuuta 2011</td>
+</tr>
+<!--zh-->
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VNativeSelect[0]/domChild[0]</td>
+	<td>label=zh</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyyy/domChild[0]</td>
+	<td>1 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MM yyyy/domChild[0]</td>
+	<td>1 02 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[0]</td>
+	<td>1 二月 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[0]</td>
+	<td>1 二月 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sdd M yyyy/domChild[0]</td>
+	<td>01 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sddd M yyyy/domChild[0]</td>
+	<td>001 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M y/domChild[0]</td>
+	<td>1 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yy/domChild[0]</td>
+	<td>1 2 10</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyy/domChild[0]</td>
+	<td>1 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyyy-/domChild[0]</td>
+	<td>1 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Syyyy'年'M'月'd'日'/domChild[0]</td>
+	<td>2010年2月1日</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Syyyy-M-d/domChild[0]</td>
+	<td>2010-2-1</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Syy-M-d/domChild[0]</td>
+	<td>10-2-1</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VNativeSelect[0]/domChild[0]</td>
+	<td>label=en_US</td>
+</tr>
+<!--en_US-->
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyyy/domChild[0]</td>
+	<td>1 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MM yyyy/domChild[0]</td>
+	<td>1 02 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[0]</td>
+	<td>1 Feb 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[0]</td>
+	<td>1 February 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sdd M yyyy/domChild[0]</td>
+	<td>01 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sddd M yyyy/domChild[0]</td>
+	<td>001 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M y/domChild[0]</td>
+	<td>1 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yy/domChild[0]</td>
+	<td>1 2 10</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyy/domChild[0]</td>
+	<td>1 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyyy-/domChild[0]</td>
+	<td>1 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_SMMMM d, yyyy/domChild[0]</td>
+	<td>February 1, 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_SMMM d, yyyy/domChild[0]</td>
+	<td>Feb 1, 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_SMXdXyy/domChild[0]</td>
+	<td>2/1/10</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VNativeSelect[0]/domChild[0]</td>
+	<td>label=en_GB</td>
+</tr>
+<!--en_GB-->
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyyy/domChild[0]</td>
+	<td>1 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MM yyyy/domChild[0]</td>
+	<td>1 02 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[0]</td>
+	<td>1 Feb 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[0]</td>
+	<td>1 February 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sdd M yyyy/domChild[0]</td>
+	<td>01 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sddd M yyyy/domChild[0]</td>
+	<td>001 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M y/domChild[0]</td>
+	<td>1 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yy/domChild[0]</td>
+	<td>1 2 10</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyy/domChild[0]</td>
+	<td>1 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyyy-/domChild[0]</td>
+	<td>1 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sdd MMMM yyyy/domChild[0]</td>
+	<td>01 February 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sdd-MMM-yyyy/domChild[0]</td>
+	<td>01-Feb-2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_SddXMMXyy/domChild[0]</td>
+	<td>01/02/10</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VNativeSelect[0]/domChild[0]</td>
+	<td>label=fi_FI</td>
+</tr>
+<!--fi_FI-->
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyyy/domChild[0]</td>
+	<td>1 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MM yyyy/domChild[0]</td>
+	<td>1 02 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMM yyyy/domChild[0]</td>
+	<td>1 helmi 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd MMMM yyyy/domChild[0]</td>
+	<td>1 helmikuu 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sdd M yyyy/domChild[0]</td>
+	<td>01 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sddd M yyyy/domChild[0]</td>
+	<td>001 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M y/domChild[0]</td>
+	<td>1 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yy/domChild[0]</td>
+	<td>1 2 10</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyy/domChild[0]</td>
+	<td>1 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd M yyyy-/domChild[0]</td>
+	<td>1 2 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd. MMMM'ta 'yyyy/domChild[0]</td>
+	<td>1. helmikuuta 2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd.M.yyyy/domChild[0]</td>
+	<td>1.2.2010</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Sd.M.yyyy-/domChild[0]</td>
+	<td>1.2.2010</td>
+</tr>
+<!---->
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.html b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.html
index 6bc285ee72..f7541f0270 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.html
@@ -1,157 +1,157 @@
-<?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.datefield.DateFieldPopupOffScreen</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldPopupOffScreen::/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[2]/VPopupCalendar[0]/domChild[1]</td>

-	<td>10,10</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>300</td>

-	<td></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=runcomvaadintestscomponentsdatefieldDateFieldPopupOffScreen::/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[3]/VPopupCalendar[0]/domChild[1]</td>

-	<td>10,12</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>300</td>

-	<td></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=runcomvaadintestscomponentsdatefieldDateFieldPopupOffScreen::/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[4]/VPopupCalendar[0]/domChild[1]</td>

-	<td>8,10</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>300</td>

-	<td></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=runcomvaadintestscomponentsdatefieldDateFieldPopupOffScreen::/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1]</td>

-	<td>7,13</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>300</td>

-	<td></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=runcomvaadintestscomponentsdatefieldDateFieldPopupOffScreen::/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[0]/VPopupCalendar[0]/domChild[1]</td>

-	<td>11,14</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>300</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>

+<?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.datefield.DateFieldPopupOffScreen</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldPopupOffScreen::/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[2]/VPopupCalendar[0]/domChild[1]</td>
+	<td>10,10</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>300</td>
+	<td></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=runcomvaadintestscomponentsdatefieldDateFieldPopupOffScreen::/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[3]/VPopupCalendar[0]/domChild[1]</td>
+	<td>10,12</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>300</td>
+	<td></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=runcomvaadintestscomponentsdatefieldDateFieldPopupOffScreen::/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[4]/VPopupCalendar[0]/domChild[1]</td>
+	<td>8,10</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>300</td>
+	<td></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=runcomvaadintestscomponentsdatefieldDateFieldPopupOffScreen::/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1]</td>
+	<td>7,13</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>300</td>
+	<td></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=runcomvaadintestscomponentsdatefieldDateFieldPopupOffScreen::/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[0]/VPopupCalendar[0]/domChild[1]</td>
+	<td>11,14</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>300</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>
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html b/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html
index 58809a1836..3cdf70d5ab 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html
@@ -1,191 +1,191 @@
-<?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.datefield.InlineDateFieldTest?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_Smenu#item0</td>

-	<td>29,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[0]/VMenuBar[0]#item4</td>

-	<td>51,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[1]/VMenuBar[0]#item4</td>

-	<td>71,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[2]/VMenuBar[0]#item2</td>

-	<td>65,13</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_Smenu#item0</td>

-	<td>31,2</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[0]/VMenuBar[0]#item4</td>

-	<td>33,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>79,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[2]/VMenuBar[0]#item6</td>

-	<td>29,2</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>

-	<td>December 2010</td>

-</tr>

-<tr>

-	<td>assertCSSClass</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[3]/domChild[1]/domChild[0]</td>

-	<td>v-datefield-calendarpanel-day-selected</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[0]</td>

-	<td>12</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[2]</td>

-	<td>00</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[4]</td>

-	<td>00</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[6]</td>

-	<td>000</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[8]</td>

-	<td>PM</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_Smenu#item0</td>

-	<td>39,13</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>37,1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>41,4</td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[8]</td>

-	<td>label=AM</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>3. ValueChangeEvent, new value: Dec 12, 2010 00:00:00.000</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_Smenu#item0</td>

-	<td>31,19</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[0]/VMenuBar[0]#item4</td>

-	<td>55,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[1]/VMenuBar[0]#item4</td>

-	<td>57,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[2]/VMenuBar[0]#item3</td>

-	<td>49,8</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>

-	<td>January 2000</td>

-</tr>

-<tr>

-	<td>assertCSSClass</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[2]/domChild[1]/domChild[0]</td>

-	<td>v-datefield-calendarpanel-day-selected</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[0]</td>

-	<td>03</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[2]</td>

-	<td>04</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[4]</td>

-	<td>05</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[6]</td>

-	<td>006</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[8]</td>

-	<td>AM</td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[6]</td>

-	<td>label=002</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>6. ValueChangeEvent, new value: Jan 2, 2000 03:04:05.002</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[6]</td>

-	<td>002</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.datefield.InlineDateFieldTest?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_Smenu#item0</td>
+	<td>29,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[0]/VMenuBar[0]#item4</td>
+	<td>51,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[1]/VMenuBar[0]#item4</td>
+	<td>71,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[2]/VMenuBar[0]#item2</td>
+	<td>65,13</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_Smenu#item0</td>
+	<td>31,2</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[0]/VMenuBar[0]#item4</td>
+	<td>33,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>79,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[2]/VMenuBar[0]#item6</td>
+	<td>29,2</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>
+	<td>December 2010</td>
+</tr>
+<tr>
+	<td>assertCSSClass</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[3]/domChild[1]/domChild[0]</td>
+	<td>v-datefield-calendarpanel-day-selected</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[0]</td>
+	<td>12</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[2]</td>
+	<td>00</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[4]</td>
+	<td>00</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[6]</td>
+	<td>000</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[8]</td>
+	<td>PM</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_Smenu#item0</td>
+	<td>39,13</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>37,1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>41,4</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[8]</td>
+	<td>label=AM</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>3. ValueChangeEvent, new value: Dec 12, 2010 00:00:00.000</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_Smenu#item0</td>
+	<td>31,19</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[0]/VMenuBar[0]#item4</td>
+	<td>55,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[1]/VMenuBar[0]#item4</td>
+	<td>57,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[2]/VMenuBar[0]#item3</td>
+	<td>49,8</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>
+	<td>January 2000</td>
+</tr>
+<tr>
+	<td>assertCSSClass</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[2]/domChild[1]/domChild[0]</td>
+	<td>v-datefield-calendarpanel-day-selected</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[0]</td>
+	<td>03</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[2]</td>
+	<td>04</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[4]</td>
+	<td>05</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[6]</td>
+	<td>006</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[8]</td>
+	<td>AM</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[6]</td>
+	<td>label=002</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>6. ValueChangeEvent, new value: Jan 2, 2000 03:04:05.002</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[6]</td>
+	<td>002</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.html b/tests/testbench/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.html
index fe95c2476c..9852b30ae7 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.html
@@ -1,27 +1,27 @@
-<?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.datefield.NarrowPopupDateFieldInTable?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td></td>

-</tr>

-

-</tbody></table>

-</body>

-</html>

+<?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.datefield.NarrowPopupDateFieldInTable?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldDisabledReadonly.html b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldDisabledReadonly.html
index fe7edad28c..fcd2ddf573 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldDisabledReadonly.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldDisabledReadonly.html
@@ -1,158 +1,158 @@
-<?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.datefield.PopupDateFields?restartApplication</td>

-	<td></td>

-</tr>

-<!--Ensure no popups appear when DateField is disabled-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Scheckboxaction-Enabled/domChild[0]</td>

-	<td>6,8</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>disabled</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide/domChild[1]</td>

-	<td>10,15</td>

-</tr>

-<tr>

-	<td>assertElementNotPresent</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[4]</td>

-	<td>759,5</td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>

-	<td>label=Month</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide/domChild[1]</td>

-	<td>15,11</td>

-</tr>

-<tr>

-	<td>assertElementNotPresent</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[2]/domChild[0]</td>

-	<td>566,9</td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>

-	<td>label=Day</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide/domChild[1]</td>

-	<td>3,10</td>

-</tr>

-<tr>

-	<td>assertElementNotPresent</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertElementNotPresent</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[4]</td>

-	<td>699,43</td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>

-	<td>label=Hour</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide/domChild[1]</td>

-	<td>15,17</td>

-</tr>

-<tr>

-	<td>assertElementNotPresent</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertElementNotPresent</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/VCalendarPanel$VTime[0]/ListBox[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[3]</td>

-	<td>630,30</td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>

-	<td>label=Min</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide/domChild[1]</td>

-	<td>8,11</td>

-</tr>

-<tr>

-	<td>assertElementNotPresent</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>

-	<td></td>

-</tr>

-<!--Ensure no popups appear when DateField is enabled but readonly-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Scheckboxaction-Enabled/domChild[0]</td>

-	<td>3,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Scheckboxaction-Readonly/domChild[0]</td>

-	<td>5,8</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>readonly</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Scheckboxaction-Enabled/domChild[0]</td>

-	<td>3,8</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>readonly-disabled</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.datefield.PopupDateFields?restartApplication</td>
+	<td></td>
+</tr>
+<!--Ensure no popups appear when DateField is disabled-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Scheckboxaction-Enabled/domChild[0]</td>
+	<td>6,8</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>disabled</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide/domChild[1]</td>
+	<td>10,15</td>
+</tr>
+<tr>
+	<td>assertElementNotPresent</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[4]</td>
+	<td>759,5</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>
+	<td>label=Month</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide/domChild[1]</td>
+	<td>15,11</td>
+</tr>
+<tr>
+	<td>assertElementNotPresent</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[2]/domChild[0]</td>
+	<td>566,9</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>
+	<td>label=Day</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide/domChild[1]</td>
+	<td>3,10</td>
+</tr>
+<tr>
+	<td>assertElementNotPresent</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertElementNotPresent</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[4]</td>
+	<td>699,43</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>
+	<td>label=Hour</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide/domChild[1]</td>
+	<td>15,17</td>
+</tr>
+<tr>
+	<td>assertElementNotPresent</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertElementNotPresent</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/VCalendarPanel$VTime[0]/ListBox[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[3]</td>
+	<td>630,30</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>
+	<td>label=Min</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide/domChild[1]</td>
+	<td>8,11</td>
+</tr>
+<tr>
+	<td>assertElementNotPresent</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>
+	<td></td>
+</tr>
+<!--Ensure no popups appear when DateField is enabled but readonly-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Scheckboxaction-Enabled/domChild[0]</td>
+	<td>3,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Scheckboxaction-Readonly/domChild[0]</td>
+	<td>5,8</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>readonly</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Scheckboxaction-Enabled/domChild[0]</td>
+	<td>3,8</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>readonly-disabled</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldMonth.html b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldMonth.html
index 7e27d44dbb..440de7c952 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldMonth.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldMonth.html
@@ -1,51 +1,51 @@
-<?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.datefield.CustomDateFormats?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VNativeSelect[0]/domChild[0]</td>

-	<td>label=en_US</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[2]/VPopupCalendar[0]/domChild[1]</td>

-	<td>10,14</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[1]</td>

-	<td>17,11</td>

-</tr>

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[2]/VPopupCalendar[0]/domChild[0]</td>

-	<td>1 1 2010</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[2]/VPopupCalendar[0]/domChild[1]</td>

-	<td>14,13</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>

-	<td>January 2010</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.datefield.CustomDateFormats?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VNativeSelect[0]/domChild[0]</td>
+	<td>label=en_US</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[2]/VPopupCalendar[0]/domChild[1]</td>
+	<td>10,14</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[1]</td>
+	<td>17,11</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[2]/VPopupCalendar[0]/domChild[0]</td>
+	<td>1 1 2010</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[2]/VPopupCalendar[0]/domChild[1]</td>
+	<td>14,13</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>
+	<td>January 2010</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html
index 6600adafd2..6dae483332 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html
@@ -1,1093 +1,1093 @@
-<?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.datefield.PopupDateFields?restartApplication</td>

-	<td></td>

-</tr>

-<!--Resolution: year-->

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>

-	<td>label=Year</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>enabled-year</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>

-	<td>9,15</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>1970</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>year-popup-us</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>9,15</td>

-</tr>

-<!--Resolution: month-->

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>

-	<td>label=Month</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>enabled-month</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>

-	<td>10,12</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>May 1970</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>month-popup-us</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>10,12</td>

-</tr>

-<!--Resolution: day-->

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>

-	<td>label=Day</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>enabled-day</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>

-	<td>10,12</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>May 1970</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day23</td>

-	<td>23</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>day-popup-us</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>10,12</td>

-</tr>

-<!--Resolution: hour-->

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>

-	<td>label=Hour</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>enabled-hour</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>

-	<td>10,12</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>May 1970</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day23</td>

-	<td>23</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#h</td>

-	<td>02</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#ampm</td>

-	<td>PM</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[1]</td>

-	<td>exact::00</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>hour-popup-us</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>10,12</td>

-</tr>

-<!--Resolution: min-->

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>

-	<td>label=Min</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>enabled-min</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>

-	<td>10,12</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>May 1970</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day23</td>

-	<td>23</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#h</td>

-	<td>02</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#m</td>

-	<td>05</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#ampm</td>

-	<td>PM</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>min-popup-us</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>10,12</td>

-</tr>

-<!--Resolution: sec-->

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>

-	<td>label=Sec</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>enabled-sec</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>

-	<td>10,12</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>May 1970</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day23</td>

-	<td>23</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#h</td>

-	<td>02</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#m</td>

-	<td>05</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#s</td>

-	<td>12</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#ampm</td>

-	<td>PM</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>sec-popup-us</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>10,12</td>

-</tr>

-<!--Resolution: msec-->

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>

-	<td>label=Msec</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>enabled-msec</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>

-	<td>10,12</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>May 1970</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day23</td>

-	<td>23</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#h</td>

-	<td>02</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#m</td>

-	<td>05</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#s</td>

-	<td>12</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#ms</td>

-	<td>313</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#ampm</td>

-	<td>PM</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>msec-popup-us</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>10,12</td>

-</tr>

-<!--Check resolution year functionality-->

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>

-	<td>label=Year</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>

-	<td>11,10</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>1970</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>

-	<td>37,12</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>1971</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>

-	<td>37,12</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>

-	<td>37,12</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>

-	<td>37,12</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>1974</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>37,12</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>1974</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>38,8</td>

-</tr>

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>2010</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1]</td>

-	<td>202,40</td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>100</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>

-	<td>16,11</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>2010</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#prevy</td>

-	<td>37,12</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>2009</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>

-	<td>37,12</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>2010</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>

-	<td>37,12</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>2011</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1]</td>

-	<td>129,26</td>

-</tr>

-<!--Check resolution month functionality-->

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>

-	<td>label=Month</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>5/11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>

-	<td>7,8</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>May 2011</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nextmon</td>

-	<td>37,12</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>June 2011</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>

-	<td>37,12</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>June 2012</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>37,15</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>6/12</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>-54,8</td>

-</tr>

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>1/09</td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>100</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>

-	<td>8,10</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>January 2009</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nextmon</td>

-	<td>37,12</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>February 2009</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1]/domChild[0]</td>

-	<td>174,3</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>2/09</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1]</td>

-	<td>129,26</td>

-</tr>

-<!--Check resolution day functionality-->

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>

-	<td>label=Day</td>

-</tr>

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>5/23/70</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[2]</td>

-	<td>478,1</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>5/23/70</td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>100</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>

-	<td>11,16</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>May 1970</td>

-</tr>

-<tr>

-	<td>assertCSSClass</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day23</td>

-	<td>v-datefield-calendarpanel-day-selected</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nextmon</td>

-	<td>37,12</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>June 1970</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>

-	<td>37,12</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>June 1971</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1]/domChild[0]</td>

-	<td>193,12</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>5/23/70</td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>100</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>

-	<td>12,9</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>May 1970</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nextmon</td>

-	<td>37,12</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>

-	<td>12,15</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day30</td>

-	<td>14,12</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>6/30/71</td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>100</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>

-	<td>5,13</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>June 1971</td>

-</tr>

-<tr>

-	<td>assertCSSClass</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day30</td>

-	<td>v-datefield-calendarpanel-day-selected</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#prevmon</td>

-	<td>15,14</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day31</td>

-	<td>18,8</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>5/31/71</td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>100</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>

-	<td>11,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#prevmon</td>

-	<td>12,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day30</td>

-	<td>13,14</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>4/30/71</td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>100</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>

-	<td>12,13</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>April 1971</td>

-</tr>

-<tr>

-	<td>assertCSSClass</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day30</td>

-	<td>v-datefield-calendarpanel-day-selected</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>

-	<td>8,12</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day1</td>

-	<td>17,9</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>4/1/72</td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>100</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>

-	<td>11,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#prevmon</td>

-	<td>10,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day1</td>

-	<td>15,4</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>3/1/72</td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>100</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>

-	<td>8,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#prevmon</td>

-	<td>10,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day29</td>

-	<td>17,9</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>2/29/72</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>-13,8</td>

-</tr>

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>1/15/02</td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>100</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>

-	<td>11,14</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>January 2002</td>

-</tr>

-<tr>

-	<td>assertCSSClass</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day15</td>

-	<td>v-datefield-calendarpanel-day-selected</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nextmon</td>

-	<td>11,8</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>February 2002</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>

-	<td>10,10</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>February 2003</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1]/domChild[0]</td>

-	<td>185,8</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>

-	<td>1/15/02</td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>100</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>

-	<td>8,7</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>January 2002</td>

-</tr>

-<tr>

-	<td>assertCSSClass</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day15</td>

-	<td>v-datefield-calendarpanel-day-selected</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1]</td>

-	<td>364,32</td>

-</tr>

-<!--Also check finnish locale-->

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-fi_FI-undefined-wide#field</td>

-	<td>23.5.1970</td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>100</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-fi_FI-undefined-wide#popupButton</td>

-	<td>14,11</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>toukokuu 1970</td>

-</tr>

-<tr>

-	<td>assertCSSClass</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day23</td>

-	<td>v-datefield-calendarpanel-day-selected</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nextmon</td>

-	<td>15,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[7]/domChild[0]</td>

-	<td>286,10</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-fi_FI-undefined-wide#field</td>

-	<td></td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>100</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-fi_FI-undefined-wide#popupButton</td>

-	<td>13,13</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nextmon</td>

-	<td>11,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nextmon</td>

-	<td>11,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day17</td>

-	<td>13,9</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-fi_FI-undefined-wide#field</td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-zh_TW-undefined-wide#field</td>

-	<td></td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>100</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-zh_TW-undefined-wide#popupButton</td>

-	<td>9,14</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>

-	<td>五月 1970</td>

-</tr>

-<tr>

-	<td>assertCSSClass</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day23</td>

-	<td>v-datefield-calendarpanel-day-selected</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nextmon</td>

-	<td>8,12</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day2</td>

-	<td>16,9</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-zh_TW-undefined-wide#field</td>

-	<td></td>

-</tr>

-<!--Back to resolution: s-->

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>

-	<td>label=Sec</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-fi_FI-undefined-wide#field</td>

-	<td>17.7.1970 14:05:12</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-fi_FI-undefined-wide#popupButton</td>

-	<td>11,12</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>

-	<td>heinäkuu 1970</td>

-</tr>

-<tr>

-	<td>assertElementPresent</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day17</td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#h</td>

-	<td>14</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#m</td>

-	<td>05</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#s</td>

-	<td>12</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nextmon</td>

-	<td>8,13</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nextmon</td>

-	<td>8,13</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>

-	<td>16,15</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>

-	<td>16,15</td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#h</td>

-	<td>label=03</td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#m</td>

-	<td>label=04</td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#s</td>

-	<td>label=05</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[7]</td>

-	<td>291,3</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-fi_FI-undefined-wide#field</td>

-	<td>17.7.1970 03:04:05</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.datefield.PopupDateFields?restartApplication</td>
+	<td></td>
+</tr>
+<!--Resolution: year-->
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>
+	<td>label=Year</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>enabled-year</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>
+	<td>9,15</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>1970</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>year-popup-us</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>9,15</td>
+</tr>
+<!--Resolution: month-->
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>
+	<td>label=Month</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>enabled-month</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>
+	<td>10,12</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>May 1970</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>month-popup-us</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>10,12</td>
+</tr>
+<!--Resolution: day-->
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>
+	<td>label=Day</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>enabled-day</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>
+	<td>10,12</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>May 1970</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day23</td>
+	<td>23</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>day-popup-us</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>10,12</td>
+</tr>
+<!--Resolution: hour-->
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>
+	<td>label=Hour</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>enabled-hour</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>
+	<td>10,12</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>May 1970</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day23</td>
+	<td>23</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#h</td>
+	<td>02</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#ampm</td>
+	<td>PM</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[1]</td>
+	<td>exact::00</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>hour-popup-us</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>10,12</td>
+</tr>
+<!--Resolution: min-->
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>
+	<td>label=Min</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>enabled-min</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>
+	<td>10,12</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>May 1970</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day23</td>
+	<td>23</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#h</td>
+	<td>02</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#m</td>
+	<td>05</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#ampm</td>
+	<td>PM</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>min-popup-us</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>10,12</td>
+</tr>
+<!--Resolution: sec-->
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>
+	<td>label=Sec</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>enabled-sec</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>
+	<td>10,12</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>May 1970</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day23</td>
+	<td>23</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#h</td>
+	<td>02</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#m</td>
+	<td>05</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#s</td>
+	<td>12</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#ampm</td>
+	<td>PM</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>sec-popup-us</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>10,12</td>
+</tr>
+<!--Resolution: msec-->
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>
+	<td>label=Msec</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>enabled-msec</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>
+	<td>10,12</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>May 1970</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day23</td>
+	<td>23</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#h</td>
+	<td>02</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#m</td>
+	<td>05</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#s</td>
+	<td>12</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#ms</td>
+	<td>313</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#ampm</td>
+	<td>PM</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>msec-popup-us</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>10,12</td>
+</tr>
+<!--Check resolution year functionality-->
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>
+	<td>label=Year</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>
+	<td>11,10</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>1970</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>
+	<td>37,12</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>1971</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>
+	<td>37,12</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>
+	<td>37,12</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>
+	<td>37,12</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>1974</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>37,12</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>1974</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>38,8</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>2010</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1]</td>
+	<td>202,40</td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>100</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>
+	<td>16,11</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>2010</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#prevy</td>
+	<td>37,12</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>2009</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>
+	<td>37,12</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>2010</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>
+	<td>37,12</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>2011</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1]</td>
+	<td>129,26</td>
+</tr>
+<!--Check resolution month functionality-->
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>
+	<td>label=Month</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>5/11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>
+	<td>7,8</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>May 2011</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nextmon</td>
+	<td>37,12</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>June 2011</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>
+	<td>37,12</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>June 2012</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>37,15</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>6/12</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>-54,8</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>1/09</td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>100</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>
+	<td>8,10</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>January 2009</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nextmon</td>
+	<td>37,12</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>February 2009</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1]/domChild[0]</td>
+	<td>174,3</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>2/09</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1]</td>
+	<td>129,26</td>
+</tr>
+<!--Check resolution day functionality-->
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>
+	<td>label=Day</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>5/23/70</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[2]</td>
+	<td>478,1</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>5/23/70</td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>100</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>
+	<td>11,16</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>May 1970</td>
+</tr>
+<tr>
+	<td>assertCSSClass</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day23</td>
+	<td>v-datefield-calendarpanel-day-selected</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nextmon</td>
+	<td>37,12</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>June 1970</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>
+	<td>37,12</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>June 1971</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1]/domChild[0]</td>
+	<td>193,12</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>5/23/70</td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>100</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>
+	<td>12,9</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>May 1970</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nextmon</td>
+	<td>37,12</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>
+	<td>12,15</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day30</td>
+	<td>14,12</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>6/30/71</td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>100</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>
+	<td>5,13</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>June 1971</td>
+</tr>
+<tr>
+	<td>assertCSSClass</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day30</td>
+	<td>v-datefield-calendarpanel-day-selected</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#prevmon</td>
+	<td>15,14</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day31</td>
+	<td>18,8</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>5/31/71</td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>100</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>
+	<td>11,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#prevmon</td>
+	<td>12,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day30</td>
+	<td>13,14</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>4/30/71</td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>100</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>
+	<td>12,13</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>April 1971</td>
+</tr>
+<tr>
+	<td>assertCSSClass</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day30</td>
+	<td>v-datefield-calendarpanel-day-selected</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>
+	<td>8,12</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day1</td>
+	<td>17,9</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>4/1/72</td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>100</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>
+	<td>11,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#prevmon</td>
+	<td>10,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day1</td>
+	<td>15,4</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>3/1/72</td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>100</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>
+	<td>8,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#prevmon</td>
+	<td>10,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day29</td>
+	<td>17,9</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>2/29/72</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>-13,8</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>1/15/02</td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>100</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>
+	<td>11,14</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>January 2002</td>
+</tr>
+<tr>
+	<td>assertCSSClass</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day15</td>
+	<td>v-datefield-calendarpanel-day-selected</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nextmon</td>
+	<td>11,8</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>February 2002</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>
+	<td>10,10</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>February 2003</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1]/domChild[0]</td>
+	<td>185,8</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#field</td>
+	<td>1/15/02</td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>100</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-en_US-undefined-wide#popupButton</td>
+	<td>8,7</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>January 2002</td>
+</tr>
+<tr>
+	<td>assertCSSClass</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day15</td>
+	<td>v-datefield-calendarpanel-day-selected</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1]</td>
+	<td>364,32</td>
+</tr>
+<!--Also check finnish locale-->
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-fi_FI-undefined-wide#field</td>
+	<td>23.5.1970</td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>100</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-fi_FI-undefined-wide#popupButton</td>
+	<td>14,11</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>toukokuu 1970</td>
+</tr>
+<tr>
+	<td>assertCSSClass</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day23</td>
+	<td>v-datefield-calendarpanel-day-selected</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nextmon</td>
+	<td>15,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[7]/domChild[0]</td>
+	<td>286,10</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-fi_FI-undefined-wide#field</td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>100</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-fi_FI-undefined-wide#popupButton</td>
+	<td>13,13</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nextmon</td>
+	<td>11,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nextmon</td>
+	<td>11,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day17</td>
+	<td>13,9</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-fi_FI-undefined-wide#field</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-zh_TW-undefined-wide#field</td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>100</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-zh_TW-undefined-wide#popupButton</td>
+	<td>9,14</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#header</td>
+	<td>五月 1970</td>
+</tr>
+<tr>
+	<td>assertCSSClass</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day23</td>
+	<td>v-datefield-calendarpanel-day-selected</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nextmon</td>
+	<td>8,12</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day2</td>
+	<td>16,9</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-zh_TW-undefined-wide#field</td>
+	<td></td>
+</tr>
+<!--Back to resolution: s-->
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_Sselectaction-Resolution/domChild[0]</td>
+	<td>label=Sec</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-fi_FI-undefined-wide#field</td>
+	<td>17.7.1970 14:05:12</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-fi_FI-undefined-wide#popupButton</td>
+	<td>11,12</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>
+	<td>heinäkuu 1970</td>
+</tr>
+<tr>
+	<td>assertElementPresent</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#day17</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#h</td>
+	<td>14</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#m</td>
+	<td>05</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#s</td>
+	<td>12</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nextmon</td>
+	<td>8,13</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nextmon</td>
+	<td>8,13</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>
+	<td>16,15</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#nexty</td>
+	<td>16,15</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#h</td>
+	<td>label=03</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#m</td>
+	<td>label=04</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]#s</td>
+	<td>label=05</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[7]</td>
+	<td>291,3</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::PID_SLocale-fi_FI-undefined-wide#field</td>
+	<td>17.7.1970 03:04:05</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.html b/tests/testbench/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.html
index df6faa7228..1cd79338e9 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.html
@@ -1,66 +1,66 @@
-<?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.datefield.ShowSelectedDateAfterInvalid?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldShowSelectedDateAfterInvalid::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]/domChild[0]</td>

-	<td>46,8</td>

-</tr>

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldShowSelectedDateAfterInvalid::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]/domChild[0]</td>

-	<td>test</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldShowSelectedDateAfterInvalid::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldShowSelectedDateAfterInvalid::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]/domChild[1]</td>

-	<td>9,13</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldShowSelectedDateAfterInvalid::Root/VOverlay[0]/VCalendarPanel[0]#day7</td>

-	<td>19,5</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldShowSelectedDateAfterInvalid::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]/domChild[0]</td>

-	<td>07/DATE(MM)/DATE(YYYY)</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldShowSelectedDateAfterInvalid::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldShowSelectedDateAfterInvalid::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VLabel[0]</td>

-	<td>Valid!</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsdatefieldShowSelectedDateAfterInvalid::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]/domChild[0]</td>

-	<td>07/DATE(MM)/DATE(YYYY)</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.datefield.ShowSelectedDateAfterInvalid?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldShowSelectedDateAfterInvalid::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]/domChild[0]</td>
+	<td>46,8</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldShowSelectedDateAfterInvalid::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]/domChild[0]</td>
+	<td>test</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldShowSelectedDateAfterInvalid::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldShowSelectedDateAfterInvalid::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]/domChild[1]</td>
+	<td>9,13</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldShowSelectedDateAfterInvalid::Root/VOverlay[0]/VCalendarPanel[0]#day7</td>
+	<td>19,5</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldShowSelectedDateAfterInvalid::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]/domChild[0]</td>
+	<td>07/DATE(MM)/DATE(YYYY)</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldShowSelectedDateAfterInvalid::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldShowSelectedDateAfterInvalid::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VLabel[0]</td>
+	<td>Valid!</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldShowSelectedDateAfterInvalid::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]/domChild[0]</td>
+	<td>07/DATE(MM)/DATE(YYYY)</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortcut.html b/tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortcut.html
index 16c5b1cee4..9680ef7022 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortcut.html
+++ b/tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortcut.html
@@ -1,47 +1,47 @@
-<?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.form.FormWithEnterShortCut?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsformFormWithEnterShortCut::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>

-	<td>70,4</td>

-</tr>

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentsformFormWithEnterShortCut::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>

-	<td>abc</td>

-</tr>

-<tr>

-	<td>focus</td>

-	<td>vaadin=runcomvaadintestscomponentsformFormWithEnterShortCut::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>

-	<td>tab</td>

-</tr>

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsformFormWithEnterShortCut::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]</td>

-	<td>enter</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsformFormWithEnterShortCut::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>1. search: abc</td>

-</tr>

-

-</tbody></table>

-</body>

-</html>

+<?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.form.FormWithEnterShortCut?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsformFormWithEnterShortCut::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
+	<td>70,4</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentsformFormWithEnterShortCut::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
+	<td>abc</td>
+</tr>
+<tr>
+	<td>focus</td>
+	<td>vaadin=runcomvaadintestscomponentsformFormWithEnterShortCut::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td>tab</td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsformFormWithEnterShortCut::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]</td>
+	<td>enter</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsformFormWithEnterShortCut::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>1. search: abc</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/gridlayout/MoveComponentFromGridLayoutToInnerLayout.html b/tests/testbench/com/vaadin/tests/components/gridlayout/MoveComponentFromGridLayoutToInnerLayout.html
index 528e3fb379..ed6d39f63d 100644
--- a/tests/testbench/com/vaadin/tests/components/gridlayout/MoveComponentFromGridLayoutToInnerLayout.html
+++ b/tests/testbench/com/vaadin/tests/components/gridlayout/MoveComponentFromGridLayoutToInnerLayout.html
@@ -1,37 +1,37 @@
-<?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.gridlayout.MoveComponentsFromGridLayoutToInnerLayout?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsgridlayoutMoveComponentsFromGridLayoutToInnerLayout::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsgridlayoutMoveComponentsFromGridLayoutToInnerLayout::/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>

+<?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.gridlayout.MoveComponentsFromGridLayoutToInnerLayout?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsgridlayoutMoveComponentsFromGridLayoutToInnerLayout::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsgridlayoutMoveComponentsFromGridLayoutToInnerLayout::/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>
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/IconsInRootMenuBar.html b/tests/testbench/com/vaadin/tests/components/menubar/IconsInRootMenuBar.html
index 91539ff359..dfb74f9d34 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/IconsInRootMenuBar.html
+++ b/tests/testbench/com/vaadin/tests/components/menubar/IconsInRootMenuBar.html
@@ -1,148 +1,148 @@
-<?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.menubar.MenuBarTest?restartApplication</td>

-	<td></td>

-</tr>

-<!--Hide event log to be able to compare screenshots-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_Smenu#item1</td>

-	<td>30,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>27,3</td>

-</tr>

-<!--No sub menus-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_Smenu#item0</td>

-	<td>32,1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>32,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[1]/VMenuBar[0]#item1</td>

-	<td>45,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>

-	<td>29,4</td>

-</tr>

-<!--50 root items to fill the screen-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_Smenu#item0</td>

-	<td>44,12</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>46,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>5,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[2]/VMenuBar[0]#item12</td>

-	<td>20,7</td>

-</tr>

-<!--Show icons on all items-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_Smenu#item0</td>

-	<td>13,1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>

-	<td>47,3</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>26,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[2]/VMenuBar[0]#item1</td>

-	<td>39,7</td>

-</tr>

-<!--Set width to 100%-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_Smenu#item0</td>

-	<td>23,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item2</td>

-	<td>36,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>27,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[2]/VMenuBar[0]#item2</td>

-	<td>23,3</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>filled-with-collapse-menu</td>

-</tr>

-<!--Re-set to 50 items to get new, uncached icons-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_Smenu#item0</td>

-	<td>13,3</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>68,12</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>44,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[2]/VMenuBar[0]#item12</td>

-	<td>6,5</td>

-</tr>

-<!--Compare with previous image. -->

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>filled-with-collapse-menu</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.menubar.MenuBarTest?restartApplication</td>
+	<td></td>
+</tr>
+<!--Hide event log to be able to compare screenshots-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_Smenu#item1</td>
+	<td>30,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>27,3</td>
+</tr>
+<!--No sub menus-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_Smenu#item0</td>
+	<td>32,1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>32,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>45,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>
+	<td>29,4</td>
+</tr>
+<!--50 root items to fill the screen-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_Smenu#item0</td>
+	<td>44,12</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>46,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>5,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[2]/VMenuBar[0]#item12</td>
+	<td>20,7</td>
+</tr>
+<!--Show icons on all items-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_Smenu#item0</td>
+	<td>13,1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>
+	<td>47,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>26,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[2]/VMenuBar[0]#item1</td>
+	<td>39,7</td>
+</tr>
+<!--Set width to 100%-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_Smenu#item0</td>
+	<td>23,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item2</td>
+	<td>36,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>27,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[2]/VMenuBar[0]#item2</td>
+	<td>23,3</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>filled-with-collapse-menu</td>
+</tr>
+<!--Re-set to 50 items to get new, uncached icons-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_Smenu#item0</td>
+	<td>13,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>68,12</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>44,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[2]/VMenuBar[0]#item12</td>
+	<td>6,5</td>
+</tr>
+<!--Compare with previous image. -->
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>filled-with-collapse-menu</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/IconsInSubMenus.html b/tests/testbench/com/vaadin/tests/components/menubar/IconsInSubMenus.html
index e1a63789ca..87f6f7a65e 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/IconsInSubMenus.html
+++ b/tests/testbench/com/vaadin/tests/components/menubar/IconsInSubMenus.html
@@ -1,101 +1,101 @@
-<?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.menubar.MenuBarTest?restartApplication</td>

-	<td></td>

-</tr>

-<!--Hide event log to be able to compare screenshots-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_Smenu#item1</td>

-	<td>30,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>27,3</td>

-</tr>

-<!--Show icons on all items-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_Smenu#item0</td>

-	<td>13,1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>

-	<td>47,3</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>26,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[2]/VMenuBar[0]#item1</td>

-	<td>39,7</td>

-</tr>

-<!--Set width to 100%-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_Smenu#item0</td>

-	<td>23,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item2</td>

-	<td>36,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>27,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[2]/VMenuBar[0]#item2</td>

-	<td>23,3</td>

-</tr>

-<!--Open sub menu 1-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_StestComponent#item0</td>

-	<td>51,10</td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>3000</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>submenu-1-with-icons</td>

-</tr>

-<!--Open sub menu 1-1-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>51,10</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>submenu-1-1-with-icons</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.menubar.MenuBarTest?restartApplication</td>
+	<td></td>
+</tr>
+<!--Hide event log to be able to compare screenshots-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_Smenu#item1</td>
+	<td>30,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>27,3</td>
+</tr>
+<!--Show icons on all items-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_Smenu#item0</td>
+	<td>13,1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>
+	<td>47,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>26,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[2]/VMenuBar[0]#item1</td>
+	<td>39,7</td>
+</tr>
+<!--Set width to 100%-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_Smenu#item0</td>
+	<td>23,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item2</td>
+	<td>36,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>27,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[2]/VMenuBar[0]#item2</td>
+	<td>23,3</td>
+</tr>
+<!--Open sub menu 1-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_StestComponent#item0</td>
+	<td>51,10</td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>3000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>submenu-1-with-icons</td>
+</tr>
+<!--Open sub menu 1-1-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>51,10</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>submenu-1-1-with-icons</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigationKeyboard.html b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigationKeyboard.html
index 172d203f50..9791c95f80 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigationKeyboard.html
+++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigationKeyboard.html
@@ -1,212 +1,212 @@
-<?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.menubar.MenuBarNavigation?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]#menu0</td>

-	<td>3,10</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>

-	<td>down</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>

-	<td>down</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>

-	<td>down</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>

-	<td>down</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>

-	<td>right</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>

-	<td>enter</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>MenuItem File/Export../As PDF... selected</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]#menu0</td>

-	<td>0,7</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>

-	<td>right</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>

-	<td>right</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>

-	<td>right</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>

-	<td>enter</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>MenuItem Help selected</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]#menu1</td>

-	<td>4,7</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>

-	<td>left</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>

-	<td>down</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>

-	<td>down</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>

-	<td>enter</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>MenuItem Edit/Cut selected</td>

-</tr>

-

-</tbody></table>

-</body>

-</html>

+<?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.menubar.MenuBarNavigation?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]#menu0</td>
+	<td>3,10</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>
+	<td>down</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>
+	<td>down</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>
+	<td>down</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>
+	<td>down</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>
+	<td>right</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>
+	<td>enter</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>MenuItem File/Export../As PDF... selected</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]#menu0</td>
+	<td>0,7</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>
+	<td>right</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>
+	<td>right</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>
+	<td>right</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>
+	<td>enter</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>MenuItem Help selected</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]#menu1</td>
+	<td>4,7</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>
+	<td>left</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>
+	<td>down</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>
+	<td>down</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]</td>
+	<td>enter</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>MenuItem Edit/Cut selected</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigationMouse.html b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigationMouse.html
index 20840993fa..5fe14195a3 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigationMouse.html
+++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigationMouse.html
@@ -1,137 +1,137 @@
-<?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.menubar.MenuBarNavigation?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]#item0</td>

-	<td>13,8</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::Root/VOverlay[0]/VMenuBar[0]#item4</td>

-	<td>41,4</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>32,2</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>MenuItem File/Export../As PDF... selected</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]#item1</td>

-	<td>13,11</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>18,11</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>MenuItem Edit/Copy selected</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]#item2</td>

-	<td>6,5</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>MenuItem Help selected</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]#item0</td>

-	<td>8,13</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::Root/VOverlay[0]/VMenuBar[0]#item6</td>

-	<td>18,9</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>MenuItem File/Exit selected</td>

-</tr>

-

-</tbody></table>

-</body>

-</html>

+<?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.menubar.MenuBarNavigation?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]#item0</td>
+	<td>13,8</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::Root/VOverlay[0]/VMenuBar[0]#item4</td>
+	<td>41,4</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>32,2</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>MenuItem File/Export../As PDF... selected</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]#item1</td>
+	<td>13,11</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>18,11</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>MenuItem Edit/Copy selected</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]#item2</td>
+	<td>6,5</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>MenuItem Help selected</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]#item0</td>
+	<td>8,13</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::Root/VOverlay[0]/VMenuBar[0]#item6</td>
+	<td>18,9</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsmenubarMenuBarNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>MenuItem File/Exit selected</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.html b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.html
index 330a92898c..63f6ff7753 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.html
+++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.html
@@ -1,27 +1,27 @@
-<?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.menubar.MenuBarRunsOutOfBrowser?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>menu-top-right</td>

-</tr>

-

-</tbody></table>

-</body>

-</html>

+<?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.menubar.MenuBarRunsOutOfBrowser?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>menu-top-right</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/notification/Notifications.html b/tests/testbench/com/vaadin/tests/components/notification/Notifications.html
index 4157af5450..c9016cfd6f 100644
--- a/tests/testbench/com/vaadin/tests/components/notification/Notifications.html
+++ b/tests/testbench/com/vaadin/tests/components/notification/Notifications.html
@@ -1,296 +1,296 @@
-<?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.notification.Notifications?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>focus</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTextArea[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>

-	<td>label=Error</td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>

-	<td>label=Humanized</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/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>human-hello-world</td>

-</tr>

-<tr>

-	<td>closeNotification</td>

-	<td>//body/div[2]</td>

-	<td>0,0</td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>

-	<td>label=Error</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/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>error-hello-world</td>

-</tr>

-<tr>

-	<td>closeNotification</td>

-	<td>//body/div[2]</td>

-	<td>0,0</td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>500</td>

-	<td></td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>

-	<td>label=Warning</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/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>warning-hello-world</td>

-</tr>

-<tr>

-	<td>closeNotification</td>

-	<td>//body/div[2]</td>

-	<td>0,0</td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>

-	<td>label=Tray</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/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>tray-hello-world</td>

-</tr>

-<tr>

-	<td>closeNotification</td>

-	<td>//body/div[2]</td>

-	<td>0,0</td>

-</tr>

-<tr>

-	<td>type</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTextArea[0]</td>

-	<td>Hello world&lt;br/&gt;Second row&lt;br/&gt;Third row which is very, very much longer than the other two rows</td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>

-	<td>label=Humanized</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/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>human-three-rows</td>

-</tr>

-<tr>

-	<td>closeNotification</td>

-	<td>//body/div[2]</td>

-	<td>0,0</td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>

-	<td>label=Error</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/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>error-three-rows</td>

-</tr>

-<tr>

-	<td>closeNotification</td>

-	<td>//body/div[2]</td>

-	<td>0,0</td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>500</td>

-	<td></td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>

-	<td>label=Warning</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/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>warning-three-rows</td>

-</tr>

-<tr>

-	<td>closeNotification</td>

-	<td>//body/div[2]</td>

-	<td>0,0</td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>

-	<td>label=Tray</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/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>tray-three-rows</td>

-</tr>

-<tr>

-	<td>closeNotification</td>

-	<td>//body/div[2]</td>

-	<td>0,0</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTextArea[0]</td>

-	<td>82,107</td>

-</tr>

-<tr>

-	<td>type</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTextArea[0]</td>

-	<td>A very long row that should cause the notification to wrap onto several lines. Still the notification box should only be as wide as needed. Adding even more text here so that the tray notification also wraps...</td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>

-	<td>label=Humanized</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/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>human-long-wrapped-row</td>

-</tr>

-<tr>

-	<td>closeNotification</td>

-	<td>//body/div[2]</td>

-	<td>0,0</td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>

-	<td>label=Error</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/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>error-long-wrapped-row</td>

-</tr>

-<tr>

-	<td>closeNotification</td>

-	<td>//body/div[2]</td>

-	<td>0,0</td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>500</td>

-	<td></td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>

-	<td>label=Warning</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/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>warning-long-wrapped-row</td>

-</tr>

-<tr>

-	<td>closeNotification</td>

-	<td>//body/div[2]</td>

-	<td>0,0</td>

-</tr>

-<tr>

-	<td>select</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>

-	<td>label=Tray</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/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>tray-long-wrapped-row</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.notification.Notifications?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>focus</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTextArea[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>
+	<td>label=Error</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>
+	<td>label=Humanized</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/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>human-hello-world</td>
+</tr>
+<tr>
+	<td>closeNotification</td>
+	<td>//body/div[2]</td>
+	<td>0,0</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>
+	<td>label=Error</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/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>error-hello-world</td>
+</tr>
+<tr>
+	<td>closeNotification</td>
+	<td>//body/div[2]</td>
+	<td>0,0</td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>500</td>
+	<td></td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>
+	<td>label=Warning</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/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>warning-hello-world</td>
+</tr>
+<tr>
+	<td>closeNotification</td>
+	<td>//body/div[2]</td>
+	<td>0,0</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>
+	<td>label=Tray</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/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>tray-hello-world</td>
+</tr>
+<tr>
+	<td>closeNotification</td>
+	<td>//body/div[2]</td>
+	<td>0,0</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTextArea[0]</td>
+	<td>Hello world&lt;br/&gt;Second row&lt;br/&gt;Third row which is very, very much longer than the other two rows</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>
+	<td>label=Humanized</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/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>human-three-rows</td>
+</tr>
+<tr>
+	<td>closeNotification</td>
+	<td>//body/div[2]</td>
+	<td>0,0</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>
+	<td>label=Error</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/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>error-three-rows</td>
+</tr>
+<tr>
+	<td>closeNotification</td>
+	<td>//body/div[2]</td>
+	<td>0,0</td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>500</td>
+	<td></td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>
+	<td>label=Warning</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/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>warning-three-rows</td>
+</tr>
+<tr>
+	<td>closeNotification</td>
+	<td>//body/div[2]</td>
+	<td>0,0</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>
+	<td>label=Tray</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/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>tray-three-rows</td>
+</tr>
+<tr>
+	<td>closeNotification</td>
+	<td>//body/div[2]</td>
+	<td>0,0</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTextArea[0]</td>
+	<td>82,107</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTextArea[0]</td>
+	<td>A very long row that should cause the notification to wrap onto several lines. Still the notification box should only be as wide as needed. Adding even more text here so that the tray notification also wraps...</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>
+	<td>label=Humanized</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/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>human-long-wrapped-row</td>
+</tr>
+<tr>
+	<td>closeNotification</td>
+	<td>//body/div[2]</td>
+	<td>0,0</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>
+	<td>label=Error</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/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>error-long-wrapped-row</td>
+</tr>
+<tr>
+	<td>closeNotification</td>
+	<td>//body/div[2]</td>
+	<td>0,0</td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>500</td>
+	<td></td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>
+	<td>label=Warning</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/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>warning-long-wrapped-row</td>
+</tr>
+<tr>
+	<td>closeNotification</td>
+	<td>//body/div[2]</td>
+	<td>0,0</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>
+	<td>label=Tray</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::/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>tray-long-wrapped-row</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutChangingChildrenSizes.html b/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutChangingChildrenSizes.html
index edcf60176d..8b6a8d7d26 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutChangingChildrenSizes.html
+++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutChangingChildrenSizes.html
@@ -1,211 +1,211 @@
-<?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.orderedlayout.VerticalLayoutTest?restartApplication</td>

-	<td></td>

-</tr>

-<!--Hide event log-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::PID_Smenu#item1</td>

-	<td>28,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>30,8</td>

-</tr>

-<!--Add components-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::PID_Smenu#item0</td>

-	<td>41,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>84,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>43,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>

-	<td>68,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[3]/VMenuBar[0]#item0</td>

-	<td>30,11</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>auto-auto-one-button</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::PID_Smenu#item0</td>

-	<td>35,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>85,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>83,3</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[2]/VMenuBar[0]#item1</td>

-	<td>28,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[3]/VMenuBar[0]#item1</td>

-	<td>40,10</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>auto-auto-two-buttons</td>

-</tr>

-<!--Component 0 -> 100%-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::PID_Smenu#item0</td>

-	<td>42,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>77,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>115,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>

-	<td>72,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[3]/VMenuBar[0]#item4</td>

-	<td>14,2</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>auto-auto-two-buttons-equal-width</td>

-</tr>

-<!--Component 1 -> 200px height-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::PID_Smenu#item0</td>

-	<td>22,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>117,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[1]/VMenuBar[0]#item3</td>

-	<td>104,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[2]/VMenuBar[0]#item1</td>

-	<td>74,12</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[3]/VMenuBar[0]#item2</td>

-	<td>23,8</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>auto-auto-two-buttons-lower-higher</td>

-</tr>

-<!--Back to what we had before-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::PID_Smenu#item0</td>

-	<td>24,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>104,12</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>114,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>

-	<td>87,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[3]/VMenuBar[0]#item0</td>

-	<td>17,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::PID_Smenu#item0</td>

-	<td>28,3</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>77,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[1]/VMenuBar[0]#item3</td>

-	<td>96,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[2]/VMenuBar[0]#item1</td>

-	<td>75,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[3]/VMenuBar[0]#item0</td>

-	<td>19,3</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>auto-auto-two-buttons</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.orderedlayout.VerticalLayoutTest?restartApplication</td>
+	<td></td>
+</tr>
+<!--Hide event log-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::PID_Smenu#item1</td>
+	<td>28,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>30,8</td>
+</tr>
+<!--Add components-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::PID_Smenu#item0</td>
+	<td>41,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>84,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>43,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>
+	<td>68,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[3]/VMenuBar[0]#item0</td>
+	<td>30,11</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>auto-auto-one-button</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::PID_Smenu#item0</td>
+	<td>35,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>85,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>83,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[2]/VMenuBar[0]#item1</td>
+	<td>28,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[3]/VMenuBar[0]#item1</td>
+	<td>40,10</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>auto-auto-two-buttons</td>
+</tr>
+<!--Component 0 -> 100%-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::PID_Smenu#item0</td>
+	<td>42,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>77,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>115,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>
+	<td>72,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[3]/VMenuBar[0]#item4</td>
+	<td>14,2</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>auto-auto-two-buttons-equal-width</td>
+</tr>
+<!--Component 1 -> 200px height-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::PID_Smenu#item0</td>
+	<td>22,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>117,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[1]/VMenuBar[0]#item3</td>
+	<td>104,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[2]/VMenuBar[0]#item1</td>
+	<td>74,12</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[3]/VMenuBar[0]#item2</td>
+	<td>23,8</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>auto-auto-two-buttons-lower-higher</td>
+</tr>
+<!--Back to what we had before-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::PID_Smenu#item0</td>
+	<td>24,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>104,12</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>114,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>
+	<td>87,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[3]/VMenuBar[0]#item0</td>
+	<td>17,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::PID_Smenu#item0</td>
+	<td>28,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>77,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[1]/VMenuBar[0]#item3</td>
+	<td>96,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[2]/VMenuBar[0]#item1</td>
+	<td>75,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsorderedlayoutVerticalLayoutTest::Root/VOverlay[3]/VMenuBar[0]#item0</td>
+	<td>19,3</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>auto-auto-two-buttons</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/passwordfield/PasswordFieldBasicStates.html b/tests/testbench/com/vaadin/tests/components/passwordfield/PasswordFieldBasicStates.html
index 70be23541e..ed671c9104 100644
--- a/tests/testbench/com/vaadin/tests/components/passwordfield/PasswordFieldBasicStates.html
+++ b/tests/testbench/com/vaadin/tests/components/passwordfield/PasswordFieldBasicStates.html
@@ -1,128 +1,128 @@
-<?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.passwordfield.PasswordFieldTest?restartApplication</td>

-	<td></td>

-</tr>

-<!--Write "content" -->

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::PID_StestComponent</td>

-	<td>content</td>

-</tr>

-<!--Disable event log-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::PID_Smenu#item1</td>

-	<td>26,2</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>20,8</td>

-</tr>

-<!-- Enabled state -->

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>enabled</td>

-</tr>

-<!--Disable-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::PID_Smenu#item0</td>

-	<td>38,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>31,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::Root/VOverlay[1]/VMenuBar[0]#item1</td>

-	<td>57,13</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>disabled</td>

-</tr>

-<!--Set readonly-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::PID_Smenu#item0</td>

-	<td>6,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>20,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>51,10</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>disabled-readonly</td>

-</tr>

-<!--Enable-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::PID_Smenu#item0</td>

-	<td>43,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>42,1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::Root/VOverlay[1]/VMenuBar[0]#item1</td>

-	<td>53,5</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>readonly</td>

-</tr>

-<!--Set read-write-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::PID_Smenu#item0</td>

-	<td>6,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>20,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>51,10</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>enabled</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.passwordfield.PasswordFieldTest?restartApplication</td>
+	<td></td>
+</tr>
+<!--Write "content" -->
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::PID_StestComponent</td>
+	<td>content</td>
+</tr>
+<!--Disable event log-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::PID_Smenu#item1</td>
+	<td>26,2</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>20,8</td>
+</tr>
+<!-- Enabled state -->
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>enabled</td>
+</tr>
+<!--Disable-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::PID_Smenu#item0</td>
+	<td>38,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>31,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>57,13</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>disabled</td>
+</tr>
+<!--Set readonly-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::PID_Smenu#item0</td>
+	<td>6,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>20,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>51,10</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>disabled-readonly</td>
+</tr>
+<!--Enable-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::PID_Smenu#item0</td>
+	<td>43,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>42,1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>53,5</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>readonly</td>
+</tr>
+<!--Set read-write-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::PID_Smenu#item0</td>
+	<td>6,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>20,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentspasswordfieldPasswordFieldTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>51,10</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>enabled</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreas.html b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreas.html
index d3e5c42c80..7d96b4185f 100644
--- a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreas.html
+++ b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreas.html
@@ -1,51 +1,51 @@
-<?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://artur-laptop.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.richtextarea.RichTextAreas?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>enabled</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsrichtextareaRichTextAreas::PID_Scheckboxaction-Error indicators/domChild[0]</td>

-	<td>68,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsrichtextareaRichTextAreas::PID_Scheckboxaction-Required/domChild[0]</td>

-	<td>23,8</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>error-required</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsrichtextareaRichTextAreas::PID_Scheckboxaction-Readonly/domChild[0]</td>

-	<td>34,8</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>error-required-readonly</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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://artur-laptop.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.richtextarea.RichTextAreas?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>enabled</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsrichtextareaRichTextAreas::PID_Scheckboxaction-Error indicators/domChild[0]</td>
+	<td>68,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsrichtextareaRichTextAreas::PID_Scheckboxaction-Required/domChild[0]</td>
+	<td>23,8</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>error-required</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsrichtextareaRichTextAreas::PID_Scheckboxaction-Readonly/domChild[0]</td>
+	<td>34,8</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>error-required-readonly</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/select/SelectDisplaysOldValue.html b/tests/testbench/com/vaadin/tests/components/select/SelectDisplaysOldValue.html
index e9d5fabb14..4594130bda 100644
--- a/tests/testbench/com/vaadin/tests/components/select/SelectDisplaysOldValue.html
+++ b/tests/testbench/com/vaadin/tests/components/select/SelectDisplaysOldValue.html
@@ -1,144 +1,144 @@
-<?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.select.SelectDisplaysOldValue?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>

-	<td>7,13</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item1</td>

-	<td>76,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[1]</td>

-	<td>4,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item0</td>

-	<td>79,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>

-	<td>20,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item0</td>

-	<td>89,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[1]</td>

-	<td>7,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[1]</td>

-	<td>7,9</td>

-</tr>

-<tr>

-	<td>focus</td>

-	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>focus</td>

-	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>

-	<td>704,305</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<!--Master should retain its value after filtering and not selecting any option-->

-<!--Select "Master 3" and "Master 3 - Slave 1"-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>

-	<td>10,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item2</td>

-	<td>96,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]</td>

-	<td>87,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]</td>

-	<td>98,16</td>

-</tr>

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]</td>

-	<td>down</td>

-</tr>

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]</td>

-	<td>down</td>

-</tr>

-<tr>

-	<td>pressSpecialKey</td>

-	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]</td>

-	<td>enter</td>

-</tr>

-<!--Filter master using "test" but do not select anything-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>

-	<td>-70,7</td>

-</tr>

-<tr>

-	<td>focus</td>

-	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>

-	<td>test</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[1]</td>

-	<td>58,163</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/domChild[0]/domChild[1]</td>

-	<td>58,163</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>

-	<td>Master 3</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.select.SelectDisplaysOldValue?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>
+	<td>7,13</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item1</td>
+	<td>76,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[1]</td>
+	<td>4,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item0</td>
+	<td>79,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>
+	<td>20,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item0</td>
+	<td>89,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[1]</td>
+	<td>7,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[1]</td>
+	<td>7,9</td>
+</tr>
+<tr>
+	<td>focus</td>
+	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>focus</td>
+	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+	<td>704,305</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<!--Master should retain its value after filtering and not selecting any option-->
+<!--Select "Master 3" and "Master 3 - Slave 1"-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>
+	<td>10,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item2</td>
+	<td>96,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]</td>
+	<td>87,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]</td>
+	<td>98,16</td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]</td>
+	<td>down</td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]</td>
+	<td>down</td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]</td>
+	<td>enter</td>
+</tr>
+<!--Filter master using "test" but do not select anything-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+	<td>-70,7</td>
+</tr>
+<tr>
+	<td>focus</td>
+	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+	<td>test</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[1]</td>
+	<td>58,163</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/domChild[0]/domChild[1]</td>
+	<td>58,163</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsselectSelectDisplaysOldValue::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+	<td>Master 3</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.html b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.html
index 7fd4908673..c2b55a5229 100644
--- a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.html
+++ b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.html
@@ -1,37 +1,37 @@
-<?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.select.TwinColSelectCaptionStyles?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>auto-auto</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectCaptionStyles::/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>500px-500px</td>

-</tr>

-

-</tbody></table>

-</body>

-</html>

+<?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.select.TwinColSelectCaptionStyles?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>auto-auto</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectCaptionStyles::/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>500px-500px</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectDualCaptions.html b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectDualCaptions.html
index 04388cb95a..bdb7121675 100644
--- a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectDualCaptions.html
+++ b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectDualCaptions.html
@@ -1,430 +1,430 @@
-<?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.75: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.select.TwinColSelectTest?restartApplication</td>

-	<td></td>

-</tr>

-<!--Hide log-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item1</td>

-	<td>27,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>27,6</td>

-</tr>

-<!--Remove component caption-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>

-	<td>25,13</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item1</td>

-	<td>34,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>69,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>

-	<td>37,6</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>no-captions</td>

-</tr>

-<!--Add left caption-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>

-	<td>39,14</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item6</td>

-	<td>46,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>46,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item3</td>

-	<td>27,4</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>left-caption</td>

-</tr>

-<!--Add right caption-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>

-	<td>37,19</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item6</td>

-	<td>27,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item3</td>

-	<td>61,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item2</td>

-	<td>29,11</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>dual-captions</td>

-</tr>

-<!--Hide left caption-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>

-	<td>27,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item6</td>

-	<td>46,3</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>77,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>

-	<td>18,11</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>right-caption</td>

-</tr>

-<!--Hide right caption-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>

-	<td>44,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item6</td>

-	<td>46,3</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item3</td>

-	<td>75,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>

-	<td>8,6</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>no-captions</td>

-</tr>

-<!--Show right caption-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>

-	<td>29,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item6</td>

-	<td>38,13</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item3</td>

-	<td>64,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item2</td>

-	<td>29,9</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>right-caption</td>

-</tr>

-<!--Hide right caption-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>

-	<td>35,13</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item6</td>

-	<td>42,15</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item3</td>

-	<td>45,3</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>

-	<td>75,3</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>no-captions</td>

-</tr>

-<!--Set width to fixed (500px)-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>

-	<td>37,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item2</td>

-	<td>36,0</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>15,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item6</td>

-	<td>27,8</td>

-</tr>

-<!--Add left caption-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>

-	<td>7,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item6</td>

-	<td>49,3</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>50,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item3</td>

-	<td>21,0</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>500px-left-caption</td>

-</tr>

-<!--Add right caption-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>

-	<td>53,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item6</td>

-	<td>47,2</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item3</td>

-	<td>44,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item4</td>

-	<td>46,10</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>500px-dual-captions</td>

-</tr>

-<!--Change the size of the parent layout to 500px to ensure cached updates work-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item1</td>

-	<td>20,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item2</td>

-	<td>53,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>4,3</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item6</td>

-	<td>27,15</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>500px-dual-captions</td>

-</tr>

-<!--Hide left caption-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>

-	<td>27,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item6</td>

-	<td>35,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>26,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>

-	<td>4,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>

-	<td>32,14</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item6</td>

-	<td>42,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item3</td>

-	<td>46,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>

-	<td>19,7</td>

-</tr>

-<!--Ensure height setting works correctly-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>

-	<td>21,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item2</td>

-	<td>23,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item1</td>

-	<td>32,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item4</td>

-	<td>28,9</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>height-300px-no-captions</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>

-	<td>47,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item6</td>

-	<td>37,2</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>55,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item1</td>

-	<td>36,15</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>height-300px-left-caption</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>

-	<td>36,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item6</td>

-	<td>48,2</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>44,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>

-	<td>29,12</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>height-300px-no-captions</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.75: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.select.TwinColSelectTest?restartApplication</td>
+	<td></td>
+</tr>
+<!--Hide log-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item1</td>
+	<td>27,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>27,6</td>
+</tr>
+<!--Remove component caption-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>
+	<td>25,13</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item1</td>
+	<td>34,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>69,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>
+	<td>37,6</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>no-captions</td>
+</tr>
+<!--Add left caption-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>
+	<td>39,14</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item6</td>
+	<td>46,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>46,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item3</td>
+	<td>27,4</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>left-caption</td>
+</tr>
+<!--Add right caption-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>
+	<td>37,19</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item6</td>
+	<td>27,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item3</td>
+	<td>61,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item2</td>
+	<td>29,11</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>dual-captions</td>
+</tr>
+<!--Hide left caption-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>
+	<td>27,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item6</td>
+	<td>46,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>77,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>
+	<td>18,11</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>right-caption</td>
+</tr>
+<!--Hide right caption-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>
+	<td>44,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item6</td>
+	<td>46,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item3</td>
+	<td>75,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>
+	<td>8,6</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>no-captions</td>
+</tr>
+<!--Show right caption-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>
+	<td>29,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item6</td>
+	<td>38,13</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item3</td>
+	<td>64,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item2</td>
+	<td>29,9</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>right-caption</td>
+</tr>
+<!--Hide right caption-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>
+	<td>35,13</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item6</td>
+	<td>42,15</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item3</td>
+	<td>45,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>
+	<td>75,3</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>no-captions</td>
+</tr>
+<!--Set width to fixed (500px)-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>
+	<td>37,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item2</td>
+	<td>36,0</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>15,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item6</td>
+	<td>27,8</td>
+</tr>
+<!--Add left caption-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>
+	<td>7,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item6</td>
+	<td>49,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>50,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item3</td>
+	<td>21,0</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>500px-left-caption</td>
+</tr>
+<!--Add right caption-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>
+	<td>53,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item6</td>
+	<td>47,2</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item3</td>
+	<td>44,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item4</td>
+	<td>46,10</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>500px-dual-captions</td>
+</tr>
+<!--Change the size of the parent layout to 500px to ensure cached updates work-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item1</td>
+	<td>20,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item2</td>
+	<td>53,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>4,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item6</td>
+	<td>27,15</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>500px-dual-captions</td>
+</tr>
+<!--Hide left caption-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>
+	<td>27,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item6</td>
+	<td>35,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>26,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>
+	<td>4,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>
+	<td>32,14</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item6</td>
+	<td>42,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item3</td>
+	<td>46,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>
+	<td>19,7</td>
+</tr>
+<!--Ensure height setting works correctly-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>
+	<td>21,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item2</td>
+	<td>23,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>32,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item4</td>
+	<td>28,9</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>height-300px-no-captions</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>
+	<td>47,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item6</td>
+	<td>37,2</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>55,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item1</td>
+	<td>36,15</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>height-300px-left-caption</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::PID_Smenu#item0</td>
+	<td>36,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[0]/VMenuBar[0]#item6</td>
+	<td>48,2</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>44,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelectTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>
+	<td>29,12</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>height-300px-no-captions</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectsDisabledReadonly.html b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectsDisabledReadonly.html
index f403d8b2f5..aa217d97cf 100644
--- a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectsDisabledReadonly.html
+++ b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectsDisabledReadonly.html
@@ -1,77 +1,77 @@
-<?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.select.TwinColSelects?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>enabled</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::PID_Scheckboxaction-Error indicators/domChild[0]</td>

-	<td>7,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::PID_Scheckboxaction-Required/domChild[0]</td>

-	<td>4,8</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>enabled-error-required</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::PID_Scheckboxaction-Error indicators/domChild[0]</td>

-	<td>2,3</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::PID_Scheckboxaction-Required/domChild[0]</td>

-	<td>0,2</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::PID_Scheckboxaction-Readonly/domChild[0]</td>

-	<td>9,8</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>enabled-readonly</td>

-</tr>

-<!--Disable-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::PID_Scheckboxaction-Enabled/domChild[0]</td>

-	<td>7,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::PID_Scheckboxaction-Readonly/domChild[0]</td>

-	<td>10,2</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>disabled</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.select.TwinColSelects?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>enabled</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::PID_Scheckboxaction-Error indicators/domChild[0]</td>
+	<td>7,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::PID_Scheckboxaction-Required/domChild[0]</td>
+	<td>4,8</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>enabled-error-required</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::PID_Scheckboxaction-Error indicators/domChild[0]</td>
+	<td>2,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::PID_Scheckboxaction-Required/domChild[0]</td>
+	<td>0,2</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::PID_Scheckboxaction-Readonly/domChild[0]</td>
+	<td>9,8</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>enabled-readonly</td>
+</tr>
+<!--Disable-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::PID_Scheckboxaction-Enabled/domChild[0]</td>
+	<td>7,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::PID_Scheckboxaction-Readonly/domChild[0]</td>
+	<td>10,2</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>disabled</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelBasicStates.html b/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelBasicStates.html
index 2b1ad7866a..8e829b2d7a 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelBasicStates.html
+++ b/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelBasicStates.html
@@ -1,213 +1,213 @@
-<?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.splitpanel.HorizontalSplitPanels?restartApplication</td>

-	<td></td>

-</tr>

-<!--Disable event log-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::PID_Smenu#item1</td>

-	<td>26,2</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>20,8</td>

-</tr>

-<!--set size full-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::PID_Smenu#item0</td>

-	<td>22,14</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item2</td>

-	<td>72,1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>18,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[2]/VMenuBar[0]#item2</td>

-	<td>47,0</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::PID_Smenu#item0</td>

-	<td>37,2</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item2</td>

-	<td>35,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item1</td>

-	<td>20,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[2]/VMenuBar[0]#item2</td>

-	<td>23,7</td>

-</tr>

-<!--add TextArea + NativeButton (100% x 100%) -->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::PID_Smenu#item0</td>

-	<td>23,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>86,13</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>48,1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[2]/VMenuBar[0]#item2</td>

-	<td>38,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[3]/VMenuBar[0]#item6</td>

-	<td>69,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::PID_Smenu#item0</td>

-	<td>18,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>36,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>70,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[2]/VMenuBar[0]#item1</td>

-	<td>28,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[3]/VMenuBar[0]#item6</td>

-	<td>38,0</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>enabled</td>

-</tr>

-<!--Disable-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::PID_Smenu#item0</td>

-	<td>38,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>31,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item1</td>

-	<td>57,13</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>disabled</td>

-</tr>

-<!--Set readonly-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::PID_Smenu#item0</td>

-	<td>6,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>20,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>51,10</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>disabled-readonly</td>

-</tr>

-<!--Enable-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::PID_Smenu#item0</td>

-	<td>43,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>42,1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item1</td>

-	<td>53,5</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>readonly</td>

-</tr>

-<!--Set read-write-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::PID_Smenu#item0</td>

-	<td>6,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>20,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>51,10</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>enabled</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.splitpanel.HorizontalSplitPanels?restartApplication</td>
+	<td></td>
+</tr>
+<!--Disable event log-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::PID_Smenu#item1</td>
+	<td>26,2</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>20,8</td>
+</tr>
+<!--set size full-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::PID_Smenu#item0</td>
+	<td>22,14</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item2</td>
+	<td>72,1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>18,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[2]/VMenuBar[0]#item2</td>
+	<td>47,0</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::PID_Smenu#item0</td>
+	<td>37,2</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item2</td>
+	<td>35,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>20,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[2]/VMenuBar[0]#item2</td>
+	<td>23,7</td>
+</tr>
+<!--add TextArea + NativeButton (100% x 100%) -->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::PID_Smenu#item0</td>
+	<td>23,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>86,13</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>48,1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[2]/VMenuBar[0]#item2</td>
+	<td>38,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[3]/VMenuBar[0]#item6</td>
+	<td>69,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::PID_Smenu#item0</td>
+	<td>18,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>36,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>70,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[2]/VMenuBar[0]#item1</td>
+	<td>28,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[3]/VMenuBar[0]#item6</td>
+	<td>38,0</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>enabled</td>
+</tr>
+<!--Disable-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::PID_Smenu#item0</td>
+	<td>38,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>31,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>57,13</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>disabled</td>
+</tr>
+<!--Set readonly-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::PID_Smenu#item0</td>
+	<td>6,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>20,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>51,10</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>disabled-readonly</td>
+</tr>
+<!--Enable-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::PID_Smenu#item0</td>
+	<td>43,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>42,1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>53,5</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>readonly</td>
+</tr>
+<!--Set read-write-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::PID_Smenu#item0</td>
+	<td>6,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>20,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelHorizontalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>51,10</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>enabled</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelBasicStates.html b/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelBasicStates.html
index 6f9678a54f..6e651adcda 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelBasicStates.html
+++ b/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelBasicStates.html
@@ -1,214 +1,214 @@
-<?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.splitpanel.VerticalSplitPanels?restartApplication</td>

-	<td></td>

-</tr>

-<!--Disable event log-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item1</td>

-	<td>26,2</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>20,8</td>

-</tr>

-<!--set size full-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item0</td>

-	<td>22,14</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item2</td>

-	<td>72,1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>18,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[2]/VMenuBar[0]#item2</td>

-	<td>47,0</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item0</td>

-	<td>37,2</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item2</td>

-	<td>35,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item1</td>

-	<td>20,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[2]/VMenuBar[0]#item2</td>

-	<td>23,7</td>

-</tr>

-<!--add two 100% x 100% components-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item0</td>

-	<td>23,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>86,13</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>48,1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[2]/VMenuBar[0]#item2</td>

-	<td>38,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[3]/VMenuBar[0]#item6</td>

-	<td>69,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item0</td>

-	<td>18,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>36,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>70,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[2]/VMenuBar[0]#item1</td>

-	<td>28,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[3]/VMenuBar[0]#item6</td>

-	<td>38,0</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>enabled</td>

-</tr>

-<!--Disable-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item0</td>

-	<td>38,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>31,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item1</td>

-	<td>57,13</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>disabled</td>

-</tr>

-<!--Set readonly-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item0</td>

-	<td>6,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>20,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>51,10</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>disabled-readonly</td>

-</tr>

-<!--Enable-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item0</td>

-	<td>43,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>42,1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item1</td>

-	<td>53,5</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>readonly</td>

-</tr>

-<!--Set read-write-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item0</td>

-	<td>6,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>20,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>51,10</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>enabled</td>

-</tr>

-

-</tbody></table>

-</body>

-</html>

+<?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.splitpanel.VerticalSplitPanels?restartApplication</td>
+	<td></td>
+</tr>
+<!--Disable event log-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item1</td>
+	<td>26,2</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>20,8</td>
+</tr>
+<!--set size full-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item0</td>
+	<td>22,14</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item2</td>
+	<td>72,1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>18,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[2]/VMenuBar[0]#item2</td>
+	<td>47,0</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item0</td>
+	<td>37,2</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item2</td>
+	<td>35,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>20,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[2]/VMenuBar[0]#item2</td>
+	<td>23,7</td>
+</tr>
+<!--add two 100% x 100% components-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item0</td>
+	<td>23,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>86,13</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>48,1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[2]/VMenuBar[0]#item2</td>
+	<td>38,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[3]/VMenuBar[0]#item6</td>
+	<td>69,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item0</td>
+	<td>18,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>36,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>70,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[2]/VMenuBar[0]#item1</td>
+	<td>28,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[3]/VMenuBar[0]#item6</td>
+	<td>38,0</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>enabled</td>
+</tr>
+<!--Disable-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item0</td>
+	<td>38,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>31,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>57,13</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>disabled</td>
+</tr>
+<!--Set readonly-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item0</td>
+	<td>6,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>20,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>51,10</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>disabled-readonly</td>
+</tr>
+<!--Enable-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item0</td>
+	<td>43,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>42,1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>53,5</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>readonly</td>
+</tr>
+<!--Set read-write-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item0</td>
+	<td>6,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>20,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>51,10</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>enabled</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelMoveSplitter.html b/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelMoveSplitter.html
index 0ebde2846d..7c8cd6ad12 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelMoveSplitter.html
+++ b/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelMoveSplitter.html
@@ -1,134 +1,134 @@
-<?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.splitpanel.VerticalSplitPanels?restartApplication</td>

-	<td></td>

-</tr>

-<!--set size full-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item0</td>

-	<td>22,14</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item2</td>

-	<td>72,1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>18,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[2]/VMenuBar[0]#item2</td>

-	<td>47,0</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item0</td>

-	<td>37,2</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item2</td>

-	<td>35,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item1</td>

-	<td>20,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[2]/VMenuBar[0]#item2</td>

-	<td>23,7</td>

-</tr>

-<!--add two 100% x 100% components-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item0</td>

-	<td>23,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>86,13</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>48,1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[2]/VMenuBar[0]#item6</td>

-	<td>38,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[3]/VMenuBar[0]#item6</td>

-	<td>69,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item0</td>

-	<td>18,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>36,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>70,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[2]/VMenuBar[0]#item5</td>

-	<td>28,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[3]/VMenuBar[0]#item6</td>

-	<td>38,0</td>

-</tr>

-<!--move the splitter-->

-<tr>

-	<td>dragAndDrop</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_StestComponent/domChild[0]/domChild[2]/domChild[0]</td>

-	<td>0,-100</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>splitter-above</td>

-</tr>

-<tr>

-	<td>dragAndDrop</td>

-	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_StestComponent/domChild[0]/domChild[2]/domChild[0]</td>

-	<td>0,300</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>splitter-below</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.splitpanel.VerticalSplitPanels?restartApplication</td>
+	<td></td>
+</tr>
+<!--set size full-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item0</td>
+	<td>22,14</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item2</td>
+	<td>72,1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>18,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[2]/VMenuBar[0]#item2</td>
+	<td>47,0</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item0</td>
+	<td>37,2</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item2</td>
+	<td>35,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>20,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[2]/VMenuBar[0]#item2</td>
+	<td>23,7</td>
+</tr>
+<!--add two 100% x 100% components-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item0</td>
+	<td>23,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>86,13</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>48,1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[2]/VMenuBar[0]#item6</td>
+	<td>38,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[3]/VMenuBar[0]#item6</td>
+	<td>69,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_Smenu#item0</td>
+	<td>18,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>36,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>70,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[2]/VMenuBar[0]#item5</td>
+	<td>28,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::Root/VOverlay[3]/VMenuBar[0]#item6</td>
+	<td>38,0</td>
+</tr>
+<!--move the splitter-->
+<tr>
+	<td>dragAndDrop</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_StestComponent/domChild[0]/domChild[2]/domChild[0]</td>
+	<td>0,-100</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>splitter-above</td>
+</tr>
+<tr>
+	<td>dragAndDrop</td>
+	<td>vaadin=runcomvaadintestscomponentssplitpanelVerticalSplitPanels::PID_StestComponent/domChild[0]/domChild[2]/domChild[0]</td>
+	<td>0,300</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>splitter-below</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/table/EditableModeChange.html b/tests/testbench/com/vaadin/tests/components/table/EditableModeChange.html
index 2a7949f3ba..6414c9bc03 100644
--- a/tests/testbench/com/vaadin/tests/components/table/EditableModeChange.html
+++ b/tests/testbench/com/vaadin/tests/components/table/EditableModeChange.html
@@ -1,56 +1,56 @@
-<?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.EditableModeChange?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableEditableModeChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>

-	<td>24,8</td>

-</tr>

-<!--Set into editable mode-->

-<tr>

-	<td>doubleClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableEditableModeChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>

-	<td>24,8</td>

-</tr>

-<!--Update name for selected row-->

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentstableEditableModeChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VTextField[0]</td>

-	<td>baa</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableEditableModeChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>

-	<td>34,11</td>

-</tr>

-<!--Ensure the name was updated-->

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableEditableModeChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>

-	<td>baa</td>

-</tr>

-<!--Ensure the correct row is selected-->

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>selected-teemu</td>

-</tr>

-

-</tbody></table>

-</body>

-</html>

+<?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.EditableModeChange?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableEditableModeChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+	<td>24,8</td>
+</tr>
+<!--Set into editable mode-->
+<tr>
+	<td>doubleClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableEditableModeChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+	<td>24,8</td>
+</tr>
+<!--Update name for selected row-->
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentstableEditableModeChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VTextField[0]</td>
+	<td>baa</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableEditableModeChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
+	<td>34,11</td>
+</tr>
+<!--Ensure the name was updated-->
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableEditableModeChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+	<td>baa</td>
+</tr>
+<!--Ensure the correct row is selected-->
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>selected-teemu</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/table/EmptyTable.html b/tests/testbench/com/vaadin/tests/components/table/EmptyTable.html
index dc52eb8bac..58f26cf607 100644
--- a/tests/testbench/com/vaadin/tests/components/table/EmptyTable.html
+++ b/tests/testbench/com/vaadin/tests/components/table/EmptyTable.html
@@ -1,72 +1,72 @@
-<?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#item1</td>

-	<td>35,1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>36,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>

-	<td>44,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item5</td>

-	<td>25,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item1</td>

-	<td>80,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item0</td>

-	<td>25,6</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>empty-table</td>

-</tr>

-<tr>

-	<td>open</td>

-	<td>/run/com.vaadin.tests.components.table.Tables</td>

-	<td></td>

-</tr>

-<!-- Focus menubar to get consistent screenshots-->

-<tr>

-	<td>focus</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu</td>

-	<td>35,1</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>empty-table</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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#item1</td>
+	<td>35,1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>36,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>
+	<td>44,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item5</td>
+	<td>25,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>80,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item0</td>
+	<td>25,6</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>empty-table</td>
+</tr>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.table.Tables</td>
+	<td></td>
+</tr>
+<!-- Focus menubar to get consistent screenshots-->
+<tr>
+	<td>focus</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu</td>
+	<td>35,1</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>empty-table</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderSyncOnScroll.html b/tests/testbench/com/vaadin/tests/components/table/HeaderSyncOnScroll.html
index 70abbd78ba..66f6107f90 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HeaderSyncOnScroll.html
+++ b/tests/testbench/com/vaadin/tests/components/table/HeaderSyncOnScroll.html
@@ -1,127 +1,127 @@
-<?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>

-<!--hide log-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item1</td>

-	<td>39,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>23,9</td>

-</tr>

-<!--width: 100%-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>

-	<td>35,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item2</td>

-	<td>54,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>21,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item2</td>

-	<td>44,4</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>100pct-no-scrollbar</td>

-</tr>

-<!--parent width: 300px-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item1</td>

-	<td>22,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item2</td>

-	<td>48,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>7,3</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item6</td>

-	<td>43,7</td>

-</tr>

-<!--scroll right-->

-<tr>

-	<td>pause</td>

-	<td>300</td>

-	<td></td>

-</tr>

-<tr>

-	<td>scrollLeft</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]</td>

-	<td>200</td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>300</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>300px-scrolled-right</td>

-</tr>

-<!--parent width: 100%-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item1</td>

-	<td>22,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item2</td>

-	<td>48,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>7,3</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item2</td>

-	<td>43,7</td>

-</tr>

-<!--  Should really be the same image as before, avoiding constant IE fails using a different image (#6147)-->

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>100pct-no-scrollbar-2</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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>
+<!--hide log-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item1</td>
+	<td>39,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>23,9</td>
+</tr>
+<!--width: 100%-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>
+	<td>35,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item2</td>
+	<td>54,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>21,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item2</td>
+	<td>44,4</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>100pct-no-scrollbar</td>
+</tr>
+<!--parent width: 300px-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item1</td>
+	<td>22,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item2</td>
+	<td>48,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>7,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item6</td>
+	<td>43,7</td>
+</tr>
+<!--scroll right-->
+<tr>
+	<td>pause</td>
+	<td>300</td>
+	<td></td>
+</tr>
+<tr>
+	<td>scrollLeft</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]</td>
+	<td>200</td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>300</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>300px-scrolled-right</td>
+</tr>
+<!--parent width: 100%-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item1</td>
+	<td>22,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item2</td>
+	<td>48,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>7,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item2</td>
+	<td>43,7</td>
+</tr>
+<!--  Should really be the same image as before, avoiding constant IE fails using a different image (#6147)-->
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>100pct-no-scrollbar-2</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.html b/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.html
index e00482679c..2c40672c0d 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.html
+++ b/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.html
@@ -1,479 +1,479 @@
-<?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://artur-laptop.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.table.ItemClickEvents?restartApplication</td>

-	<td></td>

-</tr>

-<!--Single select not null-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>

-	<td>42,7</td>

-</tr>

-<tr>

-	<td>assertCSSClass</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>

-	<td>v-selected</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>1. left click on table/Item 0</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>

-	<td>41,3</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>2. left click on table/Item 1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>

-	<td>41,10</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>3. left click on table/Item 1</td>

-</tr>

-<tr>

-	<td>doubleClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>

-	<td>88,12</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>4. doubleClick on table/Item 1</td>

-</tr>

-<tr>

-	<td>doubleClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>

-	<td>88,12</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>5. doubleClick on table/Item 0</td>

-</tr>

-<tr>

-	<td>assertCSSClass</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]</td>

-	<td>v-selected</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<!--Single select null-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VHorizontalLayout[0]/ChildComponentContainer[2]/VCheckBox[0]/domChild[0]</td>

-	<td>6,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>

-	<td>48,15</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>0. left click on table/Item 0</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>

-	<td>57,11</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>1. left click on table/Item 0</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[5]/domChild[0]/domChild[0]</td>

-	<td>45,9</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>2. left click on table/Item 5</td>

-</tr>

-<tr>

-	<td>doubleClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[5]/domChild[0]/domChild[0]</td>

-	<td>45,9</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>3. doubleClick on table/Item 5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[5]</td>

-	<td>195,142</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[5]</td>

-	<td>582,1</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<!--Multiselect null-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VHorizontalLayout[0]/ChildComponentContainer[3]/VCheckBox[0]/domChild[0]</td>

-	<td>22,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>

-	<td>50,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[0]/domChild[0]</td>

-	<td>51,10:shift</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[6]/domChild[0]/domChild[0]</td>

-	<td>47,11:ctrl</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[0]</td>

-	<td>50,8:ctrl</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[3]/VLabel[0]</td>

-	<td>0. left click on table/Item 0</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[2]/VLabel[0]</td>

-	<td>1. left click on table/Item 4 (shift)</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[1]/VLabel[0]</td>

-	<td>2. left click on table/Item 6 (ctrl)</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>3. left click on table/Item 2 (ctrl)</td>

-</tr>

-<!--Multi select not null-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VHorizontalLayout[0]/ChildComponentContainer[2]/VCheckBox[0]/domChild[0]</td>

-	<td>34,0</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[9]/domChild[0]/domChild[0]</td>

-	<td>43,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[9]/domChild[0]/domChild[0]</td>

-	<td>49,6:ctrl</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]/domChild[0]</td>

-	<td>71,9:ctrl</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[9]/domChild[0]/domChild[0]</td>

-	<td>79,4:ctrl</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]/domChild[0]</td>

-	<td>75,17:ctrl</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[4]/VLabel[0]</td>

-	<td>0. left click on table/Item 9</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[3]/VLabel[0]</td>

-	<td>1. left click on table/Item 9 (ctrl)</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[2]/VLabel[0]</td>

-	<td>2. left click on table/Item 3 (ctrl)</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[1]/VLabel[0]</td>

-	<td>3. left click on table/Item 9 (ctrl)</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>4. left click on table/Item 3 (ctrl)</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<!--Single not selectable-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VHorizontalLayout[0]/ChildComponentContainer[3]/VCheckBox[0]/domChild[0]</td>

-	<td>11,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VHorizontalLayout[0]/ChildComponentContainer[1]/VCheckBox[0]/domChild[0]</td>

-	<td>11,2</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>

-	<td>49,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[0]</td>

-	<td>48,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[7]/domChild[0]/domChild[0]</td>

-	<td>50,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]/domChild[0]</td>

-	<td>57,11</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[3]/VLabel[0]</td>

-	<td>0. left click on table/Item 1</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[2]/VLabel[0]</td>

-	<td>1. left click on table/Item 2</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[1]/VLabel[0]</td>

-	<td>2. left click on table/Item 7</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>3. left click on table/Item 3</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<!--Multi not selectable-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VHorizontalLayout[0]/ChildComponentContainer[3]/VCheckBox[0]/domChild[0]</td>

-	<td>8,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>

-	<td>42,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[5]/domChild[0]/domChild[0]</td>

-	<td>47,13</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]/domChild[0]</td>

-	<td>43,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[8]/domChild[0]/domChild[0]</td>

-	<td>44,9:shift</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[3]/VLabel[0]</td>

-	<td>0. left click on table/Item 1</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[2]/VLabel[0]</td>

-	<td>1. left click on table/Item 5</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[1]/VLabel[0]</td>

-	<td>2. left click on table/Item 3</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>3. left click on table/Item 8 (shift)</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<!--Single, Non-immediate-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VHorizontalLayout[0]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>

-	<td>8,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VHorizontalLayout[0]/ChildComponentContainer[3]/VCheckBox[0]/domChild[0]</td>

-	<td>6,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>

-	<td>57,8</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>0. left click on table/Item 0</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>

-	<td>47,9</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>1. left click on table/Item 1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[0]</td>

-	<td>47,11</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>2. left click on table/Item 2</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[8]/domChild[0]/domChild[0]</td>

-	<td>31,13:ctrl shift</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>3. left click on table/Item 8 (ctrl shift)</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<!--non-immediate single selectable-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VHorizontalLayout[0]/ChildComponentContainer[1]/VCheckBox[0]/domChild[0]</td>

-	<td>10,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>

-	<td>43,11</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>0. left click on table/Item 1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[8]/domChild[0]/domChild[0]</td>

-	<td>73,9</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>1. left click on table/Item 8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>

-	<td>58,12</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>2. left click on table/Item 1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>

-	<td>71,15</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>3. left click on table/Item 0</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[6]/domChild[0]/domChild[0]</td>

-	<td>68,11</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>4. left click on table/Item 6</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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://artur-laptop.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.table.ItemClickEvents?restartApplication</td>
+	<td></td>
+</tr>
+<!--Single select not null-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+	<td>42,7</td>
+</tr>
+<tr>
+	<td>assertCSSClass</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+	<td>v-selected</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>1. left click on table/Item 0</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+	<td>41,3</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>2. left click on table/Item 1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+	<td>41,10</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>3. left click on table/Item 1</td>
+</tr>
+<tr>
+	<td>doubleClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+	<td>88,12</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>4. doubleClick on table/Item 1</td>
+</tr>
+<tr>
+	<td>doubleClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+	<td>88,12</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>5. doubleClick on table/Item 0</td>
+</tr>
+<tr>
+	<td>assertCSSClass</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]</td>
+	<td>v-selected</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<!--Single select null-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VHorizontalLayout[0]/ChildComponentContainer[2]/VCheckBox[0]/domChild[0]</td>
+	<td>6,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+	<td>48,15</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>0. left click on table/Item 0</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+	<td>57,11</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>1. left click on table/Item 0</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[5]/domChild[0]/domChild[0]</td>
+	<td>45,9</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>2. left click on table/Item 5</td>
+</tr>
+<tr>
+	<td>doubleClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[5]/domChild[0]/domChild[0]</td>
+	<td>45,9</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>3. doubleClick on table/Item 5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[5]</td>
+	<td>195,142</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[5]</td>
+	<td>582,1</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<!--Multiselect null-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VHorizontalLayout[0]/ChildComponentContainer[3]/VCheckBox[0]/domChild[0]</td>
+	<td>22,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+	<td>50,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[0]/domChild[0]</td>
+	<td>51,10:shift</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[6]/domChild[0]/domChild[0]</td>
+	<td>47,11:ctrl</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[0]</td>
+	<td>50,8:ctrl</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[3]/VLabel[0]</td>
+	<td>0. left click on table/Item 0</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[2]/VLabel[0]</td>
+	<td>1. left click on table/Item 4 (shift)</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[1]/VLabel[0]</td>
+	<td>2. left click on table/Item 6 (ctrl)</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>3. left click on table/Item 2 (ctrl)</td>
+</tr>
+<!--Multi select not null-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VHorizontalLayout[0]/ChildComponentContainer[2]/VCheckBox[0]/domChild[0]</td>
+	<td>34,0</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[9]/domChild[0]/domChild[0]</td>
+	<td>43,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[9]/domChild[0]/domChild[0]</td>
+	<td>49,6:ctrl</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]/domChild[0]</td>
+	<td>71,9:ctrl</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[9]/domChild[0]/domChild[0]</td>
+	<td>79,4:ctrl</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]/domChild[0]</td>
+	<td>75,17:ctrl</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[4]/VLabel[0]</td>
+	<td>0. left click on table/Item 9</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[3]/VLabel[0]</td>
+	<td>1. left click on table/Item 9 (ctrl)</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[2]/VLabel[0]</td>
+	<td>2. left click on table/Item 3 (ctrl)</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[1]/VLabel[0]</td>
+	<td>3. left click on table/Item 9 (ctrl)</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>4. left click on table/Item 3 (ctrl)</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<!--Single not selectable-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VHorizontalLayout[0]/ChildComponentContainer[3]/VCheckBox[0]/domChild[0]</td>
+	<td>11,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VHorizontalLayout[0]/ChildComponentContainer[1]/VCheckBox[0]/domChild[0]</td>
+	<td>11,2</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+	<td>49,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[0]</td>
+	<td>48,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[7]/domChild[0]/domChild[0]</td>
+	<td>50,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]/domChild[0]</td>
+	<td>57,11</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[3]/VLabel[0]</td>
+	<td>0. left click on table/Item 1</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[2]/VLabel[0]</td>
+	<td>1. left click on table/Item 2</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[1]/VLabel[0]</td>
+	<td>2. left click on table/Item 7</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>3. left click on table/Item 3</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<!--Multi not selectable-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VHorizontalLayout[0]/ChildComponentContainer[3]/VCheckBox[0]/domChild[0]</td>
+	<td>8,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+	<td>42,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[5]/domChild[0]/domChild[0]</td>
+	<td>47,13</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]/domChild[0]</td>
+	<td>43,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[8]/domChild[0]/domChild[0]</td>
+	<td>44,9:shift</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[3]/VLabel[0]</td>
+	<td>0. left click on table/Item 1</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[2]/VLabel[0]</td>
+	<td>1. left click on table/Item 5</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[1]/VLabel[0]</td>
+	<td>2. left click on table/Item 3</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>3. left click on table/Item 8 (shift)</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<!--Single, Non-immediate-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VHorizontalLayout[0]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>
+	<td>8,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VHorizontalLayout[0]/ChildComponentContainer[3]/VCheckBox[0]/domChild[0]</td>
+	<td>6,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+	<td>57,8</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>0. left click on table/Item 0</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+	<td>47,9</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>1. left click on table/Item 1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[0]</td>
+	<td>47,11</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>2. left click on table/Item 2</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[8]/domChild[0]/domChild[0]</td>
+	<td>31,13:ctrl shift</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>3. left click on table/Item 8 (ctrl shift)</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<!--non-immediate single selectable-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VHorizontalLayout[0]/ChildComponentContainer[1]/VCheckBox[0]/domChild[0]</td>
+	<td>10,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+	<td>43,11</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>0. left click on table/Item 1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[8]/domChild[0]/domChild[0]</td>
+	<td>73,9</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>1. left click on table/Item 8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+	<td>58,12</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>2. left click on table/Item 1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+	<td>71,15</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>3. left click on table/Item 0</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[6]/domChild[0]/domChild[0]</td>
+	<td>68,11</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableItemClickEvents::PID_Slog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>4. left click on table/Item 6</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableColumnSorting.html b/tests/testbench/com/vaadin/tests/components/table/TableColumnSorting.html
index f513d147a8..7f6ee1a975 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableColumnSorting.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableColumnSorting.html
@@ -1,208 +1,208 @@
-<?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#item1</td>

-	<td>35,1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>36,8</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>auto-unsorted</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>

-	<td>53,11</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>auto-sorted-p1-asc-update</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>

-	<td>53,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>

-	<td>53,11</td>

-</tr>

-<tr>

-	<td>open</td>

-	<td>/run/com.vaadin.tests.components.table.Tables</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[2]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>auto-sorted-p1-asc-redraw</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>

-	<td>53,11</td>

-</tr>

-<tr>

-	<td>open</td>

-	<td>/run/com.vaadin.tests.components.table.Tables</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[2]</td>

-	<td>34,13</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[2]</td>

-	<td>29,14</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[3]/domChild[2]</td>

-	<td>19,13</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[4]/domChild[2]</td>

-	<td>27,12</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[4]/domChild[2]</td>

-	<td>27,12</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>auto-sorted-p5-desc-update</td>

-</tr>

-<tr>

-	<td>open</td>

-	<td>/run/com.vaadin.tests.components.table.Tables</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>auto-sorted-p5-desc-redraw</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[4]/domChild[2]</td>

-	<td>27,12</td>

-</tr>

-<tr>

-	<td>open</td>

-	<td>/run/com.vaadin.tests.components.table.Tables</td>

-	<td></td>

-</tr>

-<!--500px wide-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>

-	<td>30,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item2</td>

-	<td>32,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>40,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item6</td>

-	<td>47,4</td>

-</tr>

-<!--3 items-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>

-	<td>36,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item5</td>

-	<td>61,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>72,1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item3</td>

-	<td>20,10</td>

-</tr>

-<tr>

-	<td>open</td>

-	<td>/run/com.vaadin.tests.components.table.Tables</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>500px-unsorted-redraw</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>

-	<td>83,9</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>500px-sorted-p1-desc-update</td>

-</tr>

-<tr>

-	<td>open</td>

-	<td>/run/com.vaadin.tests.components.table.Tables</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>500px-sorted-p1-desc-redraw</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>

-	<td>83,9</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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#item1</td>
+	<td>35,1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>36,8</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>auto-unsorted</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
+	<td>53,11</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>auto-sorted-p1-asc-update</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
+	<td>53,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
+	<td>53,11</td>
+</tr>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.table.Tables</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[2]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>auto-sorted-p1-asc-redraw</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
+	<td>53,11</td>
+</tr>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.table.Tables</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[2]</td>
+	<td>34,13</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[2]</td>
+	<td>29,14</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[3]/domChild[2]</td>
+	<td>19,13</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[4]/domChild[2]</td>
+	<td>27,12</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[4]/domChild[2]</td>
+	<td>27,12</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>auto-sorted-p5-desc-update</td>
+</tr>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.table.Tables</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>auto-sorted-p5-desc-redraw</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[4]/domChild[2]</td>
+	<td>27,12</td>
+</tr>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.table.Tables</td>
+	<td></td>
+</tr>
+<!--500px wide-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>
+	<td>30,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item2</td>
+	<td>32,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>40,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item6</td>
+	<td>47,4</td>
+</tr>
+<!--3 items-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>
+	<td>36,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item5</td>
+	<td>61,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>72,1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item3</td>
+	<td>20,10</td>
+</tr>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.table.Tables</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>500px-unsorted-redraw</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
+	<td>83,9</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>500px-sorted-p1-desc-update</td>
+</tr>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.table.Tables</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>500px-sorted-p1-desc-redraw</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
+	<td>83,9</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableContextMenuAndIcons.html b/tests/testbench/com/vaadin/tests/components/table/TableContextMenuAndIcons.html
index 54d8e624f1..82f1e63d6b 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableContextMenuAndIcons.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableContextMenuAndIcons.html
@@ -1,187 +1,187 @@
-<?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.table.Tables?restartApplication</td>

-	<td></td>

-</tr>

-<!--Hide event log-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item1</td>

-	<td>19,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>32,7</td>

-</tr>

-<!--Simple context menu-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>

-	<td>28,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item8</td>

-	<td>57,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>68,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item1</td>

-	<td>69,7</td>

-</tr>

-<tr>

-	<td>contextMenuAt</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[1]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>contextmenu-noicon</td>

-</tr>

-<!--Two actions, without and with icon-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>

-	<td>42,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item8</td>

-	<td>52,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>53,3</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item2</td>

-	<td>31,4</td>

-</tr>

-<tr>

-	<td>contextMenuAt</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[2]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>caption-only-and-has-icon</td>

-</tr>

-<!--Large icon-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>

-	<td>42,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item8</td>

-	<td>52,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>53,3</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item3</td>

-	<td>31,4</td>

-</tr>

-<tr>

-	<td>contextMenuAt</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[2]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>large-icon</td>

-</tr>

-<!--Simple context menu again to ensure it is properly updated (icons removed)-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>

-	<td>28,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item8</td>

-	<td>57,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>68,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item1</td>

-	<td>69,7</td>

-</tr>

-<tr>

-	<td>contextMenuAt</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[1]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>contextmenu-noicon</td>

-</tr>

-<!--Empty context menu-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>

-	<td>25,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item8</td>

-	<td>72,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>77,2</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item4</td>

-	<td>48,5</td>

-</tr>

-<tr>

-	<td>contextmenu</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[3]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>contextmenu-empty</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.table.Tables?restartApplication</td>
+	<td></td>
+</tr>
+<!--Hide event log-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item1</td>
+	<td>19,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>32,7</td>
+</tr>
+<!--Simple context menu-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>
+	<td>28,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item8</td>
+	<td>57,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>68,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item1</td>
+	<td>69,7</td>
+</tr>
+<tr>
+	<td>contextMenuAt</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[1]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>contextmenu-noicon</td>
+</tr>
+<!--Two actions, without and with icon-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>
+	<td>42,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item8</td>
+	<td>52,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>53,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item2</td>
+	<td>31,4</td>
+</tr>
+<tr>
+	<td>contextMenuAt</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[2]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>caption-only-and-has-icon</td>
+</tr>
+<!--Large icon-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>
+	<td>42,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item8</td>
+	<td>52,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>53,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item3</td>
+	<td>31,4</td>
+</tr>
+<tr>
+	<td>contextMenuAt</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[2]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>large-icon</td>
+</tr>
+<!--Simple context menu again to ensure it is properly updated (icons removed)-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>
+	<td>28,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item8</td>
+	<td>57,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>68,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item1</td>
+	<td>69,7</td>
+</tr>
+<tr>
+	<td>contextMenuAt</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[1]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>contextmenu-noicon</td>
+</tr>
+<!--Empty context menu-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>
+	<td>25,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item8</td>
+	<td>72,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>77,2</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item4</td>
+	<td>48,5</td>
+</tr>
+<tr>
+	<td>contextmenu</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[3]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>contextmenu-empty</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableModificationsWhenScrolledRight.html b/tests/testbench/com/vaadin/tests/components/table/TableModificationsWhenScrolledRight.html
index b225b30726..eab6164330 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableModificationsWhenScrolledRight.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableModificationsWhenScrolledRight.html
@@ -1,52 +1,52 @@
-<?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.TableModifcationsWhenScrolledRight?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>scrollLeft</td>

-	<td>vaadin=runcomvaadintestscomponentstableTableModifcationsWhenScrolledRight::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]</td>

-	<td>292</td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>300</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>scrolled-right</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentstableTableModifcationsWhenScrolledRight::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>300</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>column-added-when-scrolled-right</td>

-</tr>

-

-</tbody></table>

-</body>

-</html>

+<?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.TableModifcationsWhenScrolledRight?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>scrollLeft</td>
+	<td>vaadin=runcomvaadintestscomponentstableTableModifcationsWhenScrolledRight::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]</td>
+	<td>292</td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>300</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>scrolled-right</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentstableTableModifcationsWhenScrolledRight::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>300</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>column-added-when-scrolled-right</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectMouse.html b/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectMouse.html
index 8d7c0d98b0..a980253743 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectMouse.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectMouse.html
@@ -1,361 +1,361 @@
-<?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.table.Tables?restartApplication</td>

-	<td></td>

-</tr>

-<!--Multi select-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>

-	<td>6,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item4</td>

-	<td>73,0</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item1</td>

-	<td>33,13</td>

-</tr>

-<!--Null select allowed-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>

-	<td>39,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item4</td>

-	<td>75,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>42,2</td>

-</tr>

-<!--ValueChangeListener-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>

-	<td>14,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>75,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>64,6</td>

-</tr>

-<!--Clear log to ensure numbers matches with the later case-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item1</td>

-	<td>29,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item1</td>

-	<td>40,7</td>

-</tr>

-<!--Start clicking-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[3]/domChild[0]</td>

-	<td>16,8</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>0. ValueChangeEvent, new value: '[Item 3]'</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[8]/domChild[2]/domChild[0]</td>

-	<td>26,10:shift</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>1. ValueChangeEvent, new value: '[Item 3, Item 4, Item 5, Item 6, Item 7, Item 8, Item 9]'</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>selected-2-9</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>31,10</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>2. ValueChangeEvent, new value: '[Item 1]'</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[2]/domChild[0]</td>

-	<td>27,10:ctrl</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>3. ValueChangeEvent, new value: '[Item 1, Item 3]'</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[2]/domChild[0]</td>

-	<td>37,10:ctrl</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>4. ValueChangeEvent, new value: '[Item 1, Item 3, Item 5]'</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>selected-135</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[9]/domChild[3]/domChild[0]</td>

-	<td>22,6:shift</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>5. ValueChangeEvent, new value: '[Item 10, Item 5, Item 6, Item 7, Item 8, Item 9]'</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>selected-5-10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[6]/domChild[2]/domChild[0]</td>

-	<td>30,7</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>6. ValueChangeEvent, new value: '[Item 7]'</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[2]/domChild[0]</td>

-	<td>66,10:ctrl</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>7. ValueChangeEvent, new value: '[Item 4, Item 7]'</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[2]/domChild[0]</td>

-	<td>62,5:shift</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>8. ValueChangeEvent, new value: '[Item 2, Item 3, Item 4]'</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[9]/domChild[4]/domChild[0]</td>

-	<td>62,8:shift</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>9. ValueChangeEvent, new value: '[Item 10, Item 4, Item 5, Item 6, Item 7, Item 8, Item 9]'</td>

-</tr>

-<!--The same thing with nullselectallowed == false-->

-<tr>

-	<td>open</td>

-	<td>/run/com.vaadin.tests.components.table.Tables?restartApplication</td>

-	<td></td>

-</tr>

-<!--Multi select-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>

-	<td>6,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item4</td>

-	<td>73,0</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item1</td>

-	<td>33,13</td>

-</tr>

-<!--ValueChangeListener-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>

-	<td>14,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>75,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>64,6</td>

-</tr>

-<!--Clear log to ensure numbers matches with the later case-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item1</td>

-	<td>29,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item1</td>

-	<td>40,7</td>

-</tr>

-<!--Start clicking-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[3]/domChild[0]</td>

-	<td>16,8</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>0. ValueChangeEvent, new value: '[Item 3]'</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[8]/domChild[2]/domChild[0]</td>

-	<td>26,10:shift</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>1. ValueChangeEvent, new value: '[Item 3, Item 4, Item 5, Item 6, Item 7, Item 8, Item 9]'</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>selected-2-9</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>31,10</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>2. ValueChangeEvent, new value: '[Item 1]'</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[2]/domChild[0]</td>

-	<td>27,10:ctrl</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>3. ValueChangeEvent, new value: '[Item 1, Item 3]'</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[2]/domChild[0]</td>

-	<td>37,10:ctrl</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>4. ValueChangeEvent, new value: '[Item 1, Item 3, Item 5]'</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>selected-135</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[9]/domChild[3]/domChild[0]</td>

-	<td>22,6:shift</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>5. ValueChangeEvent, new value: '[Item 10, Item 5, Item 6, Item 7, Item 8, Item 9]'</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>selected-5-10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[6]/domChild[2]/domChild[0]</td>

-	<td>30,7</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>6. ValueChangeEvent, new value: '[Item 7]'</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[2]/domChild[0]</td>

-	<td>66,10:ctrl</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>7. ValueChangeEvent, new value: '[Item 4, Item 7]'</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[2]/domChild[0]</td>

-	<td>62,5:shift</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>8. ValueChangeEvent, new value: '[Item 2, Item 3, Item 4]'</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[9]/domChild[4]/domChild[0]</td>

-	<td>62,8:shift</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>9. ValueChangeEvent, new value: '[Item 10, Item 4, Item 5, Item 6, Item 7, Item 8, Item 9]'</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.table.Tables?restartApplication</td>
+	<td></td>
+</tr>
+<!--Multi select-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>
+	<td>6,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item4</td>
+	<td>73,0</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>33,13</td>
+</tr>
+<!--Null select allowed-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>
+	<td>39,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item4</td>
+	<td>75,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>42,2</td>
+</tr>
+<!--ValueChangeListener-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>
+	<td>14,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>75,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>64,6</td>
+</tr>
+<!--Clear log to ensure numbers matches with the later case-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item1</td>
+	<td>29,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item1</td>
+	<td>40,7</td>
+</tr>
+<!--Start clicking-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[3]/domChild[0]</td>
+	<td>16,8</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>0. ValueChangeEvent, new value: '[Item 3]'</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[8]/domChild[2]/domChild[0]</td>
+	<td>26,10:shift</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>1. ValueChangeEvent, new value: '[Item 3, Item 4, Item 5, Item 6, Item 7, Item 8, Item 9]'</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>selected-2-9</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>31,10</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>2. ValueChangeEvent, new value: '[Item 1]'</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[2]/domChild[0]</td>
+	<td>27,10:ctrl</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>3. ValueChangeEvent, new value: '[Item 1, Item 3]'</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[2]/domChild[0]</td>
+	<td>37,10:ctrl</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>4. ValueChangeEvent, new value: '[Item 1, Item 3, Item 5]'</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>selected-135</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[9]/domChild[3]/domChild[0]</td>
+	<td>22,6:shift</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>5. ValueChangeEvent, new value: '[Item 10, Item 5, Item 6, Item 7, Item 8, Item 9]'</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>selected-5-10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[6]/domChild[2]/domChild[0]</td>
+	<td>30,7</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>6. ValueChangeEvent, new value: '[Item 7]'</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[2]/domChild[0]</td>
+	<td>66,10:ctrl</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>7. ValueChangeEvent, new value: '[Item 4, Item 7]'</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[2]/domChild[0]</td>
+	<td>62,5:shift</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>8. ValueChangeEvent, new value: '[Item 2, Item 3, Item 4]'</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[9]/domChild[4]/domChild[0]</td>
+	<td>62,8:shift</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>9. ValueChangeEvent, new value: '[Item 10, Item 4, Item 5, Item 6, Item 7, Item 8, Item 9]'</td>
+</tr>
+<!--The same thing with nullselectallowed == false-->
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.table.Tables?restartApplication</td>
+	<td></td>
+</tr>
+<!--Multi select-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>
+	<td>6,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item4</td>
+	<td>73,0</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>33,13</td>
+</tr>
+<!--ValueChangeListener-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>
+	<td>14,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>75,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>64,6</td>
+</tr>
+<!--Clear log to ensure numbers matches with the later case-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item1</td>
+	<td>29,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item1</td>
+	<td>40,7</td>
+</tr>
+<!--Start clicking-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[3]/domChild[0]</td>
+	<td>16,8</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>0. ValueChangeEvent, new value: '[Item 3]'</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[8]/domChild[2]/domChild[0]</td>
+	<td>26,10:shift</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>1. ValueChangeEvent, new value: '[Item 3, Item 4, Item 5, Item 6, Item 7, Item 8, Item 9]'</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>selected-2-9</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>31,10</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>2. ValueChangeEvent, new value: '[Item 1]'</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[2]/domChild[0]</td>
+	<td>27,10:ctrl</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>3. ValueChangeEvent, new value: '[Item 1, Item 3]'</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[2]/domChild[0]</td>
+	<td>37,10:ctrl</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>4. ValueChangeEvent, new value: '[Item 1, Item 3, Item 5]'</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>selected-135</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[9]/domChild[3]/domChild[0]</td>
+	<td>22,6:shift</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>5. ValueChangeEvent, new value: '[Item 10, Item 5, Item 6, Item 7, Item 8, Item 9]'</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>selected-5-10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[6]/domChild[2]/domChild[0]</td>
+	<td>30,7</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>6. ValueChangeEvent, new value: '[Item 7]'</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[2]/domChild[0]</td>
+	<td>66,10:ctrl</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>7. ValueChangeEvent, new value: '[Item 4, Item 7]'</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[2]/domChild[0]</td>
+	<td>62,5:shift</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>8. ValueChangeEvent, new value: '[Item 2, Item 3, Item 4]'</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[9]/domChild[4]/domChild[0]</td>
+	<td>62,8:shift</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>9. ValueChangeEvent, new value: '[Item 10, Item 4, Item 5, Item 6, Item 7, Item 8, Item 9]'</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.html b/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.html
index c029e2889b..c809678a4f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.html
@@ -1,67 +1,67 @@
-<?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.TableSingleSelect?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTableSingleSelect::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>

-	<td>27,14</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableTableSingleSelect::PID_Seventlog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>1. Selected value: 0</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTableSingleSelect::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>

-	<td>28,17</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableTableSingleSelect::PID_Seventlog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>2. Selected value: 1</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>selected-1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTableSingleSelect::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>

-	<td>33,15</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableTableSingleSelect::PID_Seventlog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>3. Selected value: null</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTableSingleSelect::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>

-	<td>26,17</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstableTableSingleSelect::PID_Seventlog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>4. Selected value: 1</td>

-</tr>

-

-</tbody></table>

-</body>

-</html>

+<?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.TableSingleSelect?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTableSingleSelect::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+	<td>27,14</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTableSingleSelect::PID_Seventlog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>1. Selected value: 0</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTableSingleSelect::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+	<td>28,17</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTableSingleSelect::PID_Seventlog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>2. Selected value: 1</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>selected-1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTableSingleSelect::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+	<td>33,15</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTableSingleSelect::PID_Seventlog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>3. Selected value: null</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTableSingleSelect::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+	<td>26,17</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTableSingleSelect::PID_Seventlog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>4. Selected value: 1</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableWithManyColumns.html b/tests/testbench/com/vaadin/tests/components/table/TableWithManyColumns.html
index 5fea0c99df..a933b0b1d1 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableWithManyColumns.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableWithManyColumns.html
@@ -1,56 +1,56 @@
-<?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.TableWithManyColumns?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>initial</td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>scrollLeft</td>

-	<td>vaadin=runcomvaadintestscomponentstableTableWithManyColumns::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]</td>

-	<td>10000</td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>300</td>

-	<td></td>

-</tr>

-<tr>

-	<td>waitForVaadin</td>

-	<td></td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>scrolled-right</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.TableWithManyColumns?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>initial</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>scrollLeft</td>
+	<td>vaadin=runcomvaadintestscomponentstableTableWithManyColumns::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]</td>
+	<td>10000</td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>300</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>scrolled-right</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/table/TextFieldValueGoesMissing.html b/tests/testbench/com/vaadin/tests/components/table/TextFieldValueGoesMissing.html
index 4573cf4c50..caaa15fa1c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TextFieldValueGoesMissing.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TextFieldValueGoesMissing.html
@@ -1,47 +1,47 @@
-<?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>TextFieldValueGoesMissing</title>

-</head>

-<body>

-<table cellpadding="1" cellspacing="1" border="1">

-<thead>

-<tr><td rowspan="1" colspan="3">TextFieldValueGoesMissing</td></tr>

-</thead><tbody>

-<tr>

-	<td>open</td>

-	<td>/run/com.vaadin.tests.components.table.TextFieldValueGoesMissing?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstableTextFieldValueGoesMissing::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VTextField[0]</td>

-	<td>73,10</td>

-</tr>

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentstableTextFieldValueGoesMissing::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VTextField[0]</td>

-	<td>test</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentstableTextFieldValueGoesMissing::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>contextmenu</td>

-	<td>vaadin=runcomvaadintestscomponentstableTextFieldValueGoesMissing::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VTextField[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentstableTextFieldValueGoesMissing::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VTextField[0]</td>

-	<td>test</td>

-</tr>

-

-</tbody></table>

-</body>

-</html>

+<?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>TextFieldValueGoesMissing</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">TextFieldValueGoesMissing</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.table.TextFieldValueGoesMissing?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTextFieldValueGoesMissing::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VTextField[0]</td>
+	<td>73,10</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentstableTextFieldValueGoesMissing::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VTextField[0]</td>
+	<td>test</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentstableTextFieldValueGoesMissing::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>contextmenu</td>
+	<td>vaadin=runcomvaadintestscomponentstableTextFieldValueGoesMissing::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VTextField[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentstableTextFieldValueGoesMissing::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VTextField[0]</td>
+	<td>test</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetBasicOperations.html b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetBasicOperations.html
index 5ee81a48d1..357455545e 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetBasicOperations.html
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetBasicOperations.html
@@ -1,330 +1,330 @@
-<?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://artur-laptop.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.tabsheet.TabSheetTest?restartApplication</td>

-	<td></td>

-</tr>

-<!--hide log to avoid messing up screenshots-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_Smenu#item1</td>

-	<td>33,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>31,9</td>

-</tr>

-<!--Add some components-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_Smenu#item0</td>

-	<td>21,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>49,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>16,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>

-	<td>49,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[3]/VMenuBar[0]#item0</td>

-	<td>94,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_Smenu#item0</td>

-	<td>41,21</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>49,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>28,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[2]/VMenuBar[0]#item1</td>

-	<td>39,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[3]/VMenuBar[0]#item0</td>

-	<td>28,12</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_Smenu#item0</td>

-	<td>52,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>74,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>50,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[2]/VMenuBar[0]#item3</td>

-	<td>72,13</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[3]/VMenuBar[0]#item5</td>

-	<td>51,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_Smenu#item0</td>

-	<td>16,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>89,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>76,3</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[2]/VMenuBar[0]#item1</td>

-	<td>56,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[3]/VMenuBar[0]#item6</td>

-	<td>19,2</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>auto-auto-button</td>

-</tr>

-<!--Set width and height-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_Smenu#item0</td>

-	<td>34,1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[0]/VMenuBar[0]#item2</td>

-	<td>54,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>8,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[2]/VMenuBar[0]#item6</td>

-	<td>17,2</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_Smenu#item0</td>

-	<td>42,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[0]/VMenuBar[0]#item2</td>

-	<td>47,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[1]/VMenuBar[0]#item1</td>

-	<td>19,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[2]/VMenuBar[0]#item5</td>

-	<td>29,3</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>500px-400px-button</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_Smenu#item0</td>

-	<td>24,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>

-	<td>75,0</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[1]/VMenuBar[0]#item3</td>

-	<td>46,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>

-	<td>40,2</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[3]/VMenuBar[0]#item0</td>

-	<td>18,1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_Smenu#item0</td>

-	<td>41,12</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>

-	<td>70,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[1]/VMenuBar[0]#item3</td>

-	<td>62,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[2]/VMenuBar[0]#item2</td>

-	<td>20,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[3]/VMenuBar[0]#item0</td>

-	<td>19,10</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>selected-0-closable-0-2</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]/domChild[0]</td>

-	<td>1,21</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>selected-2-closable-0-2</td>

-</tr>

-<!--Close and selection listeners-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_Smenu#item0</td>

-	<td>29,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[0]/VMenuBar[0]#item4</td>

-	<td>49,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>80,12</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_Smenu#item0</td>

-	<td>18,13</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[0]/VMenuBar[0]#item4</td>

-	<td>67,14</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[1]/VMenuBar[0]#item3</td>

-	<td>71,9</td>

-</tr>

-<!--show log to be able to assert-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_Smenu#item1</td>

-	<td>33,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>31,9</td>

-</tr>

-<!--close tab 2-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]</td>

-	<td>10,10</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_SLog/ChildComponentContainer[1]/VLabel[0]</td>

-	<td>10. Tab 2 closed</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>11. Tab 0 selected</td>

-</tr>

-<!--select tab 1-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]</td>

-	<td>32,7</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>12. Tab 1 selected</td>

-</tr>

-<!--select tab 2-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]</td>

-	<td>46,9</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>13. Tab 2 selected</td>

-</tr>

-

-</tbody></table>

-</body>

-</html>

+<?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://artur-laptop.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.tabsheet.TabSheetTest?restartApplication</td>
+	<td></td>
+</tr>
+<!--hide log to avoid messing up screenshots-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_Smenu#item1</td>
+	<td>33,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>31,9</td>
+</tr>
+<!--Add some components-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_Smenu#item0</td>
+	<td>21,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>49,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>16,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>
+	<td>49,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[3]/VMenuBar[0]#item0</td>
+	<td>94,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_Smenu#item0</td>
+	<td>41,21</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>49,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>28,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[2]/VMenuBar[0]#item1</td>
+	<td>39,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[3]/VMenuBar[0]#item0</td>
+	<td>28,12</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_Smenu#item0</td>
+	<td>52,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>74,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>50,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[2]/VMenuBar[0]#item3</td>
+	<td>72,13</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[3]/VMenuBar[0]#item5</td>
+	<td>51,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_Smenu#item0</td>
+	<td>16,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>89,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>76,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[2]/VMenuBar[0]#item1</td>
+	<td>56,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[3]/VMenuBar[0]#item6</td>
+	<td>19,2</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>auto-auto-button</td>
+</tr>
+<!--Set width and height-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_Smenu#item0</td>
+	<td>34,1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[0]/VMenuBar[0]#item2</td>
+	<td>54,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>8,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[2]/VMenuBar[0]#item6</td>
+	<td>17,2</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_Smenu#item0</td>
+	<td>42,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[0]/VMenuBar[0]#item2</td>
+	<td>47,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>19,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[2]/VMenuBar[0]#item5</td>
+	<td>29,3</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>500px-400px-button</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_Smenu#item0</td>
+	<td>24,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>
+	<td>75,0</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[1]/VMenuBar[0]#item3</td>
+	<td>46,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>
+	<td>40,2</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[3]/VMenuBar[0]#item0</td>
+	<td>18,1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_Smenu#item0</td>
+	<td>41,12</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>
+	<td>70,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[1]/VMenuBar[0]#item3</td>
+	<td>62,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[2]/VMenuBar[0]#item2</td>
+	<td>20,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[3]/VMenuBar[0]#item0</td>
+	<td>19,10</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>selected-0-closable-0-2</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]/domChild[0]</td>
+	<td>1,21</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>selected-2-closable-0-2</td>
+</tr>
+<!--Close and selection listeners-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_Smenu#item0</td>
+	<td>29,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[0]/VMenuBar[0]#item4</td>
+	<td>49,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>80,12</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_Smenu#item0</td>
+	<td>18,13</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[0]/VMenuBar[0]#item4</td>
+	<td>67,14</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[1]/VMenuBar[0]#item3</td>
+	<td>71,9</td>
+</tr>
+<!--show log to be able to assert-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_Smenu#item1</td>
+	<td>33,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>31,9</td>
+</tr>
+<!--close tab 2-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]</td>
+	<td>10,10</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_SLog/ChildComponentContainer[1]/VLabel[0]</td>
+	<td>10. Tab 2 closed</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>11. Tab 0 selected</td>
+</tr>
+<!--select tab 1-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]</td>
+	<td>32,7</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>12. Tab 1 selected</td>
+</tr>
+<!--select tab 2-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]</td>
+	<td>46,9</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>13. Tab 2 selected</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaBasicStates.html b/tests/testbench/com/vaadin/tests/components/textarea/TextAreaBasicStates.html
index 52be660ad2..3d44192506 100644
--- a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaBasicStates.html
+++ b/tests/testbench/com/vaadin/tests/components/textarea/TextAreaBasicStates.html
@@ -1,128 +1,128 @@
-<?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.textarea.TextAreaTest?restartApplication</td>

-	<td></td>

-</tr>

-<!--Write "content" -->

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::PID_StestComponent</td>

-	<td>content</td>

-</tr>

-<!--Disable event log-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::PID_Smenu#item1</td>

-	<td>26,2</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>20,8</td>

-</tr>

-<!-- Enabled state -->

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>enabled</td>

-</tr>

-<!--Disable-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::PID_Smenu#item0</td>

-	<td>38,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>31,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::Root/VOverlay[1]/VMenuBar[0]#item1</td>

-	<td>57,13</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>disabled</td>

-</tr>

-<!--Set readonly-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::PID_Smenu#item0</td>

-	<td>6,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>20,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>51,10</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>disabled-readonly</td>

-</tr>

-<!--Enable-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::PID_Smenu#item0</td>

-	<td>43,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>42,1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::Root/VOverlay[1]/VMenuBar[0]#item1</td>

-	<td>53,5</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>readonly</td>

-</tr>

-<!--Set read-write-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::PID_Smenu#item0</td>

-	<td>6,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>20,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>51,10</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>enabled</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.textarea.TextAreaTest?restartApplication</td>
+	<td></td>
+</tr>
+<!--Write "content" -->
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::PID_StestComponent</td>
+	<td>content</td>
+</tr>
+<!--Disable event log-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::PID_Smenu#item1</td>
+	<td>26,2</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>20,8</td>
+</tr>
+<!-- Enabled state -->
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>enabled</td>
+</tr>
+<!--Disable-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::PID_Smenu#item0</td>
+	<td>38,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>31,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>57,13</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>disabled</td>
+</tr>
+<!--Set readonly-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::PID_Smenu#item0</td>
+	<td>6,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>20,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>51,10</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>disabled-readonly</td>
+</tr>
+<!--Enable-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::PID_Smenu#item0</td>
+	<td>43,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>42,1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>53,5</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>readonly</td>
+</tr>
+<!--Set read-write-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::PID_Smenu#item0</td>
+	<td>6,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>20,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextareaTextAreaTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>51,10</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>enabled</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaWordwrap.html b/tests/testbench/com/vaadin/tests/components/textarea/TextAreaWordwrap.html
index 780e95a358..43bb52b3e7 100644
--- a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaWordwrap.html
+++ b/tests/testbench/com/vaadin/tests/components/textarea/TextAreaWordwrap.html
@@ -1,56 +1,56 @@
-<?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://artur-laptop.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.textarea.Wordwrap?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>wrap-nowrap</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextareaWordwrap::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VCheckBox[0]/domChild[0]</td>

-	<td>98,2</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextareaWordwrap::</td>

-	<td>396,331</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>wrap-wrap</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextareaWordwrap::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VCheckBox[0]/domChild[0]</td>

-	<td>98,2</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextareaWordwrap::/VVerticalLayout[0]/domChild[0]/domChild[0]</td>

-	<td>387,96</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>wrap-nowrap</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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://artur-laptop.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.textarea.Wordwrap?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>wrap-nowrap</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextareaWordwrap::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VCheckBox[0]/domChild[0]</td>
+	<td>98,2</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextareaWordwrap::</td>
+	<td>396,331</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>wrap-wrap</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextareaWordwrap::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VCheckBox[0]/domChild[0]</td>
+	<td>98,2</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextareaWordwrap::/VVerticalLayout[0]/domChild[0]/domChild[0]</td>
+	<td>387,96</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>wrap-nowrap</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldBasicStates.html b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldBasicStates.html
index 823cbeb4e7..b38c24d7f5 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldBasicStates.html
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldBasicStates.html
@@ -1,128 +1,128 @@
-<?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.textfield.TextFieldTest?restartApplication</td>

-	<td></td>

-</tr>

-<!--Write "content" -->

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>content</td>

-</tr>

-<!--Disable event log-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item1</td>

-	<td>26,2</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>20,8</td>

-</tr>

-<!-- Enabled state -->

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>enabled</td>

-</tr>

-<!--Disable-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>

-	<td>38,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>31,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item1</td>

-	<td>57,13</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>disabled</td>

-</tr>

-<!--Set readonly-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>

-	<td>6,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>20,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>51,10</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>disabled-readonly</td>

-</tr>

-<!--Enable-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>

-	<td>43,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>42,1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item1</td>

-	<td>53,5</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>readonly</td>

-</tr>

-<!--Set read-write-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>

-	<td>6,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>20,9</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>51,10</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>enabled</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.textfield.TextFieldTest?restartApplication</td>
+	<td></td>
+</tr>
+<!--Write "content" -->
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>content</td>
+</tr>
+<!--Disable event log-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item1</td>
+	<td>26,2</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>20,8</td>
+</tr>
+<!-- Enabled state -->
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>enabled</td>
+</tr>
+<!--Disable-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>
+	<td>38,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>31,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>57,13</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>disabled</td>
+</tr>
+<!--Set readonly-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>
+	<td>6,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>20,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>51,10</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>disabled-readonly</td>
+</tr>
+<!--Enable-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>
+	<td>43,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>42,1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>53,5</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>readonly</td>
+</tr>
+<!--Set read-write-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>
+	<td>6,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>20,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>51,10</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>enabled</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldMaxLength.html b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldMaxLength.html
index 01c35aeea0..a0163352cc 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldMaxLength.html
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldMaxLength.html
@@ -1,196 +1,196 @@
-<?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>TextFieldMaxLength</title>

-</head>

-<body>

-<table cellpadding="1" cellspacing="1" border="1">

-<thead>

-<tr><td rowspan="1" colspan="3">TextFieldMaxLength</td></tr>

-</thead><tbody>

-<tr>

-	<td>open</td>

-	<td>/run/com.vaadin.tests.components.textfield.TextFieldTest?restartApplication</td>

-	<td></td>

-</tr>

-<!--ValueChangeListener-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>

-	<td>38,13</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>30,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>62,12</td>

-</tr>

-<!--MaxLength 5-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>

-	<td>29,13</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>

-	<td>38,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>76,3</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[2]/VMenuBar[0]#item5</td>

-	<td>22,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>57,13</td>

-</tr>

-<!--Enter some text-->

-<tr>

-	<td>type</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>123456789012345</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>12345</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>2. ValueChangeEvent, new value: '12345'</td>

-</tr>

-<!--MaxLength 10-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>

-	<td>29,13</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>

-	<td>38,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>76,3</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[2]/VMenuBar[0]#item10</td>

-	<td>22,8</td>

-</tr>

-<!--Firefox 4 beta needs a brief pause to update the max length-->

-<tr>

-	<td>pause</td>

-	<td>1000</td>

-	<td></td>

-</tr>

-<!--Enter some text-->

-<tr>

-	<td>type</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>123456789012345</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>1234567890</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>4. ValueChangeEvent, new value: '1234567890'</td>

-</tr>

-<!--Remove max length-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>

-	<td>29,13</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>

-	<td>38,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>76,3</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[2]/VMenuBar[0]#item14</td>

-	<td>22,8</td>

-</tr>

-<!--Enter some text-->

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>123456789012345</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>123456789012345</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>6. ValueChangeEvent, new value: '123456789012345'</td>

-</tr>

-<!--MaxLength 0-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>

-	<td>20,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>

-	<td>33,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>51,3</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>

-	<td>9,9</td>

-</tr>

-<!--Enter some text-->

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>123456789012345</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>8. ValueChangeEvent, new value: ''</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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>TextFieldMaxLength</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">TextFieldMaxLength</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.textfield.TextFieldTest?restartApplication</td>
+	<td></td>
+</tr>
+<!--ValueChangeListener-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>
+	<td>38,13</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>30,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>62,12</td>
+</tr>
+<!--MaxLength 5-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>
+	<td>29,13</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>
+	<td>38,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>76,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[2]/VMenuBar[0]#item5</td>
+	<td>22,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>57,13</td>
+</tr>
+<!--Enter some text-->
+<tr>
+	<td>type</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>123456789012345</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>12345</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>2. ValueChangeEvent, new value: '12345'</td>
+</tr>
+<!--MaxLength 10-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>
+	<td>29,13</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>
+	<td>38,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>76,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[2]/VMenuBar[0]#item10</td>
+	<td>22,8</td>
+</tr>
+<!--Firefox 4 beta needs a brief pause to update the max length-->
+<tr>
+	<td>pause</td>
+	<td>1000</td>
+	<td></td>
+</tr>
+<!--Enter some text-->
+<tr>
+	<td>type</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>123456789012345</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>1234567890</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>4. ValueChangeEvent, new value: '1234567890'</td>
+</tr>
+<!--Remove max length-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>
+	<td>29,13</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>
+	<td>38,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>76,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[2]/VMenuBar[0]#item14</td>
+	<td>22,8</td>
+</tr>
+<!--Enter some text-->
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>123456789012345</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>123456789012345</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>6. ValueChangeEvent, new value: '123456789012345'</td>
+</tr>
+<!--MaxLength 0-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>
+	<td>20,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>
+	<td>33,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>51,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>
+	<td>9,9</td>
+</tr>
+<!--Enter some text-->
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>123456789012345</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>8. ValueChangeEvent, new value: ''</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldNullRepresentationAndSelection.html b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldNullRepresentationAndSelection.html
index d1882575d1..7923f5acfd 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldNullRepresentationAndSelection.html
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldNullRepresentationAndSelection.html
@@ -1,172 +1,172 @@
-<?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.textfield.TextFieldTest?restartApplication</td>

-	<td></td>

-</tr>

-<!--ValueChangeListener-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>

-	<td>38,13</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>30,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>62,12</td>

-</tr>

-<!--Null representation "This is empty"-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>

-	<td>1,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>

-	<td>27,12</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item1</td>

-	<td>64,3</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[2]/VMenuBar[0]#item2</td>

-	<td>64,8</td>

-</tr>

-<!--non-empty contents-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>90,11</td>

-</tr>

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>Not empty</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>2. ValueChangeEvent, new value: 'Not empty'</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>Not empty</td>

-</tr>

-<!--empty contents "This is empty"-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>102,10</td>

-</tr>

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>This is empty</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[2]</td>

-	<td>114,149</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>3. ValueChangeEvent, new value: null</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>This is empty</td>

-</tr>

-<!--Turn off null selection allowed-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>

-	<td>28,3</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>

-	<td>23,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>94,10</td>

-</tr>

-<!--Change text to something else and back to null representation-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>84,13</td>

-</tr>

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>This is empty2</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[2]</td>

-	<td>120,102</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>5. ValueChangeEvent, new value: 'This is empty2'</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>This is empty2</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>101,19</td>

-</tr>

-<tr>

-	<td>type</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>This is empty</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[2]</td>

-	<td>163,129</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>6. ValueChangeEvent, new value: 'This is empty'</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>This is empty</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.textfield.TextFieldTest?restartApplication</td>
+	<td></td>
+</tr>
+<!--ValueChangeListener-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>
+	<td>38,13</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>30,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>62,12</td>
+</tr>
+<!--Null representation "This is empty"-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>
+	<td>1,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>
+	<td>27,12</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>64,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[2]/VMenuBar[0]#item2</td>
+	<td>64,8</td>
+</tr>
+<!--non-empty contents-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>90,11</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>Not empty</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>2. ValueChangeEvent, new value: 'Not empty'</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>Not empty</td>
+</tr>
+<!--empty contents "This is empty"-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>102,10</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>This is empty</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[2]</td>
+	<td>114,149</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>3. ValueChangeEvent, new value: null</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>This is empty</td>
+</tr>
+<!--Turn off null selection allowed-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>
+	<td>28,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>
+	<td>23,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>94,10</td>
+</tr>
+<!--Change text to something else and back to null representation-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>84,13</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>This is empty2</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[2]</td>
+	<td>120,102</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>5. ValueChangeEvent, new value: 'This is empty2'</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>This is empty2</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>101,19</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>This is empty</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[2]</td>
+	<td>163,129</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>6. ValueChangeEvent, new value: 'This is empty'</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>This is empty</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldSecret.html b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldSecret.html
index 1e5a295971..6a51103fe5 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldSecret.html
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldSecret.html
@@ -1,196 +1,196 @@
-<?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.textfield.TextFieldTest?restartApplication</td>

-	<td></td>

-</tr>

-<!--Disable event log-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item1</td>

-	<td>19,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>24,1</td>

-</tr>

-<!--Enter "s3cr3t" in the TextField-->

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>s3cr3t</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>normal</td>

-</tr>

-<!--Change to secret-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>

-	<td>38,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>

-	<td>51,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item6</td>

-	<td>25,12</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>secret</td>

-</tr>

-<!--Change to normal-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>

-	<td>38,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>

-	<td>51,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item6</td>

-	<td>25,12</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>normal</td>

-</tr>

-<!--Change to secret-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>

-	<td>38,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>

-	<td>51,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item6</td>

-	<td>25,12</td>

-</tr>

-<!--ValueChangeListener-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>

-	<td>38,13</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>30,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>

-	<td>62,12</td>

-</tr>

-<!--Enable and clear event log-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item1</td>

-	<td>19,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>24,1</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item1</td>

-	<td>19,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item1</td>

-	<td>24,1</td>

-</tr>

-<!--Value -> Test-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>

-	<td>21,2</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item4</td>

-	<td>24,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>

-	<td>37,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[2]/VMenuBar[0]#item2</td>

-	<td>37,4</td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>100</td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>1. ValueChangeEvent, new value: 'Test'</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>Test</td>

-</tr>

-<!--Change to normal-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>

-	<td>38,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>

-	<td>51,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item6</td>

-	<td>25,12</td>

-</tr>

-<tr>

-	<td>assertValue</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>Test</td>

-</tr>

-<!---->

-</tbody></table>

-</body>

-</html>

+<?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.textfield.TextFieldTest?restartApplication</td>
+	<td></td>
+</tr>
+<!--Disable event log-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item1</td>
+	<td>19,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>24,1</td>
+</tr>
+<!--Enter "s3cr3t" in the TextField-->
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>s3cr3t</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>normal</td>
+</tr>
+<!--Change to secret-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>
+	<td>38,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>
+	<td>51,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item6</td>
+	<td>25,12</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>secret</td>
+</tr>
+<!--Change to normal-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>
+	<td>38,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>
+	<td>51,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item6</td>
+	<td>25,12</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>normal</td>
+</tr>
+<!--Change to secret-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>
+	<td>38,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>
+	<td>51,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item6</td>
+	<td>25,12</td>
+</tr>
+<!--ValueChangeListener-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>
+	<td>38,13</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>30,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>62,12</td>
+</tr>
+<!--Enable and clear event log-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item1</td>
+	<td>19,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>24,1</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item1</td>
+	<td>19,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item1</td>
+	<td>24,1</td>
+</tr>
+<!--Value -> Test-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>
+	<td>21,2</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item4</td>
+	<td>24,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>37,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[2]/VMenuBar[0]#item2</td>
+	<td>37,4</td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>100</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>1. ValueChangeEvent, new value: 'Test'</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>Test</td>
+</tr>
+<!--Change to normal-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>
+	<td>38,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>
+	<td>51,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item6</td>
+	<td>25,12</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>Test</td>
+</tr>
+<!---->
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldTextChangeEvent.html b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldTextChangeEvent.html
index 6046cee607..ad98d72ce8 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldTextChangeEvent.html
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldTextChangeEvent.html
@@ -1,288 +1,288 @@
-<?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>

-<!-- Only works properly in Firefox and therefore named .htm instead of .html. Other browsers do not enter text with keydown,keypress,keyup combo. Cannot use pressSpecialKey either for some reason (not even in Firefox) -->

-<tr>

-	<td>open</td>

-	<td>/run/com.vaadin.tests.components.textfield.TextFieldTest?restartApplication</td>

-	<td></td>

-</tr>

-<!--Enable text change listener-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>

-	<td>37,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>

-	<td>36,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item4</td>

-	<td>73,6</td>

-</tr>

-<!--Eager mode-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>

-	<td>36,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>

-	<td>36,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item4</td>

-	<td>98,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>

-	<td>30,5</td>

-</tr>

-<!--Enter "abc" and ensure there is one event for each change-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>3,3</td>

-</tr>

-<tr>

-	<td>focus</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td></td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>100</td>

-	<td></td>

-</tr>

-<tr>

-	<td>keyPressNative</td>

-	<td>65</td>

-	<td></td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>200</td>

-	<td></td>

-</tr>

-<tr>

-	<td>keyPressNative</td>

-	<td>66</td>

-	<td></td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>200</td>

-	<td></td>

-</tr>

-<tr>

-	<td>keyPressNative</td>

-	<td>67</td>

-	<td></td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>200</td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[2]/VLabel[0]</td>

-	<td>2. TextChangeEvent: text='a', cursor position=1 (field cursor pos: 1)</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[1]/VLabel[0]</td>

-	<td>3. TextChangeEvent: text='ab', cursor position=2 (field cursor pos: 2)</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>4. TextChangeEvent: text='abc', cursor position=3 (field cursor pos: 3)</td>

-</tr>

-<!--Lazy mode-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>

-	<td>36,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>

-	<td>36,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item4</td>

-	<td>98,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[2]/VMenuBar[0]#item2</td>

-	<td>30,5</td>

-</tr>

-<!--Set timeout to 5s-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>

-	<td>11,14</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>

-	<td>28,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item5</td>

-	<td>74,12</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[2]/VMenuBar[0]#item5</td>

-	<td>49,15</td>

-</tr>

-<!--Enter "def" and ensure there is only one text change event-->

-<tr>

-	<td>focus</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td></td>

-</tr>

-<tr>

-	<td>keyPressNative</td>

-	<td>68</td>

-	<td></td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>1000</td>

-	<td></td>

-</tr>

-<tr>

-	<td>keyPressNative</td>

-	<td>69</td>

-	<td></td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>3000</td>

-	<td></td>

-</tr>

-<tr>

-	<td>keyPressNative</td>

-	<td>70</td>

-	<td></td>

-</tr>

-<!--Wait for the timeout-->

-<tr>

-	<td>pause</td>

-	<td>5000</td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>7. TextChangeEvent: text='abcdef', cursor position=6 (field cursor pos: 6)</td>

-</tr>

-<!--Clear the value-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td>-18,15</td>

-</tr>

-<tr>

-	<td>type</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>8. TextChangeEvent: text='', cursor position=0 (field cursor pos: 0)</td>

-</tr>

-<!--Timeout mode (5s)-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>

-	<td>41,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>

-	<td>28,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item4</td>

-	<td>110,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[2]/VMenuBar[0]#item1</td>

-	<td>33,9</td>

-</tr>

-<!--Slowly enter "def" and ensure there are several events (one after 500ms with de, another one afterwards with def)-->

-<tr>

-	<td>focus</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>

-	<td></td>

-</tr>

-<tr>

-	<td>keyPressNative</td>

-	<td>68</td>

-	<td></td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>4000</td>

-	<td></td>

-</tr>

-<tr>

-	<td>keyPressNative</td>

-	<td>69</td>

-	<td></td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>4000</td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>10. TextChangeEvent: text='de', cursor position=2 (field cursor pos: 2)</td>

-</tr>

-<tr>

-	<td>keyPressNative</td>

-	<td>70</td>

-	<td></td>

-</tr>

-<!--Wait for the timeout-->

-<tr>

-	<td>pause</td>

-	<td>6000</td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>11. TextChangeEvent: text='def', cursor position=3 (field cursor pos: 3)</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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>
+<!-- Only works properly in Firefox and therefore named .htm instead of .html. Other browsers do not enter text with keydown,keypress,keyup combo. Cannot use pressSpecialKey either for some reason (not even in Firefox) -->
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.textfield.TextFieldTest?restartApplication</td>
+	<td></td>
+</tr>
+<!--Enable text change listener-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>
+	<td>37,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>36,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item4</td>
+	<td>73,6</td>
+</tr>
+<!--Eager mode-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>
+	<td>36,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>
+	<td>36,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item4</td>
+	<td>98,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[2]/VMenuBar[0]#item0</td>
+	<td>30,5</td>
+</tr>
+<!--Enter "abc" and ensure there is one event for each change-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>3,3</td>
+</tr>
+<tr>
+	<td>focus</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>100</td>
+	<td></td>
+</tr>
+<tr>
+	<td>keyPressNative</td>
+	<td>65</td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>200</td>
+	<td></td>
+</tr>
+<tr>
+	<td>keyPressNative</td>
+	<td>66</td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>200</td>
+	<td></td>
+</tr>
+<tr>
+	<td>keyPressNative</td>
+	<td>67</td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>200</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[2]/VLabel[0]</td>
+	<td>2. TextChangeEvent: text='a', cursor position=1 (field cursor pos: 1)</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[1]/VLabel[0]</td>
+	<td>3. TextChangeEvent: text='ab', cursor position=2 (field cursor pos: 2)</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>4. TextChangeEvent: text='abc', cursor position=3 (field cursor pos: 3)</td>
+</tr>
+<!--Lazy mode-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>
+	<td>36,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>
+	<td>36,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item4</td>
+	<td>98,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[2]/VMenuBar[0]#item2</td>
+	<td>30,5</td>
+</tr>
+<!--Set timeout to 5s-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>
+	<td>11,14</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>
+	<td>28,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item5</td>
+	<td>74,12</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[2]/VMenuBar[0]#item5</td>
+	<td>49,15</td>
+</tr>
+<!--Enter "def" and ensure there is only one text change event-->
+<tr>
+	<td>focus</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td></td>
+</tr>
+<tr>
+	<td>keyPressNative</td>
+	<td>68</td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>1000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>keyPressNative</td>
+	<td>69</td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>3000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>keyPressNative</td>
+	<td>70</td>
+	<td></td>
+</tr>
+<!--Wait for the timeout-->
+<tr>
+	<td>pause</td>
+	<td>5000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>7. TextChangeEvent: text='abcdef', cursor position=6 (field cursor pos: 6)</td>
+</tr>
+<!--Clear the value-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td>-18,15</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>8. TextChangeEvent: text='', cursor position=0 (field cursor pos: 0)</td>
+</tr>
+<!--Timeout mode (5s)-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_Smenu#item0</td>
+	<td>41,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[0]/VMenuBar[0]#item5</td>
+	<td>28,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[1]/VMenuBar[0]#item4</td>
+	<td>110,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::Root/VOverlay[2]/VMenuBar[0]#item1</td>
+	<td>33,9</td>
+</tr>
+<!--Slowly enter "def" and ensure there are several events (one after 500ms with de, another one afterwards with def)-->
+<tr>
+	<td>focus</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_StestComponent</td>
+	<td></td>
+</tr>
+<tr>
+	<td>keyPressNative</td>
+	<td>68</td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>4000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>keyPressNative</td>
+	<td>69</td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>4000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>10. TextChangeEvent: text='de', cursor position=2 (field cursor pos: 2)</td>
+</tr>
+<tr>
+	<td>keyPressNative</td>
+	<td>70</td>
+	<td></td>
+</tr>
+<!--Wait for the timeout-->
+<tr>
+	<td>pause</td>
+	<td>6000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldTextFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>11. TextChangeEvent: text='def', cursor position=3 (field cursor pos: 3)</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/tree/ExpandCollapseTree.html b/tests/testbench/com/vaadin/tests/components/tree/ExpandCollapseTree.html
index 6ebb0c4cb3..8bb51204aa 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/ExpandCollapseTree.html
+++ b/tests/testbench/com/vaadin/tests/components/tree/ExpandCollapseTree.html
@@ -1,66 +1,66 @@
-<?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.tree.ExpandCollapseTree?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>initial</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeExpandCollapseTree::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTree[0]#n[2]/n[0]/n[0]/n[0]/expand</td>

-	<td>6,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeExpandCollapseTree::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTree[0]#n[2]/n[0]/n[0]/expand</td>

-	<td>9,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeExpandCollapseTree::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTree[0]#n[1]/expand</td>

-	<td>9,10</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>collapsed-1-6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeExpandCollapseTree::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTree[0]#n[2]/n[0]/n[0]/expand</td>

-	<td>9,9</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>collapsed-1-7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeExpandCollapseTree::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTree[0]#n[2]/n[0]/n[0]/n[0]/expand</td>

-	<td>8,9</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>collapsed-1</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.tree.ExpandCollapseTree?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>initial</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeExpandCollapseTree::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTree[0]#n[2]/n[0]/n[0]/n[0]/expand</td>
+	<td>6,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeExpandCollapseTree::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTree[0]#n[2]/n[0]/n[0]/expand</td>
+	<td>9,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeExpandCollapseTree::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTree[0]#n[1]/expand</td>
+	<td>9,10</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>collapsed-1-6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeExpandCollapseTree::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTree[0]#n[2]/n[0]/n[0]/expand</td>
+	<td>9,9</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>collapsed-1-7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeExpandCollapseTree::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTree[0]#n[2]/n[0]/n[0]/n[0]/expand</td>
+	<td>8,9</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>collapsed-1</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeContextMenuAndIcons.html b/tests/testbench/com/vaadin/tests/components/tree/TreeContextMenuAndIcons.html
index d3eaf3470e..6f9b5e81c3 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeContextMenuAndIcons.html
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeContextMenuAndIcons.html
@@ -1,156 +1,156 @@
-<?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.tree.Trees?restartApplication</td>

-	<td></td>

-</tr>

-<!--Hide event log-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTrees::PID_Smenu#item1</td>

-	<td>19,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[0]/VMenuBar[0]#item0</td>

-	<td>32,7</td>

-</tr>

-<!--Simple context menu-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTrees::PID_Smenu#item0</td>

-	<td>28,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[0]/VMenuBar[0]#item6</td>

-	<td>57,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[1]/VMenuBar[0]#item4</td>

-	<td>68,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[2]/VMenuBar[0]#item1</td>

-	<td>69,7</td>

-</tr>

-<tr>

-	<td>contextMenuAt</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTrees::PID_StestComponent#n[1]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>contextmenu-noicon</td>

-</tr>

-<!--Two actions, without and with icon-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTrees::PID_Smenu#item0</td>

-	<td>42,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[0]/VMenuBar[0]#item6</td>

-	<td>52,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[1]/VMenuBar[0]#item4</td>

-	<td>53,3</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[2]/VMenuBar[0]#item2</td>

-	<td>31,4</td>

-</tr>

-<tr>

-	<td>contextMenuAt</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTrees::PID_StestComponent#n[1]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>caption-only-and-has-icon</td>

-</tr>

-<!--Large icon-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTrees::PID_Smenu#item0</td>

-	<td>42,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[0]/VMenuBar[0]#item6</td>

-	<td>52,6</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[1]/VMenuBar[0]#item4</td>

-	<td>53,3</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[2]/VMenuBar[0]#item3</td>

-	<td>31,4</td>

-</tr>

-<tr>

-	<td>contextMenuAt</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTrees::PID_StestComponent#n[1]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>large-icon</td>

-</tr>

-<!--Simple context menu again to ensure it is properly updated (icons removed)-->

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTrees::PID_Smenu#item0</td>

-	<td>28,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[0]/VMenuBar[0]#item6</td>

-	<td>57,11</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[1]/VMenuBar[0]#item4</td>

-	<td>68,4</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[2]/VMenuBar[0]#item1</td>

-	<td>69,7</td>

-</tr>

-<tr>

-	<td>contextMenuAt</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTrees::PID_StestComponent#n[1]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>contextmenu-noicon</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.tree.Trees?restartApplication</td>
+	<td></td>
+</tr>
+<!--Hide event log-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTrees::PID_Smenu#item1</td>
+	<td>19,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>32,7</td>
+</tr>
+<!--Simple context menu-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTrees::PID_Smenu#item0</td>
+	<td>28,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[0]/VMenuBar[0]#item6</td>
+	<td>57,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[1]/VMenuBar[0]#item4</td>
+	<td>68,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[2]/VMenuBar[0]#item1</td>
+	<td>69,7</td>
+</tr>
+<tr>
+	<td>contextMenuAt</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTrees::PID_StestComponent#n[1]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>contextmenu-noicon</td>
+</tr>
+<!--Two actions, without and with icon-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTrees::PID_Smenu#item0</td>
+	<td>42,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[0]/VMenuBar[0]#item6</td>
+	<td>52,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[1]/VMenuBar[0]#item4</td>
+	<td>53,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[2]/VMenuBar[0]#item2</td>
+	<td>31,4</td>
+</tr>
+<tr>
+	<td>contextMenuAt</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTrees::PID_StestComponent#n[1]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>caption-only-and-has-icon</td>
+</tr>
+<!--Large icon-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTrees::PID_Smenu#item0</td>
+	<td>42,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[0]/VMenuBar[0]#item6</td>
+	<td>52,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[1]/VMenuBar[0]#item4</td>
+	<td>53,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[2]/VMenuBar[0]#item3</td>
+	<td>31,4</td>
+</tr>
+<tr>
+	<td>contextMenuAt</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTrees::PID_StestComponent#n[1]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>large-icon</td>
+</tr>
+<!--Simple context menu again to ensure it is properly updated (icons removed)-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTrees::PID_Smenu#item0</td>
+	<td>28,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[0]/VMenuBar[0]#item6</td>
+	<td>57,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[1]/VMenuBar[0]#item4</td>
+	<td>68,4</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTrees::Root/VOverlay[2]/VMenuBar[0]#item1</td>
+	<td>69,7</td>
+</tr>
+<tr>
+	<td>contextMenuAt</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTrees::PID_StestComponent#n[1]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>contextmenu-noicon</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.html b/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.html
index 06ae7600f7..2b08cdf865 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.html
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.html
@@ -1,81 +1,81 @@
-<?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://artur-laptop.office.itmill.com:8888/" />

-<title>New Test</title>

-</head>

-<body>

-<table cellpadding="1" cellspacing="1" border="1">

-<thead>

-<tr><td rowspan="1" colspan="3">TreeFiltering</td></tr>

-</thead><tbody>

-<tr>

-	<td>open</td>

-	<td>/run/com.vaadin.tests.components.tree.TreeFiltering?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>unfiltered</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>all-removed</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[8]/VButton[0]/domChild[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>unfiltered</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[5]/VButton[0]/domChild[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>filter-0</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VCheckBox[0]/domChild[0]</td>

-	<td>69,10</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>filter-0-no-parents</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VCheckBox[0]/domChild[0]</td>

-	<td>69,10</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>all-removed</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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://artur-laptop.office.itmill.com:8888/" />
+<title>New Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">TreeFiltering</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.tree.TreeFiltering?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>unfiltered</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>all-removed</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[8]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>unfiltered</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[5]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>filter-0</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VCheckBox[0]/domChild[0]</td>
+	<td>69,10</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>filter-0-no-parents</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VCheckBox[0]/domChild[0]</td>
+	<td>69,10</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>all-removed</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.html b/tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.html
index 55c5aacbda..880d52ed75 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.html
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.html
@@ -1,36 +1,36 @@
-<?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.tree.TreeScrolling?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>initial</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentstreeTreeScrolling::/VVerticalLayout[0]/ChildComponentContainer[2]/VTree[0]#n[0]/n[14]</td>

-	<td>67,8</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>selected-0-14</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.tree.TreeScrolling?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>initial</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstreeTreeScrolling::/VVerticalLayout[0]/ChildComponentContainer[2]/VTree[0]#n[0]/n[14]</td>
+	<td>67,8</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>selected-0-14</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/twincolselect/TwinColSelectSelection.html b/tests/testbench/com/vaadin/tests/components/twincolselect/TwinColSelectSelection.html
index c36b3922a2..a34a14eeef 100644
--- a/tests/testbench/com/vaadin/tests/components/twincolselect/TwinColSelectSelection.html
+++ b/tests/testbench/com/vaadin/tests/components/twincolselect/TwinColSelectSelection.html
@@ -1,132 +1,132 @@
-<?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.select.TwinColSelects?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>addSelection</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#leftSelect</td>

-	<td>label=5</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#add</td>

-	<td></td>

-</tr>

-<tr>

-	<td>addSelection</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#leftSelect</td>

-	<td>label=1</td>

-</tr>

-<tr>

-	<td>removeSelection</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#leftSelect</td>

-	<td>label=4</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#add</td>

-	<td></td>

-</tr>

-<tr>

-	<td>removeSelection</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#leftSelect</td>

-	<td>label=0</td>

-</tr>

-<tr>

-	<td>addSelection</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#leftSelect</td>

-	<td>label=8</td>

-</tr>

-<tr>

-	<td>addSelection</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#leftSelect</td>

-	<td>label=4</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#add</td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#rightSelect</td>

-	<td>5148</td>

-</tr>

-<tr>

-	<td>removeSelection</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#rightSelect</td>

-	<td>label=5</td>

-</tr>

-<tr>

-	<td>removeSelection</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#rightSelect</td>

-	<td>label=4</td>

-</tr>

-<tr>

-	<td>removeSelection</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#rightSelect</td>

-	<td>label=8</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#remove</td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#rightSelect</td>

-	<td>548</td>

-</tr>

-<tr>

-	<td>removeSelection</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#rightSelect</td>

-	<td>label=5</td>

-</tr>

-<tr>

-	<td>addSelection</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#rightSelect</td>

-	<td>label=8</td>

-</tr>

-<tr>

-	<td>addSelection</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#rightSelect</td>

-	<td>label=5</td>

-</tr>

-<tr>

-	<td>addSelection</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#rightSelect</td>

-	<td>label=4</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#remove</td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#rightSelect</td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#leftSelect</td>

-	<td>023679101112131415161718191548</td>

-</tr>

-

-</tbody></table>

-</body>

-</html>

+<?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.select.TwinColSelects?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>addSelection</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#leftSelect</td>
+	<td>label=5</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#add</td>
+	<td></td>
+</tr>
+<tr>
+	<td>addSelection</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#leftSelect</td>
+	<td>label=1</td>
+</tr>
+<tr>
+	<td>removeSelection</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#leftSelect</td>
+	<td>label=4</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#add</td>
+	<td></td>
+</tr>
+<tr>
+	<td>removeSelection</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#leftSelect</td>
+	<td>label=0</td>
+</tr>
+<tr>
+	<td>addSelection</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#leftSelect</td>
+	<td>label=8</td>
+</tr>
+<tr>
+	<td>addSelection</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#leftSelect</td>
+	<td>label=4</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#add</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#rightSelect</td>
+	<td>5148</td>
+</tr>
+<tr>
+	<td>removeSelection</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#rightSelect</td>
+	<td>label=5</td>
+</tr>
+<tr>
+	<td>removeSelection</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#rightSelect</td>
+	<td>label=4</td>
+</tr>
+<tr>
+	<td>removeSelection</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#rightSelect</td>
+	<td>label=8</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#remove</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#rightSelect</td>
+	<td>548</td>
+</tr>
+<tr>
+	<td>removeSelection</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#rightSelect</td>
+	<td>label=5</td>
+</tr>
+<tr>
+	<td>addSelection</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#rightSelect</td>
+	<td>label=8</td>
+</tr>
+<tr>
+	<td>addSelection</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#rightSelect</td>
+	<td>label=5</td>
+</tr>
+<tr>
+	<td>addSelection</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#rightSelect</td>
+	<td>label=4</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#remove</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#rightSelect</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsselectTwinColSelects::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTwinColSelect[0]#leftSelect</td>
+	<td>023679101112131415161718191548</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/window/ExtraLargeSubWindow.html b/tests/testbench/com/vaadin/tests/components/window/ExtraLargeSubWindow.html
index a679bd6f07..128e3c3583 100644
--- a/tests/testbench/com/vaadin/tests/components/window/ExtraLargeSubWindow.html
+++ b/tests/testbench/com/vaadin/tests/components/window/ExtraLargeSubWindow.html
@@ -1,27 +1,27 @@
-<?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://artur-laptop.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.window.ExtraLargeSubWindow</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>full-size</td>

-</tr>

-

-</tbody></table>

-</body>

-</html>

+<?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://artur-laptop.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.window.ExtraLargeSubWindow</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>full-size</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.html b/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.html
index 4881d0caf1..65e8b0166b 100644
--- a/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.html
+++ b/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.html
@@ -1,61 +1,61 @@
-<?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.window.ExtraWindowShown?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentswindowExtraWindowShown::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentswindowExtraWindowShown::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>1000</td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertElementNotPresent</td>

-	<td>vaadin=runcomvaadintestscomponentswindowExtraWindowShown::/VWindow[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentswindowExtraWindowShown::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentswindowExtraWindowShown::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>pause</td>

-	<td>1000</td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertElementNotPresent</td>

-	<td>vaadin=runcomvaadintestscomponentswindowExtraWindowShown::/VWindow[0]</td>

-	<td></td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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.window.ExtraWindowShown?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentswindowExtraWindowShown::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentswindowExtraWindowShown::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>1000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertElementNotPresent</td>
+	<td>vaadin=runcomvaadintestscomponentswindowExtraWindowShown::/VWindow[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentswindowExtraWindowShown::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentswindowExtraWindowShown::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>1000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertElementNotPresent</td>
+	<td>vaadin=runcomvaadintestscomponentswindowExtraWindowShown::/VWindow[0]</td>
+	<td></td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.html b/tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.html
index 4a41374e41..a7dc524d6d 100644
--- a/tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.html
+++ b/tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.html
@@ -1,77 +1,77 @@
-<?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>setSpeed</td>

-	<td>200</td>

-	<td>To avoid random failures</td>

-</tr>

-<tr>

-	<td>open</td>

-	<td>/run/com.vaadin.tests.components.window.WindowClickEvents?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::/VVerticalLayout[0]/domChild[0]/domChild[1]</td>

-	<td>154,150</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VLabel[0]</td>

-	<td>1. Click using left on Main window layout</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>2. Click using left on Main window</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]</td>

-	<td>188,16</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VLabel[0]</td>

-	<td>3. Click using left on Sub window layout</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>

-	<td>4. Click using left on Sub window</td>

-</tr>

-<!--Clicking on the button should not produce a window click event-->

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::PID_SLog_row_0</td>

-	<td>5. Click on button</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::PID_SLog_row_2</td>

-	<td>3. Click using left on Sub window layout</td>

-</tr>

-<tr>

-	<td>assertText</td>

-	<td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::PID_SLog_row_1</td>

-	<td>4. Click using left on Sub window</td>

-</tr>

-</tbody></table>

-</body>

-</html>

+<?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>setSpeed</td>
+	<td>200</td>
+	<td>To avoid random failures</td>
+</tr>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.window.WindowClickEvents?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::/VVerticalLayout[0]/domChild[0]/domChild[1]</td>
+	<td>154,150</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VLabel[0]</td>
+	<td>1. Click using left on Main window layout</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>2. Click using left on Main window</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]</td>
+	<td>188,16</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VLabel[0]</td>
+	<td>3. Click using left on Sub window layout</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>4. Click using left on Sub window</td>
+</tr>
+<!--Clicking on the button should not produce a window click event-->
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::PID_SLog_row_0</td>
+	<td>5. Click on button</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::PID_SLog_row_2</td>
+	<td>3. Click using left on Sub window layout</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentswindowWindowClickEvents::PID_SLog_row_1</td>
+	<td>4. Click using left on Sub window</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutMoveComponent.html b/tests/testbench/com/vaadin/tests/layouts/GridLayoutMoveComponent.html
index cde4341030..77a17263f8 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutMoveComponent.html
+++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutMoveComponent.html
@@ -1,57 +1,57 @@
-<?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.layouts.GridLayoutMoveComponent?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>all-left</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestslayoutsGridLayoutMoveComponent::/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>label-right</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestslayoutsGridLayoutMoveComponent::/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>label-button-right</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestslayoutsGridLayoutMoveComponent::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>label-button-textfield-right</td>

-</tr>

-

-</tbody></table>

-</body>

-</html>

+<?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.layouts.GridLayoutMoveComponent?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>all-left</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestslayoutsGridLayoutMoveComponent::/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>label-right</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestslayoutsGridLayoutMoveComponent::/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>label-button-right</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestslayoutsGridLayoutMoveComponent::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>label-button-textfield-right</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutWidthChange.html b/tests/testbench/com/vaadin/tests/layouts/GridLayoutWidthChange.html
index aaad92e56d..f01a1a7026 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutWidthChange.html
+++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutWidthChange.html
@@ -1,47 +1,47 @@
-<?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>GridLayoutWidthChange</title>

-</head>

-<body>

-<table cellpadding="1" cellspacing="1" border="1">

-<thead>

-<tr><td rowspan="1" colspan="3">GridLayoutWidthChange</td></tr>

-</thead><tbody>

-<tr>

-	<td>open</td>

-	<td>/run/com.vaadin.tests.layouts.GridLayoutWidthChange</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=runcomvaadintestslayoutsGridLayoutWidthChange::/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>

+<?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>GridLayoutWidthChange</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">GridLayoutWidthChange</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.layouts.GridLayoutWidthChange</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=runcomvaadintestslayoutsGridLayoutWidthChange::/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>
diff --git a/tests/testbench/com/vaadin/tests/layouts/MovingInvisibleField.html b/tests/testbench/com/vaadin/tests/layouts/MovingInvisibleField.html
index 84c2809382..a3f3f84dac 100644
--- a/tests/testbench/com/vaadin/tests/layouts/MovingInvisibleField.html
+++ b/tests/testbench/com/vaadin/tests/layouts/MovingInvisibleField.html
@@ -1,47 +1,47 @@
-<?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.layouts.MovingInvisibleField?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>one-field-above-button</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestslayoutsMovingInvisibleField::/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>one-field-below-button</td>

-</tr>

-<tr>

-	<td>click</td>

-	<td>vaadin=runcomvaadintestslayoutsMovingInvisibleField::/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>one-field-above-button</td>

-</tr>

-

-</tbody></table>

-</body>

-</html>

+<?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.layouts.MovingInvisibleField?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>one-field-above-button</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestslayoutsMovingInvisibleField::/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>one-field-below-button</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestslayoutsMovingInvisibleField::/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>one-field-above-button</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.html b/tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.html
index cd4c8756cc..e1034c2f0e 100644
--- a/tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.html
+++ b/tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.html
@@ -1,27 +1,27 @@
-<?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.layouts.TreeWithBordersInLayout?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>tree-with-borders</td>

-</tr>

-

-</tbody></table>

-</body>

-</html>

+<?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.layouts.TreeWithBordersInLayout?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>tree-with-borders</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.html b/tests/testbench/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.html
index 522c2981de..433ad04ada 100644
--- a/tests/testbench/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.html
+++ b/tests/testbench/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.html
@@ -1,133 +1,133 @@
-<?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.validation.ValidationOfRequiredEmptyFields?restartApplication</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>

-	<td>11,8</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTextField[0]</td>

-	<td>60,11</td>

-</tr>

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTextField[0]</td>

-	<td>The field is required</td>

-</tr>

-<tr>

-	<td>showTooltip</td>

-	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VTextField[0]</td>

-	<td>0,0</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>required-message</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VCheckBox[0]/domChild[0]</td>

-	<td>13,5</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VTextField[0]</td>

-	<td>28,13</td>

-</tr>

-<tr>

-	<td>enterCharacter</td>

-	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VTextField[0]</td>

-	<td>a</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/domChild[0]/domChild[1]</td>

-	<td>34,186</td>

-</tr>

-<tr>

-	<td>showTooltip</td>

-	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VTextField[0]</td>

-	<td>0,0</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>error-must-be-int</td>

-</tr>

-<!--  Dummy command to remove the tooltip -->

-<tr>

-	<td>showTooltip</td>

-	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VCheckBox[0]/domChild[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VCheckBox[0]/domChild[0]</td>

-	<td>45,9</td>

-</tr>

-<tr>

-	<td>showTooltip</td>

-	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VTextField[0]</td>

-	<td>0,0</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>error-must-be-int-and-5-to-10-chars</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VCheckBox[0]/domChild[0]</td>

-	<td>12,7</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VTextField[0]</td>

-	<td>124,12</td>

-</tr>

-<tr>

-	<td>type</td>

-	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VTextField[0]</td>

-	<td></td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>

-	<td>8,10</td>

-</tr>

-<tr>

-	<td>mouseClick</td>

-	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VCheckBox[0]/domChild[0]</td>

-	<td>13,7</td>

-</tr>

-<tr>

-	<td>showTooltip</td>

-	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VTextField[0]</td>

-	<td>0,0</td>

-</tr>

-<tr>

-	<td>screenCapture</td>

-	<td></td>

-	<td>empty-invalid-not-required</td>

-</tr>

-

-</tbody></table>

-</body>

-</html>

+<?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.validation.ValidationOfRequiredEmptyFields?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>
+	<td>11,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTextField[0]</td>
+	<td>60,11</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTextField[0]</td>
+	<td>The field is required</td>
+</tr>
+<tr>
+	<td>showTooltip</td>
+	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VTextField[0]</td>
+	<td>0,0</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>required-message</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VCheckBox[0]/domChild[0]</td>
+	<td>13,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VTextField[0]</td>
+	<td>28,13</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VTextField[0]</td>
+	<td>a</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/domChild[0]/domChild[1]</td>
+	<td>34,186</td>
+</tr>
+<tr>
+	<td>showTooltip</td>
+	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VTextField[0]</td>
+	<td>0,0</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>error-must-be-int</td>
+</tr>
+<!--  Dummy command to remove the tooltip -->
+<tr>
+	<td>showTooltip</td>
+	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VCheckBox[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VCheckBox[0]/domChild[0]</td>
+	<td>45,9</td>
+</tr>
+<tr>
+	<td>showTooltip</td>
+	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VTextField[0]</td>
+	<td>0,0</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>error-must-be-int-and-5-to-10-chars</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VCheckBox[0]/domChild[0]</td>
+	<td>12,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VTextField[0]</td>
+	<td>124,12</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VTextField[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>
+	<td>8,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VCheckBox[0]/domChild[0]</td>
+	<td>13,7</td>
+</tr>
+<tr>
+	<td>showTooltip</td>
+	<td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VTextField[0]</td>
+	<td>0,0</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>empty-invalid-not-required</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>