Index: Core/Gui/test/Core.Gui.Test/Forms/ViewHost/DocumentViewControllerTest.cs
===================================================================
diff -u -r54cce925f5a723820f5490293019ef785ae531fd -rd7c0bf76dd46e5b4f205e85c25a2a65643a5a530
--- Core/Gui/test/Core.Gui.Test/Forms/ViewHost/DocumentViewControllerTest.cs	(.../DocumentViewControllerTest.cs)	(revision 54cce925f5a723820f5490293019ef785ae531fd)
+++ Core/Gui/test/Core.Gui.Test/Forms/ViewHost/DocumentViewControllerTest.cs	(.../DocumentViewControllerTest.cs)	(revision d7c0bf76dd46e5b4f205e85c25a2a65643a5a530)
@@ -139,9 +139,8 @@
             viewHost.Expect(vm => vm.AddDocumentView(Arg<TestView>.Is.NotNull,
                                                      Arg<string>.Is.Equal(viewName),
                                                      Arg<string>.Is.Equal(string.Empty),
-                                                     Arg<FontFamily>.Is.NotNull))
+                                                     Arg<FontFamily>.Is.Null))
                     .WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; });
-            viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments();
 
             mocks.ReplayAll();
 
@@ -206,9 +205,8 @@
             viewHost.Expect(vm => vm.AddDocumentView(Arg<TestView>.Is.NotNull,
                                                      Arg<string>.Is.Equal(viewName),
                                                      Arg<string>.Is.Equal(string.Empty),
-                                                     Arg<FontFamily>.Is.NotNull))
+                                                     Arg<FontFamily>.Is.Null))
                     .WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; });
-            viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments();
 
             mocks.ReplayAll();
 
@@ -265,9 +263,8 @@
             viewHost.Expect(vm => vm.AddDocumentView(Arg<TestViewDerivative>.Is.NotNull,
                                                      Arg<string>.Is.Anything,
                                                      Arg<string>.Is.Equal(string.Empty),
-                                                     Arg<FontFamily>.Is.NotNull))
+                                                     Arg<FontFamily>.Is.Null))
                     .WhenCalled(invocation => { view = invocation.Arguments[0] as TestViewDerivative; });
-            viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments();
 
             mocks.ReplayAll();
 
@@ -308,9 +305,8 @@
             viewHost.Expect(vm => vm.AddDocumentView(Arg<TestView>.Is.NotNull,
                                                      Arg<string>.Is.Anything,
                                                      Arg<string>.Is.Equal(string.Empty),
-                                                     Arg<FontFamily>.Is.NotNull))
+                                                     Arg<FontFamily>.Is.Null))
                     .WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; });
-            viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments();
 
             mocks.ReplayAll();
 
@@ -351,9 +347,8 @@
             viewHost.Expect(vm => vm.AddDocumentView(Arg<TestViewDerivative>.Is.NotNull,
                                                      Arg<string>.Is.Anything,
                                                      Arg<string>.Is.Equal(string.Empty),
-                                                     Arg<FontFamily>.Is.NotNull))
+                                                     Arg<FontFamily>.Is.Null))
                     .WhenCalled(invocation => { view = invocation.Arguments[0] as TestViewDerivative; });
-            viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments();
 
             mocks.ReplayAll();
 
@@ -440,9 +435,8 @@
             viewHost.Expect(vm => vm.AddDocumentView(Arg<TestView>.Is.NotNull,
                                                      Arg<string>.Is.Anything,
                                                      Arg<string>.Is.Equal(string.Empty),
-                                                     Arg<FontFamily>.Is.NotNull))
+                                                     Arg<FontFamily>.Is.Null))
                     .WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; });
-            viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments();
 
             mocks.ReplayAll();
 
@@ -490,9 +484,8 @@
             viewHost.Expect(vm => vm.AddDocumentView(Arg<TestView>.Is.NotNull,
                                                      Arg<string>.Is.Anything,
                                                      Arg<string>.Is.Equal(string.Empty),
-                                                     Arg<FontFamily>.Is.NotNull))
+                                                     Arg<FontFamily>.Is.Null))
                     .WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; });
-            viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments();
 
             mocks.ReplayAll();
 
@@ -547,9 +540,8 @@
             viewHost.Expect(vm => vm.AddDocumentView(Arg<TestView>.Is.NotNull,
                                                      Arg<string>.Is.Anything,
                                                      Arg<string>.Is.Equal(string.Empty),
-                                                     Arg<FontFamily>.Is.NotNull))
+                                                     Arg<FontFamily>.Is.Null))
                     .WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; });
-            viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments();
 
             mocks.ReplayAll();
 
@@ -605,9 +597,8 @@
             viewHost.Expect(vm => vm.AddDocumentView(Arg<TestViewDerivative>.Is.NotNull,
                                                      Arg<string>.Is.Anything,
                                                      Arg<string>.Is.Equal(string.Empty),
-                                                     Arg<FontFamily>.Is.NotNull))
+                                                     Arg<FontFamily>.Is.Null))
                     .WhenCalled(invocation => { view = invocation.Arguments[0] as TestViewDerivative; });
-            viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments();
 
             mocks.ReplayAll();
 
@@ -651,12 +642,11 @@
             viewHost.Expect(vm => vm.AddDocumentView(Arg<TestView>.Matches(c => c.Data == data1),
                                                      Arg<string>.Is.Anything,
                                                      Arg<string>.Is.Equal(string.Empty),
-                                                     Arg<FontFamily>.Is.NotNull));
+                                                     Arg<FontFamily>.Is.Null));
             viewHost.Expect(vm => vm.AddDocumentView(Arg<TestView>.Matches(c => c.Data == data2),
                                                      Arg<string>.Is.Anything,
                                                      Arg<string>.Is.Equal(string.Empty),
-                                                     Arg<FontFamily>.Is.NotNull));
-            viewHost.Stub(vh => vh.SetImage(null, null)).IgnoreArguments();
+                                                     Arg<FontFamily>.Is.Null));
 
             mocks.ReplayAll();
 
@@ -692,9 +682,8 @@
             viewHost.Expect(vm => vm.AddDocumentView(Arg<TestView>.Is.NotNull,
                                                      Arg<string>.Is.Anything,
                                                      Arg<string>.Is.Equal(string.Empty),
-                                                     Arg<FontFamily>.Is.NotNull))
+                                                     Arg<FontFamily>.Is.Null))
                     .WhenCalled(invocation => viewList.Add(invocation.Arguments[0] as TestView));
-            viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments();
             viewHost.Expect(vh => vh.BringToFront(Arg<TestView>.Matches(c => c == viewList.First())));
 
             mocks.ReplayAll();
@@ -883,10 +872,9 @@
             viewHost.Expect(vm => vm.AddDocumentView(Arg<TestView>.Is.NotNull,
                                                      Arg<string>.Is.Anything,
                                                      Arg<string>.Is.Equal(string.Empty),
-                                                     Arg<FontFamily>.Is.NotNull))
+                                                     Arg<FontFamily>.Is.Null))
                     .WhenCalled(invocation => { documentViews.Add(invocation.Arguments[0] as TestView); })
                     .Repeat.Twice();
-            viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments().Repeat.Twice();
             viewHost.Expect(vh => vh.Remove(Arg<TestView>.Is.NotNull))
                     .WhenCalled(invocation => { documentViews.Remove(invocation.Arguments[0] as TestView); })
                     .Repeat.Twice();
@@ -975,10 +963,9 @@
             viewHost.Expect(vm => vm.AddDocumentView(Arg<TestView>.Is.NotNull,
                                                      Arg<string>.Is.Anything,
                                                      Arg<string>.Is.Equal(string.Empty),
-                                                     Arg<FontFamily>.Is.NotNull))
+                                                     Arg<FontFamily>.Is.Null))
                     .WhenCalled(invocation => { documentViews.Add(invocation.Arguments[0] as TestView); })
                     .Repeat.Twice();
-            viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments().Repeat.Twice();
             mocks.ReplayAll();
 
             var viewInfos = new ViewInfo[]
@@ -1018,10 +1005,9 @@
             viewHost.Expect(vm => vm.AddDocumentView(Arg<TestView>.Is.NotNull,
                                                      Arg<string>.Is.Anything,
                                                      Arg<string>.Is.Equal(string.Empty),
-                                                     Arg<FontFamily>.Is.NotNull))
+                                                     Arg<FontFamily>.Is.Null))
                     .WhenCalled(invocation => { documentViews.Add(invocation.Arguments[0] as TestView); })
                     .Repeat.Twice();
-            viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments().Repeat.Twice();
             viewHost.Expect(vh => vh.Remove(Arg<TestView>.Is.NotNull)).WhenCalled(invocation => { documentViews.Remove(invocation.Arguments[0] as TestView); });
 
             mocks.ReplayAll();
@@ -1064,10 +1050,9 @@
             viewHost.Expect(vm => vm.AddDocumentView(Arg<TestView>.Is.NotNull,
                                                      Arg<string>.Is.Anything,
                                                      Arg<string>.Is.Equal(string.Empty),
-                                                     Arg<FontFamily>.Is.NotNull))
+                                                     Arg<FontFamily>.Is.Null))
                     .WhenCalled(invocation => { documentViews.Add(invocation.Arguments[0] as TestView); })
                     .Repeat.Twice();
-            viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments().Repeat.Twice();
             viewHost.Expect(vh => vh.Remove(Arg<TestView>.Is.NotNull))
                     .WhenCalled(invocation => { documentViews.Remove(invocation.Arguments[0] as TestView); })
                     .Repeat.Twice();
@@ -1128,9 +1113,8 @@
             viewHost.Expect(vm => vm.AddDocumentView(Arg<TestView>.Is.NotNull,
                                                      Arg<string>.Is.Anything,
                                                      Arg<string>.Is.Equal(string.Empty),
-                                                     Arg<FontFamily>.Is.NotNull))
+                                                     Arg<FontFamily>.Is.Null))
                     .WhenCalled(invocation => { documentViews.Add(invocation.Arguments[0] as TestView); });
-            viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments();
             viewHost.Expect(vh => vh.Remove(Arg<TestView>.Is.NotNull))
                     .WhenCalled(invocation => { documentViews.Remove(invocation.Arguments[0] as TestView); });