Move FieldGroup and Vaadin 7 Grid to compatibility package

Change-Id: I9aaef478e0b67462641239802b924b8461cb9225

117 files changed, 197 insertions, 175 deletions

diff --git a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java
index 5f75569509..9305758b02 100644
--- a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java
@@ -31,10 +31,10 @@ import elemental.json.JsonValue;
  * Generates type data for renderer connectors.
  * <ul>
  * <li>Stores the return type of the overridden
- * {@link AbstractRendererConnector#getRenderer() getRenderer} method to enable
- * automatic creation of an instance of the proper renderer type.
+ * {@link AbstractGridRendererConnector#getRenderer() getRenderer} method to
+ * enable automatic creation of an instance of the proper renderer type.
  * <li>Stores the presentation type of the connector to enable the
- * {@link AbstractRendererConnector#decode(elemental.json.JsonValue) decode}
+ * {@link AbstractGridRendererConnector#decode(elemental.json.JsonValue) decode}
  * method to work without having to implement a "getPresentationType" method.
  * </ul>
  *
@@ -63,11 +63,12 @@ public class RendererVisitor extends TypeVisitor {
         // Needs GWT constructor if createRenderer is not overridden
         if (createRendererClass.getQualifiedSourceName()
                 .equals(AbstractRendererConnector.class.getCanonicalName())) {
-
+            // createRenderer not overridden
             JMethod getRenderer = ConnectorBundle.findInheritedMethod(type,
                     "getRenderer");
             if (getRenderer.getEnclosingType().getQualifiedSourceName().equals(
                     AbstractRendererConnector.class.getCanonicalName())) {
+                // getRenderer not overridden
                 logger.log(Type.ERROR, type.getQualifiedSourceName()
                         + " must override either createRenderer or getRenderer");
                 throw new UnableToCompleteException();
@@ -84,7 +85,7 @@ public class RendererVisitor extends TypeVisitor {
         }
     }
 
-    private void doPresentationType(TreeLogger logger, JClassType type,
+    private static void doPresentationType(TreeLogger logger, JClassType type,
             ConnectorBundle bundle) throws UnableToCompleteException {
         JType presentationType = getPresentationType(type, logger);
         bundle.setPresentationType(type, presentationType);
diff --git a/client/src/main/java/com/vaadin/client/connectors/AbstractRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/AbstractRendererConnector.java
index 4f9ef980b8..989f10f266 100644
--- a/client/src/main/java/com/vaadin/client/connectors/AbstractRendererConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/AbstractRendererConnector.java
@@ -23,25 +23,14 @@ import com.vaadin.client.metadata.Type;
 import com.vaadin.client.metadata.TypeData;
 import com.vaadin.client.metadata.TypeDataStore;
 import com.vaadin.client.renderers.Renderer;
-import com.vaadin.client.widgets.Grid.Column;
 
-import elemental.json.JsonObject;
 import elemental.json.JsonValue;
 
 /**
- * An abstract base class for renderer connectors. A renderer connector is used
- * to link a client-side {@link Renderer} to a server-side
- * {@link com.vaadin.ui.components.grid.Renderer Renderer}. As a connector, it
- * can use the regular Vaadin RPC and shared state mechanism to pass additional
- * state and information between the client and the server. This base class
- * itself only uses the basic {@link com.vaadin.shared.communication.SharedState
- * SharedState} and no RPC interfaces.
+ * An abstract base class for renderer connectors.
  *
  * @param <T>
  *            the presentation type of the renderer
- *
- * @since 7.4
- * @author Vaadin Ltd
  */
 public abstract class AbstractRendererConnector<T>
         extends AbstractExtensionConnector {
@@ -136,46 +125,4 @@ public abstract class AbstractRendererConnector<T>
         // NOOP
     }
 
-    /**
-     * Gets the row key for a row object.
-     * <p>
-     * In case this renderer wants be able to identify a row in such a way that
-     * the server also understands it, the row key is used for that. Rows are
-     * identified by unified keys between the client and the server.
-     *
-     * @param row
-     *            the row object
-     * @return the row key for the given row
-     */
-    protected String getRowKey(JsonObject row) {
-        final ServerConnector parent = getParent();
-        if (parent instanceof GridConnector) {
-            return ((GridConnector) parent).getRowKey(row);
-        } else {
-            throw new IllegalStateException(
-                    "Renderers can only be used " + "with a Grid.");
-        }
-    }
-
-    /**
-     * Gets the column id for a column.
-     * <p>
-     * In case this renderer wants be able to identify a column in such a way
-     * that the server also understands it, the column id is used for that.
-     * Columns are identified by unified ids between the client and the server.
-     *
-     * @param column
-     *            the column object
-     * @return the column id for the given column
-     */
-    protected String getColumnId(Column<?, JsonObject> column) {
-        final ServerConnector parent = getParent();
-        if (parent instanceof GridConnector) {
-            return ((GridConnector) parent).getColumnId(column);
-        } else {
-            throw new IllegalStateException(
-                    "Renderers can only be used " + "with a Grid.");
-        }
-    }
-
 }
diff --git a/compatibility-client-compiled/pom.xml b/compatibility-client-compiled/pom.xml
index ebd405fe38..25e7d59369 100644
--- a/compatibility-client-compiled/pom.xml
+++ b/compatibility-client-compiled/pom.xml
@@ -12,7 +12,7 @@
 	<packaging>jar</packaging>
 
 	<properties>
-		<widgetset.name>com.vaadin.v7.Vaadin7WidgetSet</widgetset.name>
+		<widgetset.name>com.vaadin.Vaadin7WidgetSet</widgetset.name>
 		<widgetset.style>OBF</widgetset.style>
 		<widgetset.local.workers>6</widgetset.local.workers>
 	</properties>
diff --git a/compatibility-client/pom.xml b/compatibility-client/pom.xml
index 868dccf7d9..bab3989642 100644
--- a/compatibility-client/pom.xml
+++ b/compatibility-client/pom.xml
@@ -43,6 +43,33 @@
 				</executions>
 			</plugin>
 
+                        <plugin>
+                                <artifactId>maven-resources-plugin</artifactId>
+                                <executions>
+                                        <!-- Copy .java files to package -->
+                                        <execution>
+                                                <id>copy-sources</id>
+                                                <!-- here the phase you need -->
+                                                <phase>prepare-package</phase>
+                                                <goals>
+                                                        <goal>copy-resources</goal>
+                                                </goals>
+                                                <configuration>
+                                                        <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+                                                        <resources>
+                                                                <resource>
+                                                                        <directory>src/main/resources</directory>
+                                                                        <filtering>false</filtering>
+                                                                </resource>
+                                                                <resource>
+                                                                        <directory>src/main/java</directory>
+                                                                        <filtering>false</filtering>
+                                                                </resource>
+                                                        </resources>
+                                                </configuration>
+                                        </execution>
+                                </executions>
+                        </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/AbstractGridRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/AbstractGridRendererConnector.java
new file mode 100644
index 0000000000..7824e41dd7
--- /dev/null
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/AbstractGridRendererConnector.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2000-2016 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.client.connectors;
+
+import com.vaadin.client.ServerConnector;
+import com.vaadin.client.renderers.Renderer;
+import com.vaadin.client.widgets.Grid.Column;
+
+import elemental.json.JsonObject;
+
+/**
+ * An abstract base class for renderer connectors. A renderer connector is used
+ * to link a client-side {@link Renderer} to a server-side
+ * {@link com.vaadin.ui.components.grid.Renderer Renderer}. As a connector, it
+ * can use the regular Vaadin RPC and shared state mechanism to pass additional
+ * state and information between the client and the server. This base class
+ * itself only uses the basic {@link com.vaadin.shared.communication.SharedState
+ * SharedState} and no RPC interfaces.
+ *
+ * @param <T>
+ *            the presentation type of the renderer
+ *
+ * @since 7.4
+ * @author Vaadin Ltd
+ */
+public abstract class AbstractGridRendererConnector<T>
+        extends AbstractRendererConnector<T> {
+
+    /**
+     * Gets the row key for a row object.
+     * <p>
+     * In case this renderer wants be able to identify a row in such a way that
+     * the server also understands it, the row key is used for that. Rows are
+     * identified by unified keys between the client and the server.
+     *
+     * @param row
+     *            the row object
+     * @return the row key for the given row
+     */
+    protected String getRowKey(JsonObject row) {
+        final ServerConnector parent = getParent();
+        if (parent instanceof GridConnector) {
+            return ((GridConnector) parent).getRowKey(row);
+        } else {
+            throw new IllegalStateException(
+                    "Renderers can only be used " + "with a Grid.");
+        }
+    }
+
+    /**
+     * Gets the column id for a column.
+     * <p>
+     * In case this renderer wants be able to identify a column in such a way
+     * that the server also understands it, the column id is used for that.
+     * Columns are identified by unified ids between the client and the server.
+     *
+     * @param column
+     *            the column object
+     * @return the column id for the given column
+     */
+    protected String getColumnId(Column<?, JsonObject> column) {
+        final ServerConnector parent = getParent();
+        if (parent instanceof GridConnector) {
+            return ((GridConnector) parent).getColumnId(column);
+        } else {
+            throw new IllegalStateException(
+                    "Renderers can only be used " + "with a Grid.");
+        }
+    }
+
+}
diff --git a/client/src/main/java/com/vaadin/client/connectors/AbstractSelectionModelConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/AbstractSelectionModelConnector.java
index 75664d04f9..75664d04f9 100644
--- a/client/src/main/java/com/vaadin/client/connectors/AbstractSelectionModelConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/AbstractSelectionModelConnector.java
diff --git a/client/src/main/java/com/vaadin/client/connectors/ButtonRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/ButtonRendererConnector.java
index fad8918c92..fad8918c92 100644
--- a/client/src/main/java/com/vaadin/client/connectors/ButtonRendererConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/ButtonRendererConnector.java
diff --git a/client/src/main/java/com/vaadin/client/connectors/ClickableRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/ClickableRendererConnector.java
index 770b149daf..89549bc2bc 100644
--- a/client/src/main/java/com/vaadin/client/connectors/ClickableRendererConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/ClickableRendererConnector.java
@@ -34,7 +34,7 @@ import elemental.json.JsonObject;
  * @author Vaadin Ltd
  */
 public abstract class ClickableRendererConnector<T>
-        extends AbstractRendererConnector<T> {
+        extends AbstractGridRendererConnector<T> {
 
     HandlerRegistration clickRegistration;
 
diff --git a/client/src/main/java/com/vaadin/client/connectors/DateRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/DateRendererConnector.java
index 4b8c3872da..4b8c3872da 100644
--- a/client/src/main/java/com/vaadin/client/connectors/DateRendererConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/DateRendererConnector.java
diff --git a/client/src/main/java/com/vaadin/client/connectors/DetailComponentManagerConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/DetailComponentManagerConnector.java
index 000a24af00..000a24af00 100644
--- a/client/src/main/java/com/vaadin/client/connectors/DetailComponentManagerConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/DetailComponentManagerConnector.java
diff --git a/client/src/main/java/com/vaadin/client/connectors/GridConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/GridConnector.java
index 5ad90b7a45..045f51f508 100644
--- a/client/src/main/java/com/vaadin/client/connectors/GridConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/GridConnector.java
@@ -95,8 +95,8 @@ import com.vaadin.shared.ui.grid.GridStaticSectionState;
 import com.vaadin.shared.ui.grid.GridStaticSectionState.CellState;
 import com.vaadin.shared.ui.grid.GridStaticSectionState.RowState;
 import com.vaadin.shared.ui.grid.ScrollDestination;
-
 import com.vaadin.ui.LegacyGrid;
+
 import elemental.json.JsonObject;
 import elemental.json.JsonValue;
 
@@ -161,14 +161,14 @@ public class GridConnector extends AbstractHasComponentsConnector
 
         private final String id;
 
-        private AbstractRendererConnector<Object> rendererConnector;
+        private AbstractGridRendererConnector<Object> rendererConnector;
 
         private AbstractComponentConnector editorConnector;
 
         private HandlerRegistration errorStateHandler;
 
         public CustomGridColumn(String id,
-                AbstractRendererConnector<Object> rendererConnector) {
+                AbstractGridRendererConnector<Object> rendererConnector) {
             super(rendererConnector.getRenderer());
             this.rendererConnector = rendererConnector;
             this.id = id;
@@ -181,7 +181,7 @@ public class GridConnector extends AbstractHasComponentsConnector
          *            a renderer connector object
          */
         public void setRenderer(
-                AbstractRendererConnector<Object> rendererConnector) {
+                AbstractGridRendererConnector<Object> rendererConnector) {
             setRenderer(rendererConnector.getRenderer());
             this.rendererConnector = rendererConnector;
         }
@@ -1050,7 +1050,7 @@ public class GridConnector extends AbstractHasComponentsConnector
     private void addColumnFromStateChangeEvent(GridColumnState state) {
         @SuppressWarnings("unchecked")
         CustomGridColumn column = new CustomGridColumn(state.id,
-                ((AbstractRendererConnector<Object>) state.rendererConnector));
+                ((AbstractGridRendererConnector<Object>) state.rendererConnector));
         columnIdToColumn.put(state.id, column);
 
         /*
@@ -1076,9 +1076,9 @@ public class GridConnector extends AbstractHasComponentsConnector
         column.setMaximumWidth(state.maxWidth);
         column.setExpandRatio(state.expandRatio);
 
-        assert state.rendererConnector instanceof AbstractRendererConnector : "GridColumnState.rendererConnector is invalid (not subclass of AbstractRendererConnector)";
+        assert state.rendererConnector instanceof AbstractGridRendererConnector : "GridColumnState.rendererConnector is invalid (not subclass of AbstractGridRendererConnector)";
         column.setRenderer(
-                (AbstractRendererConnector<Object>) state.rendererConnector);
+                (AbstractGridRendererConnector<Object>) state.rendererConnector);
 
         column.setSortable(state.sortable);
 
diff --git a/client/src/main/java/com/vaadin/client/connectors/ImageRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/ImageRendererConnector.java
index 7949eeab3c..7949eeab3c 100644
--- a/client/src/main/java/com/vaadin/client/connectors/ImageRendererConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/ImageRendererConnector.java
diff --git a/client/src/main/java/com/vaadin/client/connectors/JavaScriptRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/JavaScriptRendererConnector.java
index 0194678ef1..1515f1aead 100644
--- a/client/src/main/java/com/vaadin/client/connectors/JavaScriptRendererConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/JavaScriptRendererConnector.java
@@ -45,7 +45,7 @@ import elemental.json.JsonValue;
 // are not always instanceof JsonValue, we need to accept Object
 @Connect(AbstractJavaScriptRenderer.class)
 public class JavaScriptRendererConnector
-        extends AbstractRendererConnector<Object>
+        extends AbstractGridRendererConnector<Object>
         implements HasJavaScriptConnectorHelper {
     private final JavaScriptConnectorHelper helper = new JavaScriptConnectorHelper(
             this);
diff --git a/client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java
index e7494737cb..e7494737cb 100644
--- a/client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java
diff --git a/client/src/main/java/com/vaadin/client/connectors/NoSelectionModelConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/NoSelectionModelConnector.java
index 1a080f5082..1a080f5082 100644
--- a/client/src/main/java/com/vaadin/client/connectors/NoSelectionModelConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/NoSelectionModelConnector.java
diff --git a/client/src/main/java/com/vaadin/client/connectors/NumberRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/NumberRendererConnector.java
index ff16047b0d..ff16047b0d 100644
--- a/client/src/main/java/com/vaadin/client/connectors/NumberRendererConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/NumberRendererConnector.java
diff --git a/client/src/main/java/com/vaadin/client/connectors/ProgressBarRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/ProgressBarRendererConnector.java
index e298c423e7..5687d031aa 100644
--- a/client/src/main/java/com/vaadin/client/connectors/ProgressBarRendererConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/ProgressBarRendererConnector.java
@@ -26,7 +26,7 @@ import com.vaadin.shared.ui.Connect;
  */
 @Connect(com.vaadin.ui.renderers.ProgressBarRenderer.class)
 public class ProgressBarRendererConnector
-        extends AbstractRendererConnector<Double> {
+        extends AbstractGridRendererConnector<Double> {
 
     @Override
     public ProgressBarRenderer getRenderer() {
diff --git a/client/src/main/java/com/vaadin/client/connectors/RpcDataSourceConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/RpcDataSourceConnector.java
index 52fa8a2e48..52fa8a2e48 100644
--- a/client/src/main/java/com/vaadin/client/connectors/RpcDataSourceConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/RpcDataSourceConnector.java
diff --git a/client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java
index 980c4458d4..980c4458d4 100644
--- a/client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java
diff --git a/client/src/main/java/com/vaadin/client/connectors/TextRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/TextRendererConnector.java
index d0fbe3c010..d3a289ec3e 100644
--- a/client/src/main/java/com/vaadin/client/connectors/TextRendererConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/TextRendererConnector.java
@@ -25,7 +25,7 @@ import com.vaadin.shared.ui.Connect;
  * @author Vaadin Ltd
  */
 @Connect(com.vaadin.ui.renderers.TextRenderer.class)
-public class TextRendererConnector extends AbstractRendererConnector<String> {
+public class TextRendererConnector extends AbstractGridRendererConnector<String> {
 
     @Override
     public TextRenderer getRenderer() {
diff --git a/client/src/main/java/com/vaadin/client/connectors/UnsafeHtmlRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/UnsafeHtmlRendererConnector.java
index a26627a2ba..95c47dd242 100644
--- a/client/src/main/java/com/vaadin/client/connectors/UnsafeHtmlRendererConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/UnsafeHtmlRendererConnector.java
@@ -27,7 +27,7 @@ import com.vaadin.shared.ui.Connect;
  */
 @Connect(com.vaadin.ui.renderers.HtmlRenderer.class)
 public class UnsafeHtmlRendererConnector
-        extends AbstractRendererConnector<String> {
+        extends AbstractGridRendererConnector<String> {
 
     public static class UnsafeHtmlRenderer implements Renderer<String> {
         @Override
diff --git a/compatibility-client/src/main/resources/com/vaadin/v7/Vaadin7WidgetSet.gwt.xml b/compatibility-client/src/main/resources/com/vaadin/Vaadin7WidgetSet.gwt.xml
index e124491d3a..e124491d3a 100755
--- a/compatibility-client/src/main/resources/com/vaadin/v7/Vaadin7WidgetSet.gwt.xml
+++ b/compatibility-client/src/main/resources/com/vaadin/Vaadin7WidgetSet.gwt.xml
diff --git a/compatibility-server/pom.xml b/compatibility-server/pom.xml
index 713c39c055..38dcc07f21 100644
--- a/compatibility-server/pom.xml
+++ b/compatibility-server/pom.xml
@@ -23,10 +23,27 @@
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-server</artifactId>
+			<version>${project.version}</version>
+			<classifier>tests</classifier>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>vaadin-compatibility-shared</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<!-- Bean Validation API -->
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java b/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java
index 96e4621761..96e4621761 100644
--- a/server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java
diff --git a/server/src/main/java/com/vaadin/data/fieldgroup/Caption.java b/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/Caption.java
index d752aa78d2..d752aa78d2 100644
--- a/server/src/main/java/com/vaadin/data/fieldgroup/Caption.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/Caption.java
diff --git a/server/src/main/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java b/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java
index 24c97eedc5..24c97eedc5 100644
--- a/server/src/main/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java
diff --git a/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroup.java b/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/FieldGroup.java
index 1254009cfc..1254009cfc 100644
--- a/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroup.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/FieldGroup.java
diff --git a/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java b/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java
index a80d51c6df..a80d51c6df 100644
--- a/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java
diff --git a/server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java b/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java
index a2a8aa27af..a2a8aa27af 100644
--- a/server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java
diff --git a/server/src/main/java/com/vaadin/server/communication/data/DataGenerator.java b/compatibility-server/src/main/java/com/vaadin/server/communication/data/DataGenerator.java
index f7459a7dd3..f7459a7dd3 100644
--- a/server/src/main/java/com/vaadin/server/communication/data/DataGenerator.java
+++ b/compatibility-server/src/main/java/com/vaadin/server/communication/data/DataGenerator.java
diff --git a/server/src/main/java/com/vaadin/server/communication/data/RpcDataProviderExtension.java b/compatibility-server/src/main/java/com/vaadin/server/communication/data/RpcDataProviderExtension.java
index 341c3f1a45..341c3f1a45 100644
--- a/server/src/main/java/com/vaadin/server/communication/data/RpcDataProviderExtension.java
+++ b/compatibility-server/src/main/java/com/vaadin/server/communication/data/RpcDataProviderExtension.java
diff --git a/server/src/main/java/com/vaadin/ui/LegacyGrid.java b/compatibility-server/src/main/java/com/vaadin/ui/LegacyGrid.java
index 9a98593b83..9a98593b83 100644
--- a/server/src/main/java/com/vaadin/ui/LegacyGrid.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/LegacyGrid.java
diff --git a/server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java b/compatibility-server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java
index 63c6f5aeaf..63c6f5aeaf 100644
--- a/server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java
diff --git a/server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java b/compatibility-server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java
index 7a87f8f4c1..7a87f8f4c1 100644
--- a/server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java
diff --git a/server/src/main/java/com/vaadin/ui/renderers/ClickableRenderer.java b/compatibility-server/src/main/java/com/vaadin/ui/renderers/ClickableRenderer.java
index d8fcdc3b4e..d8fcdc3b4e 100644
--- a/server/src/main/java/com/vaadin/ui/renderers/ClickableRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/renderers/ClickableRenderer.java
diff --git a/server/src/main/java/com/vaadin/ui/renderers/DateRenderer.java b/compatibility-server/src/main/java/com/vaadin/ui/renderers/DateRenderer.java
index eea18e7445..eea18e7445 100644
--- a/server/src/main/java/com/vaadin/ui/renderers/DateRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/renderers/DateRenderer.java
diff --git a/server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.java b/compatibility-server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.java
index c197f7415a..c197f7415a 100644
--- a/server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.java
diff --git a/server/src/main/java/com/vaadin/ui/renderers/ImageRenderer.java b/compatibility-server/src/main/java/com/vaadin/ui/renderers/ImageRenderer.java
index 56e319b47d..56e319b47d 100644
--- a/server/src/main/java/com/vaadin/ui/renderers/ImageRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/renderers/ImageRenderer.java
diff --git a/server/src/main/java/com/vaadin/ui/renderers/NumberRenderer.java b/compatibility-server/src/main/java/com/vaadin/ui/renderers/NumberRenderer.java
index e54eecc6ef..e54eecc6ef 100644
--- a/server/src/main/java/com/vaadin/ui/renderers/NumberRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/renderers/NumberRenderer.java
diff --git a/server/src/main/java/com/vaadin/ui/renderers/ProgressBarRenderer.java b/compatibility-server/src/main/java/com/vaadin/ui/renderers/ProgressBarRenderer.java
index fe90dfdee0..fe90dfdee0 100644
--- a/server/src/main/java/com/vaadin/ui/renderers/ProgressBarRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/renderers/ProgressBarRenderer.java
diff --git a/server/src/main/java/com/vaadin/ui/renderers/Renderer.java b/compatibility-server/src/main/java/com/vaadin/ui/renderers/Renderer.java
index d42e299ea8..d42e299ea8 100644
--- a/server/src/main/java/com/vaadin/ui/renderers/Renderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/renderers/Renderer.java
diff --git a/server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java b/compatibility-server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java
index ac73615272..ac73615272 100644
--- a/server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java
diff --git a/server/src/test/java/com/vaadin/data/fieldgroup/BeanFieldGroupTest.java b/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/BeanFieldGroupTest.java
index 3333cd7744..3333cd7744 100644
--- a/server/src/test/java/com/vaadin/data/fieldgroup/BeanFieldGroupTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/BeanFieldGroupTest.java
diff --git a/server/src/test/java/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java b/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java
index 013d14c27d..93aa1350b0 100644
--- a/server/src/test/java/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data;
+package com.vaadin.data.fieldgroup;
 
 import java.lang.reflect.Constructor;
 import java.util.Date;
diff --git a/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupDateTest.java b/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupDateTest.java
index e270211abf..e270211abf 100644
--- a/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupDateTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupDateTest.java
diff --git a/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupExceptionTest.java b/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupExceptionTest.java
index 4622f0960e..4622f0960e 100644
--- a/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupExceptionTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupExceptionTest.java
diff --git a/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupTest.java b/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupTest.java
index c0039fc4fb..c0039fc4fb 100644
--- a/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/AbstractBeanContainerTestBase.java b/compatibility-server/src/test/java/com/vaadin/data/util/AbstractBeanContainerTestBase.java
index 4a9e4f9891..4a9e4f9891 100644
--- a/server/src/test/java/com/vaadin/data/util/AbstractBeanContainerTestBase.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/AbstractBeanContainerTestBase.java
diff --git a/server/src/test/java/com/vaadin/data/util/AbstractContainerTestBase.java b/compatibility-server/src/test/java/com/vaadin/data/util/AbstractContainerTestBase.java
index 955b609735..955b609735 100644
--- a/server/src/test/java/com/vaadin/data/util/AbstractContainerTestBase.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/AbstractContainerTestBase.java
diff --git a/server/src/test/java/com/vaadin/data/util/AbstractHierarchicalContainerTestBase.java b/compatibility-server/src/test/java/com/vaadin/data/util/AbstractHierarchicalContainerTestBase.java
index f3eda74100..f3eda74100 100644
--- a/server/src/test/java/com/vaadin/data/util/AbstractHierarchicalContainerTestBase.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/AbstractHierarchicalContainerTestBase.java
diff --git a/server/src/test/java/com/vaadin/data/util/AbstractInMemoryContainerTestBase.java b/compatibility-server/src/test/java/com/vaadin/data/util/AbstractInMemoryContainerTestBase.java
index 3858504bc7..3858504bc7 100644
--- a/server/src/test/java/com/vaadin/data/util/AbstractInMemoryContainerTestBase.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/AbstractInMemoryContainerTestBase.java
diff --git a/server/src/test/java/com/vaadin/data/util/BeanContainerTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/BeanContainerTest.java
index bdf6ba1958..bdf6ba1958 100644
--- a/server/src/test/java/com/vaadin/data/util/BeanContainerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/BeanContainerTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/BeanItemContainerGenerator.java b/compatibility-server/src/test/java/com/vaadin/data/util/BeanItemContainerGenerator.java
index a5bdcc7cf9..a5bdcc7cf9 100644
--- a/server/src/test/java/com/vaadin/data/util/BeanItemContainerGenerator.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/BeanItemContainerGenerator.java
diff --git a/server/src/test/java/com/vaadin/data/util/BeanItemContainerSortTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/BeanItemContainerSortTest.java
index 4f4e35258f..4f4e35258f 100644
--- a/server/src/test/java/com/vaadin/data/util/BeanItemContainerSortTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/BeanItemContainerSortTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/BeanItemContainerTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/BeanItemContainerTest.java
index 19b0835fd6..19b0835fd6 100644
--- a/server/src/test/java/com/vaadin/data/util/BeanItemContainerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/BeanItemContainerTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/BeanItemTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/BeanItemTest.java
index 1bbe74818c..1bbe74818c 100644
--- a/server/src/test/java/com/vaadin/data/util/BeanItemTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/BeanItemTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/ContainerHierarchicalWrapperTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/ContainerHierarchicalWrapperTest.java
index e41f751bfd..e41f751bfd 100644
--- a/server/src/test/java/com/vaadin/data/util/ContainerHierarchicalWrapperTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/ContainerHierarchicalWrapperTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/ContainerOrderedWrapperTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/ContainerOrderedWrapperTest.java
index c3a8b2c4f9..c3a8b2c4f9 100644
--- a/server/src/test/java/com/vaadin/data/util/ContainerOrderedWrapperTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/ContainerOrderedWrapperTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/ContainerSizeAssertTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/ContainerSizeAssertTest.java
index 58cb2b1d27..58cb2b1d27 100644
--- a/server/src/test/java/com/vaadin/data/util/ContainerSizeAssertTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/ContainerSizeAssertTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/ContainerSortingTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/ContainerSortingTest.java
index 1c4dc1de5e..1c4dc1de5e 100644
--- a/server/src/test/java/com/vaadin/data/util/ContainerSortingTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/ContainerSortingTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/FileSystemContainerTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/FileSystemContainerTest.java
index 992b265702..992b265702 100644
--- a/server/src/test/java/com/vaadin/data/util/FileSystemContainerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/FileSystemContainerTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerBasicTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerBasicTest.java
index 11335314f0..11335314f0 100644
--- a/server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerBasicTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerBasicTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerTest.java
index 1e34567439..1e34567439 100644
--- a/server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapperTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapperTest.java
index 54984f07ad..54984f07ad 100644
--- a/server/src/test/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapperTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapperTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/HierarchicalContainerTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/HierarchicalContainerTest.java
index 7ab20ca3dd..7ab20ca3dd 100644
--- a/server/src/test/java/com/vaadin/data/util/HierarchicalContainerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/HierarchicalContainerTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/IndexedContainerTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/IndexedContainerTest.java
index b19a425518..b19a425518 100644
--- a/server/src/test/java/com/vaadin/data/util/IndexedContainerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/IndexedContainerTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/MethodPropertyMemoryConsumptionTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/MethodPropertyMemoryConsumptionTest.java
index 6776021c24..6776021c24 100644
--- a/server/src/test/java/com/vaadin/data/util/MethodPropertyMemoryConsumptionTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/MethodPropertyMemoryConsumptionTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/NestedMethodPropertyTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/NestedMethodPropertyTest.java
index 4a1e2a1784..4a1e2a1784 100644
--- a/server/src/test/java/com/vaadin/data/util/NestedMethodPropertyTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/NestedMethodPropertyTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/ObjectPropertyTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/ObjectPropertyTest.java
index e0307034cf..e0307034cf 100644
--- a/server/src/test/java/com/vaadin/data/util/ObjectPropertyTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/ObjectPropertyTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/PerformanceTestIndexedContainerTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/PerformanceTestIndexedContainerTest.java
index 5f64c0e8d8..5f64c0e8d8 100644
--- a/server/src/test/java/com/vaadin/data/util/PerformanceTestIndexedContainerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/PerformanceTestIndexedContainerTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/PropertyDescriptorTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/PropertyDescriptorTest.java
index af9db229c5..af9db229c5 100644
--- a/server/src/test/java/com/vaadin/data/util/PropertyDescriptorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/PropertyDescriptorTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/PropertySetItemTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/PropertySetItemTest.java
index fc91a20dd0..fc91a20dd0 100644
--- a/server/src/test/java/com/vaadin/data/util/PropertySetItemTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/PropertySetItemTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/ReflectToolsGetSuperFieldTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/ReflectToolsGetSuperFieldTest.java
index df4258f316..df4258f316 100644
--- a/server/src/test/java/com/vaadin/data/util/ReflectToolsGetSuperFieldTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/ReflectToolsGetSuperFieldTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/TransactionalPropertyWrapperTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/TransactionalPropertyWrapperTest.java
index ef3e416f96..ef3e416f96 100644
--- a/server/src/test/java/com/vaadin/data/util/TransactionalPropertyWrapperTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/TransactionalPropertyWrapperTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/ContextClickListenerTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/ContextClickListenerTest.java
index 1b93a3063d..1b93a3063d 100644
--- a/server/src/test/java/com/vaadin/tests/server/ContextClickListenerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/ContextClickListenerTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java
index f5c315b440..f5c315b440 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java
index a324c02cfc..a324c02cfc 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java
index 43d2bf8a6a..43d2bf8a6a 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupWithReadOnlyPropertiesTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupWithReadOnlyPropertiesTest.java
index f14b966a2d..f14b966a2d 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupWithReadOnlyPropertiesTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupWithReadOnlyPropertiesTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java
index 0ef30316ac..0ef30316ac 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridAddRowBuiltinContainerTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridAddRowBuiltinContainerTest.java
index 3bff93c042..3bff93c042 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridAddRowBuiltinContainerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridAddRowBuiltinContainerTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java
index f126e636ba..f126e636ba 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java
index 1af2577fa3..1af2577fa3 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java
index 570e9b92fc..570e9b92fc 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java
index fa6c57df93..fa6c57df93 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java
index 7b07aefcb2..7b07aefcb2 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java
index 15daa264d9..15daa264d9 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java
index 452d2713a4..452d2713a4 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java
index 7e910d2428..7e910d2428 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridStateTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridStateTest.java
index 9f5f67d8be..9f5f67d8be 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridStateTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridStateTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java
index 7a8209d50b..7a8209d50b 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java
index 1199486742..1199486742 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/SingleSelectionModelTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/SingleSelectionModelTest.java
index 3183ad9021..3183ad9021 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/SingleSelectionModelTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/SingleSelectionModelTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/TestGrid.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/TestGrid.java
index 9b2dde4d24..9b2dde4d24 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/TestGrid.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/TestGrid.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java
index 71d24a2d8e..71d24a2d8e 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java
index 8ca99327dc..8ca99327dc 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java
index 3e97910be7..3e97910be7 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java
index 1207063c16..1207063c16 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java
index f5b98824cd..f5b98824cd 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java
index b55b0815f8..b55b0815f8 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/sort/SortTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/sort/SortTest.java
index beb774528f..beb774528f 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/sort/SortTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/sort/SortTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/renderer/ImageRendererTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/renderer/ImageRendererTest.java
index 822a2353ac..822a2353ac 100644
--- a/server/src/test/java/com/vaadin/tests/server/renderer/ImageRendererTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/renderer/ImageRendererTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/renderer/RendererTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/renderer/RendererTest.java
index 5eec5b6ea8..5eec5b6ea8 100644
--- a/server/src/test/java/com/vaadin/tests/server/renderer/RendererTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/renderer/RendererTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/validation/BeanValidationTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/validation/BeanValidationTest.java
index a8e6238d4b..a8e6238d4b 100644
--- a/server/src/test/java/com/vaadin/tests/server/validation/BeanValidationTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/validation/BeanValidationTest.java
diff --git a/server/src/test/java/com/vaadin/ui/TableTest.java b/compatibility-server/src/test/java/com/vaadin/ui/TableTest.java
index f09313f685..f09313f685 100644
--- a/server/src/test/java/com/vaadin/ui/TableTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/ui/TableTest.java
diff --git a/ivysettings.xml b/ivysettings.xml
index 6cb125ddd3..4a0c3f5ff8 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -41,14 +41,22 @@
             resolver="vaadin-maven" />
         <module organisation="com.vaadin" name="vaadin-shared"
             resolver="vaadin-maven" />
+        <module organisation="com.vaadin" name="vaadin-compatibility-shared"
+            resolver="vaadin-maven" />
         <module organisation="com.vaadin" name="vaadin-server"
             resolver="vaadin-maven" />
+        <module organisation="com.vaadin" name="vaadin-compatibility-server"
+            resolver="vaadin-maven" />
         <module organisation="com.vaadin" name="vaadin-client"
             resolver="vaadin-maven" />
+        <module organisation="com.vaadin" name="vaadin-compatibility-client"
+            resolver="vaadin-maven" />
         <module organisation="com.vaadin" name="vaadin-client-compiler"
             resolver="vaadin-maven" />
         <module organisation="com.vaadin" name="vaadin-client-compiled"
             resolver="vaadin-maven" />
+        <module organisation="com.vaadin" name="vaadin-compatibility-client-compiled"
+            resolver="vaadin-maven" />
         <module organisation="com.vaadin" name="vaadin-themes"
             resolver="vaadin-maven" />
         <module organisation="com.vaadin" name="vaadin-push"
diff --git a/server/pom.xml b/server/pom.xml
index c82f024a0d..303d40df8a 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -222,6 +222,15 @@
 						</manifest>
 					</archive>
 				</configuration>
+				<!-- Package src/test into a jar so that compatbility-server can use
+					the same test classes, e.g. test beans -->
+				<executions>
+					<execution>
+						<goals>
+							<goal>test-jar</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 
 			<plugin>
diff --git a/uitest/ivy.xml b/uitest/ivy.xml
index c926e4105a..2a7bbff47f 100644
--- a/uitest/ivy.xml
+++ b/uitest/ivy.xml
@@ -39,15 +39,29 @@
             <exclude org="javax.servlet"></exclude>
             <exclude type="pom" />
         </dependency>
+        <dependency org="com.vaadin" name="vaadin-compatibility-server"
+            rev="${vaadin.version}" conf="build->default">
+            <exclude org="javax.servlet"></exclude>
+            <exclude type="pom" />
+        </dependency>
         <dependency org="com.vaadin" name="vaadin-client"
             rev="${vaadin.version}" conf="build->default">
             <exclude org="javax.validation"></exclude>
             <exclude type="pom" />
         </dependency>
+        <dependency org="com.vaadin" name="vaadin-compatibility-client"
+            rev="${vaadin.version}" conf="build->default">
+            <exclude org="javax.validation"></exclude>
+            <exclude type="pom" />
+        </dependency>
         <dependency org="com.vaadin" name="vaadin-client-compiled"
             rev="${vaadin.version}" conf="build->default">
             <exclude type="pom" />
         </dependency>
+        <dependency org="com.vaadin" name="vaadin-compatibility-client-compiled"
+            rev="${vaadin.version}" conf="build->default">
+            <exclude type="pom" />
+        </dependency>
         <dependency org="com.vaadin" name="vaadin-themes"
             rev="${vaadin.version}" conf="build->default">
             <exclude type="pom" />
diff --git a/uitest/src/main/java/com/vaadin/tests/components/UnknownComponentConnector.java b/uitest/src/main/java/com/vaadin/tests/components/UnknownComponentConnector.java
deleted file mode 100644
index 11f4255719..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/components/UnknownComponentConnector.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.vaadin.tests.components;
-
-import com.vaadin.server.VaadinRequest;
-import com.vaadin.ui.AbstractComponent;
-
-public class UnknownComponentConnector extends AbstractTestUI {
-
-    public static class ComponentWithoutConnector extends AbstractComponent {
-
-    }
-
-    @Override
-    protected void setup(VaadinRequest request) {
-        ComponentWithoutConnector component = new ComponentWithoutConnector();
-        component.setId("no-connector-component");
-        addComponent(component);
-    }
-
-    @Override
-    protected String getTestDescription() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetset.java b/uitest/src/main/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetset.java
index 554a461c37..bf243a53e2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetset.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetset.java
@@ -1,9 +1,11 @@
 package com.vaadin.tests.components.ui;
 
+import com.vaadin.annotations.Widgetset;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent;
 
+@Widgetset("com.vaadin.DefaultWidgetSet")
 public class ComponentMissingFromDefaultWidgetset extends AbstractTestUI {
 
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/IntArrayRendererConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/IntArrayRendererConnector.java
index 86e6108a4a..42c8040600 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/IntArrayRendererConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/IntArrayRendererConnector.java
@@ -15,14 +15,14 @@
  */
 package com.vaadin.tests.widgetset.client.grid;
 
-import com.vaadin.client.connectors.AbstractRendererConnector;
+import com.vaadin.client.connectors.AbstractGridRendererConnector;
 import com.vaadin.client.renderers.Renderer;
 import com.vaadin.client.widget.grid.RendererCellReference;
 import com.vaadin.shared.ui.Connect;
 
 @Connect(com.vaadin.tests.components.grid.IntArrayRenderer.class)
 public class IntArrayRendererConnector
-        extends AbstractRendererConnector<int[]> {
+        extends AbstractGridRendererConnector<int[]> {
 
     public static class IntArrayRenderer implements Renderer<int[]> {
         private static final String JOINER = " :: ";
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/PojoRendererConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/PojoRendererConnector.java
index 82ba236fce..eef728e130 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/PojoRendererConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/PojoRendererConnector.java
@@ -15,7 +15,7 @@
  */
 package com.vaadin.tests.widgetset.client.grid;
 
-import com.vaadin.client.connectors.AbstractRendererConnector;
+import com.vaadin.client.connectors.AbstractGridRendererConnector;
 import com.vaadin.client.renderers.Renderer;
 import com.vaadin.client.widget.grid.RendererCellReference;
 import com.vaadin.shared.ui.Connect;
@@ -23,7 +23,7 @@ import com.vaadin.tests.widgetset.client.SimpleTestBean;
 
 @Connect(com.vaadin.tests.components.grid.BeanRenderer.class)
 public class PojoRendererConnector
-        extends AbstractRendererConnector<SimpleTestBean> {
+        extends AbstractGridRendererConnector<SimpleTestBean> {
 
     public static class BeanRenderer implements Renderer<SimpleTestBean> {
         @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java
index 8b1c00d71c..444d4f7b26 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java
@@ -22,7 +22,7 @@ import com.google.gwt.dom.client.BrowserEvents;
 import com.google.gwt.dom.client.DivElement;
 import com.google.gwt.dom.client.NativeEvent;
 import com.google.gwt.user.client.DOM;
-import com.vaadin.client.connectors.AbstractRendererConnector;
+import com.vaadin.client.connectors.AbstractGridRendererConnector;
 import com.vaadin.client.renderers.ComplexRenderer;
 import com.vaadin.client.renderers.Renderer;
 import com.vaadin.client.widget.grid.CellReference;
@@ -33,7 +33,7 @@ import com.vaadin.shared.ui.Connect;
 import elemental.json.JsonObject;
 
 @Connect(com.vaadin.tests.components.grid.RowAwareRenderer.class)
-public class RowAwareRendererConnector extends AbstractRendererConnector<Void> {
+public class RowAwareRendererConnector extends AbstractGridRendererConnector<Void> {
     public interface RowAwareRendererRpc extends ServerRpc {
         void clicky(String key);
     }
diff --git a/uitest/src/main/resources/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml b/uitest/src/main/resources/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
index 3878e85193..53fa88e704 100644
--- a/uitest/src/main/resources/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
+++ b/uitest/src/main/resources/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
@@ -1,8 +1,7 @@
 <module>
     <!-- WS Compiler: manually edited -->
 
-    <!-- Inherit the DefaultWidgetSet -->
-    <inherits name="com.vaadin.DefaultWidgetSet" />
+    <inherits name="com.vaadin.Vaadin7WidgetSet" />
 
     <inherits name="com.google.gwt.user.theme.standard.Standard" />
 
diff --git a/uitest/src/main/webapp/WEB-INF/web.xml b/uitest/src/main/webapp/WEB-INF/web.xml
index 0def4001b8..c8b8c9caec 100644
--- a/uitest/src/main/webapp/WEB-INF/web.xml
+++ b/uitest/src/main/webapp/WEB-INF/web.xml
@@ -12,6 +12,10 @@
         <param-name>productionMode</param-name>
         <param-value>false</param-value>
     </context-param>
+    <context-param>
+        <param-name>widgetset</param-name>
+        <param-value>com.vaadin.Vaadin7WidgetSet</param-value>
+    </context-param>
 
     <context-param>
         <param-name>resourceCacheTime</param-name>
@@ -64,10 +68,6 @@
         <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class>
         <!-- Non-default values for testing purposes -->
         <init-param>
-            <param-name>legacyPropertyToString</param-name>
-            <param-value>false</param-value>
-        </init-param>
-        <init-param>
             <param-name>heartbeatInterval</param-name>
             <param-value>301</param-value>
         </init-param>
diff --git a/uitest/src/test/java/com/vaadin/tests/application/DeploymentConfigurationTest.java b/uitest/src/test/java/com/vaadin/tests/application/DeploymentConfigurationTest.java
index c1c2707943..499b828fbc 100644
--- a/uitest/src/test/java/com/vaadin/tests/application/DeploymentConfigurationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/DeploymentConfigurationTest.java
@@ -24,15 +24,15 @@ import java.util.List;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.LabelElement;
-import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.tests.tb3.SingleBrowserTest;
 
-public class DeploymentConfigurationTest extends MultiBrowserTest {
+public class DeploymentConfigurationTest extends SingleBrowserTest {
 
     @Test
     public void testParameters() {
         openTestURL();
         List<String> texts = new ArrayList<String>(Arrays.asList(
-                "Init parameters:", "legacyPropertyToString: false",
+                "Init parameters:", "widgetset: com.vaadin.Vaadin7WidgetSet",
                 "closeIdleSessions: true", "productionMode: false",
                 "testParam: 42", "heartbeatInterval: 301",
                 "resourceCacheTime: 3601"));
diff --git a/uitest/src/test/java/com/vaadin/tests/components/UnknownComponentConnectorTest.java b/uitest/src/test/java/com/vaadin/tests/components/UnknownComponentConnectorTest.java
deleted file mode 100644
index c72e219910..0000000000
--- a/uitest/src/test/java/com/vaadin/tests/components/UnknownComponentConnectorTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.tests.components;
-
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-import org.openqa.selenium.WebElement;
-
-import com.vaadin.tests.tb3.MultiBrowserTest;
-
-/**
- * Tests that a user is notified about a missing component from the widgetset
- */
-public class UnknownComponentConnectorTest extends MultiBrowserTest {
-
-    @Test
-    public void testConnectorNotFoundInWidgetset() throws Exception {
-        openTestURL();
-        WebElement component = vaadinElementById("no-connector-component");
-        assertTrue(component.getText().startsWith(
-                "Widgetset 'com.vaadin.DefaultWidgetSet' does not contain "
-                        + "implementation for com.vaadin.tests.components.UnknownComponentConnector."
-                        + "ComponentWithoutConnector."));
-    }
-}