Adjust to Message renaming in testfixture

testfixture.Message has been renamed to TestMessage to prevent clashes
with the new type Message in rap.rwt.
diff --git a/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridcolumngroupkit/GridColumnGroupLCA_Test.java b/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridcolumngroupkit/GridColumnGroupLCA_Test.java
index 046c469..628435c 100644
--- a/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridcolumngroupkit/GridColumnGroupLCA_Test.java
+++ b/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridcolumngroupkit/GridColumnGroupLCA_Test.java
@@ -33,10 +33,10 @@
 import org.eclipse.rap.rwt.internal.lifecycle.WidgetUtil;
 import org.eclipse.rap.rwt.remote.OperationHandler;
 import org.eclipse.rap.rwt.testfixture.Fixture;
-import org.eclipse.rap.rwt.testfixture.Message;
-import org.eclipse.rap.rwt.testfixture.Message.CreateOperation;
-import org.eclipse.rap.rwt.testfixture.Message.DestroyOperation;
-import org.eclipse.rap.rwt.testfixture.Message.Operation;
+import org.eclipse.rap.rwt.testfixture.TestMessage;
+import org.eclipse.rap.rwt.testfixture.TestMessage.CreateOperation;
+import org.eclipse.rap.rwt.testfixture.TestMessage.DestroyOperation;
+import org.eclipse.rap.rwt.testfixture.TestMessage.Operation;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
@@ -77,7 +77,7 @@
   public void testRenderCreate() throws IOException {
     lca.renderInitialization( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( group );
     assertEquals( "rwt.widgets.GridColumnGroup", operation.getType() );
   }
@@ -88,7 +88,7 @@
 
     lca.render( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( group );
     List<Object> styles = Arrays.asList( operation.getStyles() );
     assertTrue( styles.contains( "TOGGLE" ) );
@@ -108,7 +108,7 @@
   public void testRenderParent() throws IOException {
     lca.renderInitialization( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( group );
     assertEquals( WidgetUtil.getId( group.getParent() ), operation.getParent() );
   }
@@ -117,7 +117,7 @@
   public void testRenderDispose() throws IOException {
     lca.renderDispose( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     Operation operation = message.getOperation( 0 );
     assertTrue( operation instanceof DestroyOperation );
     assertEquals( WidgetUtil.getId( group ), operation.getTarget() );
@@ -127,7 +127,7 @@
   public void testRenderInitialText() throws IOException {
     lca.render( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( group );
     assertTrue( operation.getPropertyNames().indexOf( "text" ) == -1 );
   }
@@ -137,7 +137,7 @@
     group.setText( "foo" );
     lca.renderChanges( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( "foo", message.findSetProperty( group, "text" ).asString() );
   }
 
@@ -150,7 +150,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( group, "text" ) );
   }
 
@@ -158,7 +158,7 @@
   public void testRenderInitialImage() throws IOException {
     lca.renderChanges( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( group, "image" ) );
   }
 
@@ -169,7 +169,7 @@
     group.setImage( image );
     lca.renderChanges( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     String imageLocation = ImageFactory.getImagePath( image );
     String expected = "[\"" + imageLocation + "\", 100, 50 ]";
     JsonArray actual = message.findSetProperty( group, "image" ).asArray();
@@ -186,7 +186,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( group, "image" ) );
   }
 
@@ -201,7 +201,7 @@
     group.setImage( null );
     lca.renderChanges( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonObject.NULL, message.findSetProperty( group, "image" ) );
   }
 
@@ -209,7 +209,7 @@
   public void testRenderInitialFont() throws IOException {
     lca.render( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( group );
     assertTrue( operation.getPropertyNames().indexOf( "font" ) == -1 );
   }
@@ -219,7 +219,7 @@
     group.setHeaderFont( new Font( display, "Arial", 20, SWT.BOLD ) );
     lca.renderChanges( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     JsonArray expected = JsonArray.readFrom( "[[\"Arial\"], 20, true, false]" );
     assertEquals( expected, message.findSetProperty( group, "font" ) );
   }
@@ -233,7 +233,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( group, "font" ) );
   }
 
@@ -241,7 +241,7 @@
   public void testRenderInitialExpanded() throws IOException {
     lca.render( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( group );
     assertTrue( operation.getPropertyNames().indexOf( "expanded" ) == -1 );
   }
@@ -251,7 +251,7 @@
     group.setExpanded( false );
     lca.renderChanges( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonValue.FALSE, message.findSetProperty( group, "expanded" ) );
   }
 
@@ -264,7 +264,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( group, "expanded" ) );
   }
 
@@ -272,7 +272,7 @@
   public void testRenderInitialLeft() throws IOException {
     lca.render( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( group );
     assertTrue( operation.getPropertyNames().indexOf( "left" ) == -1 );
   }
@@ -286,7 +286,7 @@
     grid.getColumn( 0 ).setWidth( 30 );
     lca.renderChanges( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( 90, message.findSetProperty( group, "left" ).asInt() );
   }
 
@@ -302,7 +302,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( group, "left" ) );
   }
 
@@ -310,7 +310,7 @@
   public void testRenderInitialWidth() throws IOException {
     lca.render( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( group );
     assertTrue( operation.getPropertyNames().indexOf( "width" ) == -1 );
   }
@@ -321,7 +321,7 @@
 
     lca.renderChanges( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( 20, message.findSetProperty( group, "width" ).asInt() );
   }
 
@@ -334,7 +334,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( group, "width" ) );
   }
 
@@ -342,7 +342,7 @@
   public void testRenderInitialHeight() throws IOException {
     lca.render( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( group );
     assertTrue( operation.getPropertyNames().indexOf( "height" ) == -1 );
   }
@@ -354,7 +354,7 @@
 
     lca.renderChanges( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( 31, message.findSetProperty( group, "height" ).asInt() );
   }
 
@@ -368,7 +368,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( group, "height" ) );
   }
 
@@ -378,7 +378,7 @@
 
     lca.render( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( group );
     assertTrue( operation.getPropertyNames().indexOf( "visibility" ) == -1 );
   }
@@ -390,7 +390,7 @@
     grid.getColumn( 0 ).setVisible( false );
     lca.renderChanges( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonValue.FALSE, message.findSetProperty( group, "visibility" ) );
   }
 
@@ -404,7 +404,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( group, "visibility" ) );
   }
 
@@ -412,7 +412,7 @@
   public void testRenderInitialCustomVariant() throws IOException {
     lca.render( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( group );
     assertTrue( operation.getPropertyNames().indexOf( "customVariant" ) == -1 );
   }
@@ -422,7 +422,7 @@
     group.setData( RWT.CUSTOM_VARIANT, "blue" );
     lca.renderChanges( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( "variant_blue", message.findSetProperty( group, "customVariant" ).asString() );
   }
 
@@ -435,7 +435,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( group );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( group, "customVariant" ) );
   }
 
diff --git a/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridcolumnkit/GridColumnLCA_Test.java b/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridcolumnkit/GridColumnLCA_Test.java
index 9dbeca5..c38d541 100644
--- a/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridcolumnkit/GridColumnLCA_Test.java
+++ b/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridcolumnkit/GridColumnLCA_Test.java
@@ -35,10 +35,10 @@
 import org.eclipse.rap.rwt.internal.lifecycle.WidgetUtil;
 import org.eclipse.rap.rwt.remote.OperationHandler;
 import org.eclipse.rap.rwt.testfixture.Fixture;
-import org.eclipse.rap.rwt.testfixture.Message;
-import org.eclipse.rap.rwt.testfixture.Message.CreateOperation;
-import org.eclipse.rap.rwt.testfixture.Message.DestroyOperation;
-import org.eclipse.rap.rwt.testfixture.Message.Operation;
+import org.eclipse.rap.rwt.testfixture.TestMessage;
+import org.eclipse.rap.rwt.testfixture.TestMessage.CreateOperation;
+import org.eclipse.rap.rwt.testfixture.TestMessage.DestroyOperation;
+import org.eclipse.rap.rwt.testfixture.TestMessage.Operation;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionListener;
@@ -83,7 +83,7 @@
   public void testRenderCreate() throws IOException {
     lca.renderInitialization( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( column );
     assertEquals( "rwt.widgets.GridColumn", operation.getType() );
     assertFalse( operation.getPropertyNames().contains( "group" ) );
@@ -95,7 +95,7 @@
 
     lca.render( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( column );
     assertTrue( operation.getPropertyNames().indexOf( "style" ) == -1 );
     assertEquals( "right", message.findCreateProperty( column, "alignment" ).asString() );
@@ -115,7 +115,7 @@
   public void testRenderParent() throws IOException {
     lca.renderInitialization( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( column );
     assertEquals( WidgetUtil.getId( column.getParent() ), operation.getParent() );
   }
@@ -127,7 +127,7 @@
 
     lca.renderInitialization( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( column );
     assertEquals( getId( group ), operation.getProperty( "group" ).asString() );
   }
@@ -136,7 +136,7 @@
   public void testRenderDispose() throws IOException {
     lca.renderDispose( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     Operation operation = message.getOperation( 0 );
     assertTrue( operation instanceof DestroyOperation );
     assertEquals( WidgetUtil.getId( column ), operation.getTarget() );
@@ -148,7 +148,7 @@
 
     lca.renderChanges( column );
 
-    Message message = getProtocolMessage();
+    TestMessage message = getProtocolMessage();
     assertTrue( "foo", message.findSetProperty( column, "toolTipMarkupEnabled" ).asBoolean() );
   }
 
@@ -159,7 +159,7 @@
 
     lca.renderChanges( column );
 
-    Message message = getProtocolMessage();
+    TestMessage message = getProtocolMessage();
     assertNull( message.findSetOperation( column, "toolTipMarkupEnabled" ) );
   }
 
@@ -167,7 +167,7 @@
   public void testRenderInitialToolTip() throws IOException {
     lca.render( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( column );
     assertTrue( operation.getPropertyNames().indexOf( "toolTip" ) == -1 );
   }
@@ -177,7 +177,7 @@
     column.setHeaderTooltip( "foo" );
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( "foo", message.findSetProperty( column, "toolTip" ).asString() );
   }
 
@@ -190,7 +190,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( column, "toolTip" ) );
   }
 
@@ -198,7 +198,7 @@
   public void testRenderInitialCustomVariant() throws IOException {
     lca.render( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( column );
     assertTrue( operation.getPropertyNames().indexOf( "customVariant" ) == -1 );
   }
@@ -208,7 +208,7 @@
     column.setData( RWT.CUSTOM_VARIANT, "blue" );
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( "variant_blue", message.findSetProperty( column, "customVariant" ).asString() );
   }
 
@@ -221,7 +221,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( column, "customVariant" ) );
   }
 
@@ -229,7 +229,7 @@
   public void testRenderInitialText() throws IOException {
     lca.render( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( column );
     assertTrue( operation.getPropertyNames().indexOf( "text" ) == -1 );
   }
@@ -239,7 +239,7 @@
     column.setText( "foo" );
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( "foo", message.findSetProperty( column, "text" ).asString() );
   }
 
@@ -252,7 +252,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( column, "text" ) );
   }
 
@@ -260,7 +260,7 @@
   public void testRenderInitialImage() throws IOException {
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( column, "image" ) );
   }
 
@@ -271,7 +271,7 @@
     column.setImage( image );
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     String imageLocation = ImageFactory.getImagePath( image );
     String expected = "[\"" + imageLocation + "\", 100, 50 ]";
     JsonValue actual = message.findSetProperty( column, "image" );
@@ -288,7 +288,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( column, "image" ) );
   }
 
@@ -303,7 +303,7 @@
     column.setImage( null );
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonObject.NULL, message.findSetProperty( column, "image" ) );
   }
 
@@ -311,7 +311,7 @@
   public void testRenderInitialIndex() throws IOException {
     lca.render( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( 0, message.findCreateProperty( column, "index" ).asInt() );
   }
 
@@ -320,7 +320,7 @@
     new GridColumn( grid, SWT.NONE, 0 );
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( 1, message.findSetProperty( column, "index" ).asInt() );
   }
 
@@ -333,7 +333,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( column, "index" ) );
   }
 
@@ -341,7 +341,7 @@
   public void testRenderInitialLeft() throws IOException {
     lca.render( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( column );
     assertTrue( operation.getPropertyNames().indexOf( "left" ) == -1 );
   }
@@ -352,7 +352,7 @@
     column2.setWidth( 50 );
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( 50, message.findSetProperty( column, "left" ).asInt() );
   }
 
@@ -366,7 +366,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( column, "left" ) );
   }
 
@@ -374,7 +374,7 @@
   public void testRenderInitialWidth() throws IOException {
     lca.render( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( 10, message.findCreateProperty( column, "width" ).asInt() );
   }
 
@@ -383,7 +383,7 @@
     column.setWidth( 50 );
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( 50, message.findSetProperty( column, "width" ).asInt() );
   }
 
@@ -396,7 +396,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( column, "width" ) );
   }
 
@@ -404,7 +404,7 @@
   public void testRenderInitialAlignment() throws IOException {
     lca.render( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( column );
     assertTrue( operation.getPropertyNames().indexOf( "alignment" ) == -1 );
   }
@@ -414,7 +414,7 @@
     column.setAlignment( SWT.RIGHT );
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( "right", message.findSetProperty( column, "alignment" ).asString() );
   }
 
@@ -427,7 +427,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( column, "alignment" ) );
   }
 
@@ -435,7 +435,7 @@
   public void testRenderInitialResizable() throws IOException {
     lca.render( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( column );
     assertTrue( operation.getPropertyNames().indexOf( "resizable" ) == -1 );
   }
@@ -445,7 +445,7 @@
     column.setResizeable( false );
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonValue.FALSE, message.findSetProperty( column, "resizable" ) );
   }
 
@@ -458,7 +458,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( column, "resizable" ) );
   }
 
@@ -466,7 +466,7 @@
   public void testRenderInitialMoveable() throws IOException {
     lca.render( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( column );
     assertTrue( operation.getPropertyNames().indexOf( "moveable" ) == -1 );
   }
@@ -476,7 +476,7 @@
     column.setMoveable( true );
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonValue.TRUE, message.findSetProperty( column, "moveable" ) );
   }
 
@@ -489,7 +489,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( column, "moveable" ) );
   }
 
@@ -497,7 +497,7 @@
   public void testRenderInitialVisible() throws IOException {
     lca.render( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( column );
     assertTrue( operation.getPropertyNames().indexOf( "visibility" ) == -1 );
   }
@@ -507,7 +507,7 @@
     column.setVisible( false );
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonValue.FALSE, message.findSetProperty( column, "visibility" ) );
   }
 
@@ -520,7 +520,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( column, "visibility" ) );
   }
 
@@ -528,7 +528,7 @@
   public void testRenderInitialCheck() throws IOException {
     lca.render( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( column );
     assertTrue( operation.getPropertyNames().indexOf( "check" ) == -1 );
   }
@@ -539,7 +539,7 @@
 
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonValue.TRUE, message.findSetProperty( column, "check" ) );
   }
 
@@ -552,7 +552,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( column, "check" ) );
   }
 
@@ -565,7 +565,7 @@
     column.addSelectionListener( new SelectionAdapter() { } );
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonValue.TRUE, message.findListenProperty( column, "Selection" ) );
   }
 
@@ -580,7 +580,7 @@
     column.removeSelectionListener( listener );
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonValue.FALSE, message.findListenProperty( column, "Selection" ) );
   }
 
@@ -594,7 +594,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findListenOperation( column, "Selection" ) );
   }
 
@@ -622,7 +622,7 @@
     assertEquals( newWidth, columns[ 0 ].getWidth() );
     event = events.get( 1 );
     assertSame( columns[ 1 ], event.widget );
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( newWidth, message.findSetProperty( columns[ 0 ], "width" ).asInt() );
     assertEquals( newLeft, message.findSetProperty( columns[ 1 ], "left" ).asInt() );
   }
@@ -650,7 +650,7 @@
     assertSame( columns[ 0 ], event.widget );
     event = events.get( 1 );
     assertSame( column, event.widget );
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( 20, message.findSetProperty( column, "left" ).asInt() );
     assertEquals( 0, message.findSetProperty( columns[ 0 ], "left" ).asInt() );
   }
@@ -659,7 +659,7 @@
   public void testRenderInitialFont() throws IOException {
     lca.render( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( column );
     assertTrue( operation.getPropertyNames().indexOf( "font" ) == -1 );
   }
@@ -669,7 +669,7 @@
     column.setHeaderFont( new Font( display, "Arial", 20, SWT.BOLD ) );
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     JsonValue actual = message.findSetProperty( column, "font" );
     assertEquals( JsonArray.readFrom( "[[\"Arial\"], 20, true, false]" ), actual );
   }
@@ -683,7 +683,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( column, "font" ) );
   }
 
@@ -691,7 +691,7 @@
   public void testRenderInitialFooterFont() throws IOException {
     lca.render( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( column );
     assertTrue( operation.getPropertyNames().indexOf( "footerFont" ) == -1 );
   }
@@ -701,7 +701,7 @@
     column.setFooterFont( new Font( display, "Arial", 20, SWT.BOLD ) );
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     JsonValue actual = message.findSetProperty( column, "footerFont" );
     assertEquals( JsonArray.readFrom( "[[\"Arial\"], 20, true, false]" ), actual );
   }
@@ -715,7 +715,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( column, "footerFont" ) );
   }
 
@@ -723,7 +723,7 @@
   public void testRenderInitialFooterText() throws IOException {
     lca.render( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( column );
     assertTrue( operation.getPropertyNames().indexOf( "footerText" ) == -1 );
   }
@@ -733,7 +733,7 @@
     column.setFooterText( "foo" );
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( "foo", message.findSetProperty( column, "footerText" ).asString() );
   }
 
@@ -746,7 +746,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( column, "footerText" ) );
   }
 
@@ -754,7 +754,7 @@
   public void testRenderInitialFooterImage() throws IOException {
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( column, "footerImage" ) );
   }
 
@@ -765,7 +765,7 @@
     column.setFooterImage( image );
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     String imageLocation = ImageFactory.getImagePath( image );
     JsonArray expected = JsonArray.readFrom( "[\"" + imageLocation + "\", 100, 50 ]" );
     assertEquals( expected, message.findSetProperty( column, "footerImage" ) );
@@ -781,7 +781,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( column, "footerImage" ) );
   }
 
@@ -796,7 +796,7 @@
     column.setFooterImage( null );
     lca.renderChanges( column );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonObject.NULL, message.findSetProperty( column, "footerImage" ) );
   }
 
diff --git a/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/griditemkit/GridItemLCA_Test.java b/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/griditemkit/GridItemLCA_Test.java
index 498d58a..53e846b 100644
--- a/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/griditemkit/GridItemLCA_Test.java
+++ b/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/griditemkit/GridItemLCA_Test.java
@@ -33,9 +33,9 @@
 import org.eclipse.rap.rwt.internal.lifecycle.WidgetUtil;
 import org.eclipse.rap.rwt.remote.OperationHandler;
 import org.eclipse.rap.rwt.testfixture.Fixture;
-import org.eclipse.rap.rwt.testfixture.Message;
-import org.eclipse.rap.rwt.testfixture.Message.CreateOperation;
-import org.eclipse.rap.rwt.testfixture.Message.DestroyOperation;
+import org.eclipse.rap.rwt.testfixture.TestMessage;
+import org.eclipse.rap.rwt.testfixture.TestMessage.CreateOperation;
+import org.eclipse.rap.rwt.testfixture.TestMessage.DestroyOperation;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
@@ -77,7 +77,7 @@
 
     lca.renderInitialization( items[ 8 ] );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( items[ 8 ] );
     assertEquals( "rwt.widgets.GridItem", operation.getType() );
     assertEquals( 3, operation.getProperty( "index" ).asInt() );
@@ -89,7 +89,7 @@
 
     lca.renderInitialization( items[ 10 ] );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( items[ 10 ] );
     assertEquals( "rwt.widgets.GridItem", operation.getType() );
     assertEquals( 1, operation.getProperty( "index" ).asInt() );
@@ -109,7 +109,7 @@
   public void testRenderParent() throws IOException {
     lca.renderInitialization( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( item );
     assertEquals( WidgetUtil.getId( item.getParent() ), operation.getParent() );
   }
@@ -120,7 +120,7 @@
 
     lca.renderInitialization( subitem );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( subitem );
     assertEquals( WidgetUtil.getId( item ), operation.getParent() );
   }
@@ -129,7 +129,7 @@
   public void testRenderDispose() throws IOException {
     lca.renderDispose( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     DestroyOperation operation = ( DestroyOperation )message.getOperation( 0 );
     assertEquals( WidgetUtil.getId( item ), operation.getTarget() );
   }
@@ -140,7 +140,7 @@
 
     lca.renderDispose( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( 0, message.getOperationCount() );
   }
 
@@ -151,7 +151,7 @@
 
     lca.renderDispose( items[ 1 ] );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( 0, message.getOperationCount() );
   }
 
@@ -170,7 +170,7 @@
   public void testRenderInitialCustomVariant() throws IOException {
     lca.render( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( item );
     assertTrue( operation.getPropertyNames().indexOf( "customVariant" ) == -1 );
   }
@@ -180,7 +180,7 @@
     item.setData( RWT.CUSTOM_VARIANT, "blue" );
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( "variant_blue", message.findSetProperty( item, "customVariant" ).asString() );
   }
 
@@ -193,7 +193,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( item, "customVariant" ) );
   }
 
@@ -201,7 +201,7 @@
   public void testRenderInitialItemCount() throws IOException {
     lca.render( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( item );
     assertTrue( operation.getPropertyNames().indexOf( "itemCount" ) == -1 );
   }
@@ -211,7 +211,7 @@
     GridItem[] items = createGridItems( grid, 1, 10 );
     lca.renderChanges( items[ 0 ] );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( 10, message.findSetProperty( items[ 0 ], "itemCount" ).asInt() );
   }
 
@@ -224,7 +224,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( items[ 0 ] );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( items[ 0 ], "itemCount" ) );
   }
 
@@ -232,7 +232,7 @@
   public void testRenderInitialHeight() throws IOException {
     lca.render( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( item );
     assertTrue( operation.getPropertyNames().indexOf( "height" ) == -1 );
   }
@@ -243,7 +243,7 @@
 
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( 10, message.findSetProperty( item, "height" ).asInt() );
   }
 
@@ -256,7 +256,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( item, "height" ) );
   }
 
@@ -266,7 +266,7 @@
 
     lca.render( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( item );
     assertTrue( operation.getPropertyNames().indexOf( "texts" ) == -1 );
   }
@@ -279,7 +279,7 @@
     item.setText( 1, "item 0.1" );
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     JsonArray expected = JsonArray.readFrom( "[\"item 0.0\", \"item 0.1\"]" );
     assertEquals( expected, message.findSetProperty( item, "texts" ) );
   }
@@ -295,7 +295,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( item, "texts" ) );
   }
 
@@ -305,7 +305,7 @@
 
     lca.render( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( item );
     assertTrue( operation.getPropertyNames().indexOf( "images" ) == -1 );
   }
@@ -318,7 +318,7 @@
     item.setImage( 1, image );
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     JsonValue actual = message.findSetProperty( item, "images" );
     String expected = "[null, [\"rwt-resources/generated/90fb0bfe.gif\",58,12]]";
     assertEquals( JsonArray.readFrom( expected ), actual );
@@ -335,7 +335,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( item, "images" ) );
   }
 
@@ -343,7 +343,7 @@
   public void testRenderInitialBackground() throws IOException {
     lca.render( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( item );
     assertTrue( operation.getPropertyNames().indexOf( "background" ) == -1 );
   }
@@ -353,7 +353,7 @@
     item.setBackground( display.getSystemColor( SWT.COLOR_GREEN ) );
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     JsonValue actual = message.findSetProperty( item, "background" );
     assertEquals( JsonArray.readFrom( "[0,255,0,255]" ), actual );
   }
@@ -367,7 +367,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( item, "background" ) );
   }
 
@@ -375,7 +375,7 @@
   public void testRenderInitialForeground() throws IOException {
     lca.render( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( item );
     assertTrue( operation.getPropertyNames().indexOf( "foreground" ) == -1 );
   }
@@ -385,7 +385,7 @@
     item.setForeground( display.getSystemColor( SWT.COLOR_GREEN ) );
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     JsonValue actual = message.findSetProperty( item, "foreground" );
     assertEquals( JsonArray.readFrom( "[0,255,0,255]" ), actual );
   }
@@ -399,7 +399,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( item, "foreground" ) );
   }
 
@@ -407,7 +407,7 @@
   public void testRenderInitialFont() throws IOException {
     lca.render( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( item );
     assertTrue( operation.getPropertyNames().indexOf( "font" ) == -1 );
   }
@@ -417,7 +417,7 @@
     item.setFont( new Font( display, "Arial", 20, SWT.BOLD ) );
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     JsonValue actual = message.findSetProperty( item, "font" );
     assertEquals( JsonArray.readFrom( "[[\"Arial\"], 20, true, false]" ), actual );
   }
@@ -431,7 +431,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( item, "font" ) );
   }
 
@@ -441,7 +441,7 @@
 
     lca.render( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( item );
     assertTrue( operation.getPropertyNames().indexOf( "cellBackgrounds" ) == -1 );
   }
@@ -453,7 +453,7 @@
     item.setBackground( 1, display.getSystemColor( SWT.COLOR_GREEN ) );
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     JsonValue actual = message.findSetProperty( item, "cellBackgrounds" );
     assertEquals( JsonArray.readFrom( "[null, [0,255,0,255]]" ), actual );
   }
@@ -468,7 +468,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( item, "cellBackgrounds" ) );
   }
 
@@ -478,7 +478,7 @@
 
     lca.render( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( item );
     assertTrue( operation.getPropertyNames().indexOf( "cellForegrounds" ) == -1 );
   }
@@ -490,7 +490,7 @@
     item.setForeground( 1, display.getSystemColor( SWT.COLOR_GREEN ) );
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     JsonValue actual = message.findSetProperty( item, "cellForegrounds" );
     assertEquals( JsonArray.readFrom( "[null, [0,255,0,255]]" ), actual );
   }
@@ -505,7 +505,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( item, "cellForegrounds" ) );
   }
 
@@ -515,7 +515,7 @@
 
     lca.render( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( item );
     assertTrue( operation.getPropertyNames().indexOf( "cellFonts" ) == -1 );
   }
@@ -527,7 +527,7 @@
     item.setFont( 1, new Font( display, "Arial", 20, SWT.BOLD ) );
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     JsonValue actual = message.findSetProperty( item, "cellFonts" );
     assertEquals( JsonArray.readFrom( "[null, [[\"Arial\"], 20, true, false]]" ), actual );
   }
@@ -542,7 +542,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( item, "cellFonts" ) );
   }
 
@@ -550,7 +550,7 @@
   public void testRenderInitialExpanded() throws IOException {
     lca.render( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( item );
     assertTrue( operation.getPropertyNames().indexOf( "expanded" ) == -1 );
   }
@@ -562,7 +562,7 @@
     item.setExpanded( true );
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonValue.TRUE, message.findSetProperty( item, "expanded" ) );
   }
 
@@ -576,7 +576,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( item, "expanded" ) );
   }
 
@@ -588,7 +588,7 @@
 
     lca.render( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( item );
     assertTrue( operation.getPropertyNames().indexOf( "cellChecked" ) == -1 );
   }
@@ -602,7 +602,7 @@
     item.setChecked( 1, true );
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     JsonArray expected = JsonArray.readFrom( "[false,true]" );
     assertEquals( expected, message.findSetProperty( item, "cellChecked" ) );
   }
@@ -619,7 +619,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( item, "cellChecked" ) );
   }
 
@@ -631,7 +631,7 @@
 
     lca.render( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( item );
     assertTrue( operation.getPropertyNames().indexOf( "cellGrayed" ) == -1 );
   }
@@ -645,7 +645,7 @@
     item.setGrayed( 1, true );
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     JsonArray expected = JsonArray.readFrom( "[false, true]" );
     assertEquals( expected, message.findSetProperty( item, "cellGrayed" ) );
   }
@@ -662,7 +662,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( item, "cellGrayed" ) );
   }
 
@@ -674,7 +674,7 @@
 
     lca.render( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( item );
     assertTrue( operation.getPropertyNames().indexOf( "cellCheckable" ) == -1 );
   }
@@ -688,7 +688,7 @@
     item.setCheckable( 1, false );
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     JsonArray expected = JsonArray.readFrom( "[true, false]" );
     assertEquals( expected, message.findSetProperty( item, "cellCheckable" ) );
   }
@@ -705,7 +705,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( item, "cellCheckable" ) );
   }
 
@@ -721,7 +721,7 @@
     Fixture.fakeSetProperty( getId( items[ 0 ] ), "expanded", true );
     Fixture.executeLifeCycleFromServerThread();
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNotNull( message.findSetOperation( grid.getVerticalBar(), "visibility" ) );
   }
 
@@ -733,7 +733,7 @@
 
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     JsonObject data = ( JsonObject )message.findSetProperty( item, "data" );
     assertEquals( "string", data.get( "foo" ).asString() );
     assertEquals( 1, data.get( "bar" ).asInt() );
@@ -749,7 +749,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( item );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( 0, message.getOperationCount() );
   }
 
diff --git a/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridkit/GridLCA_Test.java b/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridkit/GridLCA_Test.java
index a46aaf4..6028488 100644
--- a/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridkit/GridLCA_Test.java
+++ b/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridkit/GridLCA_Test.java
@@ -40,10 +40,10 @@
 import org.eclipse.rap.rwt.internal.lifecycle.WidgetUtil;
 import org.eclipse.rap.rwt.remote.OperationHandler;
 import org.eclipse.rap.rwt.testfixture.Fixture;
-import org.eclipse.rap.rwt.testfixture.Message;
-import org.eclipse.rap.rwt.testfixture.Message.CreateOperation;
-import org.eclipse.rap.rwt.testfixture.Message.DestroyOperation;
-import org.eclipse.rap.rwt.testfixture.Message.Operation;
+import org.eclipse.rap.rwt.testfixture.TestMessage;
+import org.eclipse.rap.rwt.testfixture.TestMessage.CreateOperation;
+import org.eclipse.rap.rwt.testfixture.TestMessage.DestroyOperation;
+import org.eclipse.rap.rwt.testfixture.TestMessage.Operation;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionListener;
@@ -87,7 +87,7 @@
   public void testRenderCreate() throws IOException {
     lca.renderInitialization( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( grid );
     List<Object> styles = Arrays.asList( operation.getStyles() );
     assertEquals( "rwt.widgets.Grid", operation.getType() );
@@ -101,7 +101,7 @@
   public void testRenderParent() throws IOException {
     lca.renderInitialization( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( grid );
     assertEquals( getId( grid.getParent() ), operation.getParent() );
   }
@@ -112,7 +112,7 @@
 
     lca.render( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( grid );
     List<Object> styles = Arrays.asList( operation.getStyles() );
     assertTrue( styles.contains( "VIRTUAL" ) );
@@ -145,7 +145,7 @@
   public void testRenderDispose() throws IOException {
     lca.renderDispose( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     Operation operation = message.getOperation( 0 );
     assertTrue( operation instanceof DestroyOperation );
     assertEquals( getId( grid ), operation.getTarget() );
@@ -155,7 +155,7 @@
   public void testRenderInitialItemCount() throws IOException {
     lca.render( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( grid );
     assertTrue( operation.getPropertyNames().indexOf( "itemCount" ) == -1 );
   }
@@ -165,7 +165,7 @@
     createGridItems( grid, 10, 3 );
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( 10, message.findSetProperty( grid, "itemCount" ).asInt() );
   }
 
@@ -178,7 +178,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( grid, "itemCount" ) );
   }
 
@@ -186,7 +186,7 @@
   public void testRenderInitialItemHeight() throws IOException {
     lca.render( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNotNull( message.findSetOperation( grid, "itemHeight" ) );
   }
 
@@ -195,7 +195,7 @@
     grid.setItemHeight( 40 );
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( 40, message.findSetProperty( grid, "itemHeight" ).asInt() );
   }
 
@@ -208,7 +208,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( grid, "itemHeight" ) );
   }
 
@@ -216,7 +216,7 @@
   public void testRenderInitialItemMetrics() throws IOException {
     lca.render( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNotNull( message.findSetOperation( grid, "itemMetrics" ) );
   }
 
@@ -229,7 +229,7 @@
 
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     JsonArray actual = message.findSetProperty( grid, "itemMetrics" ).asArray();
     assertEquals( JsonArray.readFrom( "[0, 0, 50, 0, 0, 0, 44, 0, 0]" ), actual.get( 0 ) );
   }
@@ -242,7 +242,7 @@
 
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     JsonArray actual = message.findSetProperty( grid, "itemMetrics" ).asArray();
     assertEquals( JsonArray.readFrom( "[0, 0, 20, 23, 0, 23, 0, 0, 21]" ), actual.get( 0 ) );
     assertEquals( JsonArray.readFrom( "[1, 20, 40, 49, 0, 49, 5, 26, 21]" ), actual.get( 1 ) );
@@ -259,7 +259,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( grid, "itemMetrics" ) );
   }
 
@@ -267,7 +267,7 @@
   public void testRenderInitialColumnCount() throws IOException {
     lca.render( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( grid );
     assertTrue( operation.getPropertyNames().indexOf( "columnCount" ) == -1 );
   }
@@ -277,7 +277,7 @@
     new GridColumn( grid, SWT.NONE );
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( 1, message.findSetProperty( grid, "columnCount" ).asInt() );
   }
 
@@ -290,7 +290,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( grid, "columnCount" ) );
   }
 
@@ -300,7 +300,7 @@
 
     lca.render( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( grid );
     assertTrue( operation.getPropertyNames().indexOf( "treeColumn" ) == -1 );
   }
@@ -312,7 +312,7 @@
     grid.setColumnOrder( new int[]{ 1, 0 } );
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( 1, message.findSetProperty( grid, "treeColumn" ).asInt() );
   }
 
@@ -326,7 +326,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( grid, "treeColumn" ) );
   }
 
@@ -336,7 +336,7 @@
 
     lca.render( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( grid );
     assertTrue( operation.getPropertyNames().indexOf( "headerHeight" ) == -1 );
   }
@@ -348,7 +348,7 @@
 
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( 31, message.findSetProperty( grid, "headerHeight" ).asInt() );
   }
 
@@ -362,7 +362,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( grid, "headerHeight" ) );
   }
 
@@ -370,7 +370,7 @@
   public void testRenderInitialHeaderVisible() throws IOException {
     lca.render( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( grid );
     assertTrue( operation.getPropertyNames().indexOf( "headerVisible" ) == -1 );
   }
@@ -380,7 +380,7 @@
     grid.setHeaderVisible( true );
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonValue.TRUE, message.findSetProperty( grid, "headerVisible" ) );
   }
 
@@ -393,7 +393,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( grid, "headerVisible" ) );
   }
 
@@ -403,7 +403,7 @@
 
     lca.render( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( grid );
     assertTrue( operation.getPropertyNames().indexOf( "footerHeight" ) == -1 );
   }
@@ -415,7 +415,7 @@
 
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( 31, message.findSetProperty( grid, "footerHeight" ).asInt() );
   }
 
@@ -429,7 +429,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( grid, "footerHeight" ) );
   }
 
@@ -437,7 +437,7 @@
   public void testRenderInitialFooterVisible() throws IOException {
     lca.render( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( grid );
     assertTrue( operation.getPropertyNames().indexOf( "footerVisible" ) == -1 );
   }
@@ -447,7 +447,7 @@
     grid.setFooterVisible( true );
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonValue.TRUE, message.findSetProperty( grid, "footerVisible" ) );
   }
 
@@ -460,7 +460,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( grid, "footerVisible" ) );
   }
 
@@ -468,7 +468,7 @@
   public void testRenderInitialLinesVisible() throws IOException {
     lca.render( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonValue.TRUE, message.findSetProperty( grid, "linesVisible" ) );
   }
 
@@ -478,7 +478,7 @@
     grid.setLinesVisible( false );
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonValue.FALSE, message.findSetProperty( grid, "linesVisible" ) );
   }
 
@@ -491,7 +491,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( grid, "linesVisible" ) );
   }
 
@@ -501,7 +501,7 @@
 
     lca.render( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( grid );
     assertTrue( operation.getPropertyNames().indexOf( "topItemIndex" ) == -1 );
   }
@@ -515,7 +515,7 @@
     grid.setTopIndex( 5 );
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( 2, message.findSetProperty( grid, "topItemIndex" ).asInt() );
   }
 
@@ -530,7 +530,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( grid, "topItemIndex" ) );
   }
 
@@ -538,7 +538,7 @@
   public void testRenderInitialFocusItem() throws IOException {
     lca.render( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( grid );
     assertTrue( operation.getPropertyNames().indexOf( "focusItem" ) == -1 );
   }
@@ -550,7 +550,7 @@
     grid.setFocusItem( items[ 1 ] );
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( getId( items[ 1 ] ), message.findSetProperty( grid, "focusItem" ).asString() );
   }
 
@@ -564,7 +564,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( grid, "focusItem" ) );
   }
 
@@ -573,7 +573,7 @@
     createGridColumns( grid, 3, SWT.NONE );
     lca.render( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( grid );
     assertTrue( operation.getPropertyNames().indexOf( "scrollLeft" ) == -1 );
   }
@@ -584,7 +584,7 @@
     grid.getHorizontalBar().setSelection( 10 );
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( 10, message.findSetProperty( grid, "scrollLeft" ).asInt() );
   }
 
@@ -598,7 +598,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( grid, "scrollLeft" ) );
   }
 
@@ -606,7 +606,7 @@
   public void testRenderInitialSelection() throws IOException {
     lca.render( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( grid );
     assertTrue( operation.getPropertyNames().indexOf( "selection" ) == -1 );
   }
@@ -618,7 +618,7 @@
     grid.setSelection( new int[] { 0, 4 } );
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     Object expected = new JsonArray()
       .add( getId( items[ 0 ] ) )
       .add( getId( items[ 4 ] ) );
@@ -635,7 +635,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( grid, "selection" ) );
   }
 
@@ -643,7 +643,7 @@
   public void testRenderInitialSortDirection() throws IOException {
     lca.render( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( grid );
     assertTrue( operation.getPropertyNames().indexOf( "sortDirection" ) == -1 );
   }
@@ -655,7 +655,7 @@
     columns[ 1 ].setSort( SWT.UP );
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( "up", message.findSetProperty( grid, "sortDirection" ).asString() );
   }
 
@@ -669,7 +669,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( grid, "sortDirection" ) );
   }
 
@@ -677,7 +677,7 @@
   public void testRenderInitialSortColumn() throws IOException {
     lca.render( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( grid );
     assertTrue( operation.getPropertyNames().indexOf( "sortColumn" ) == -1 );
   }
@@ -689,7 +689,7 @@
     columns[ 1 ].setSort( SWT.UP );
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( getId( columns[ 1 ] ), message.findSetProperty( grid, "sortColumn" ).asString() );
   }
 
@@ -703,7 +703,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( grid, "sortColumn" ) );
   }
 
@@ -713,7 +713,7 @@
 
     lca.render( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( grid.getHorizontalBar(), "visibility" ) );
     assertNull( message.findSetOperation( grid.getVerticalBar(), "visibility" ) );
   }
@@ -727,7 +727,7 @@
     doFakeRedraw();
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonValue.TRUE, message.findSetProperty( grid.getHorizontalBar(), "visibility" ) );
     assertNull( message.findSetOperation( grid.getVerticalBar(), "visibility" ) );
   }
@@ -741,7 +741,7 @@
     doFakeRedraw();
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( grid.getHorizontalBar(), "visibility" ) );
     assertEquals( JsonValue.TRUE, message.findSetProperty( grid.getVerticalBar(), "visibility" ) );
   }
@@ -761,7 +761,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( grid.getHorizontalBar(), "visibility" ) );
     assertNull( message.findSetOperation( grid.getVerticalBar(), "visibility" ) );
   }
@@ -777,7 +777,7 @@
     hScroll.addSelectionListener( new SelectionAdapter() { } );
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonValue.TRUE, message.findListenProperty( hScroll, "Selection" ) );
   }
 
@@ -794,7 +794,7 @@
     hScroll.removeSelectionListener( listener );
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonValue.FALSE, message.findListenProperty( hScroll, "Selection" ) );
   }
 
@@ -810,7 +810,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findListenOperation( hScroll, "Selection" ) );
   }
 
@@ -825,7 +825,7 @@
     vScroll.addSelectionListener( new SelectionAdapter() { } );
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonValue.TRUE, message.findListenProperty( vScroll, "Selection" ) );
   }
 
@@ -842,7 +842,7 @@
     vScroll.removeSelectionListener( listener );
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonValue.FALSE, message.findListenProperty( vScroll, "Selection" ) );
   }
 
@@ -858,7 +858,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findListenOperation( vScroll, "Selection" ) );
   }
 
@@ -871,7 +871,7 @@
     grid.addSelectionListener( new SelectionAdapter() { } );
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonValue.TRUE, message.findListenProperty( grid, "Selection" ) );
     assertEquals( JsonValue.TRUE, message.findListenProperty( grid, "DefaultSelection" ) );
   }
@@ -887,7 +887,7 @@
     grid.removeSelectionListener( listener );
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonValue.FALSE, message.findListenProperty( grid, "Selection" ) );
     assertEquals( JsonValue.FALSE, message.findListenProperty( grid, "DefaultSelection" ) );
   }
@@ -902,7 +902,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findListenOperation( grid, "Selection" ) );
     assertNull( message.findListenOperation( grid, "DefaultSelection" ) );
   }
@@ -911,7 +911,7 @@
   public void testRenderInitialEnableCellToolTip() throws IOException {
     lca.render( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     CreateOperation operation = message.findCreateOperation( grid );
     assertTrue( operation.getPropertyNames().indexOf( "enableCellToolTip" ) == -1 );
   }
@@ -924,7 +924,7 @@
     item.setToolTipText( 1, "foo" );
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonValue.TRUE, message.findSetProperty( grid, "enableCellToolTip" ) );
   }
 
@@ -939,7 +939,7 @@
     Fixture.preserveWidgets();
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( grid, "enableCellToolTip" ) );
   }
 
@@ -955,7 +955,7 @@
     String itemId = getId( item );
     processCellToolTipRequest( grid, itemId, 1 );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( "foo", message.findSetProperty( grid, "cellToolTipText" ).asString() );
   }
 
@@ -985,7 +985,7 @@
     String itemId = WidgetUtil.getId( grid.getItem( 2 ) );
     processCellToolTipRequest( grid, itemId, 0 );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findSetOperation( grid, "cellToolTipText" ) );
   }
 
@@ -1112,7 +1112,7 @@
 
     lca.render( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonValue.TRUE, message.findCreateProperty( grid, "markupEnabled" ) );
   }
 
@@ -1120,7 +1120,7 @@
   public void testRenderAddExpandListener() throws Exception {
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonValue.TRUE, message.findListenProperty( grid, "Expand" ) );
   }
 
@@ -1128,7 +1128,7 @@
   public void testRenderAddCollapseListener() throws Exception {
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertEquals( JsonValue.TRUE, message.findListenProperty( grid, "Collapse" ) );
   }
 
@@ -1141,7 +1141,7 @@
 
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findListenOperation( grid, "SetData" ) );
   }
 
@@ -1153,7 +1153,7 @@
 
     lca.renderChanges( grid );
 
-    Message message = Fixture.getProtocolMessage();
+    TestMessage message = Fixture.getProtocolMessage();
     assertNull( message.findListenOperation( grid, "SetData" ) );
   }