Index: Core/Common/src/Core.Common.Controls/Views/IView.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r6c6c9b6eb17d92348c51b05a7e862c860c3d018a
--- Core/Common/src/Core.Common.Controls/Views/IView.cs	(.../IView.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Core/Common/src/Core.Common.Controls/Views/IView.cs	(.../IView.cs)	(revision 6c6c9b6eb17d92348c51b05a7e862c860c3d018a)
@@ -24,7 +24,7 @@
 namespace Core.Common.Controls.Views
 {
     /// <summary>
-    /// Interface for graphical user interface views.
+    /// Interface for graphical user interface views. Class should have a default constructor.
     /// </summary>
     public interface IView : IDisposable
     {
Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/IViewResolver.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r6c6c9b6eb17d92348c51b05a7e862c860c3d018a
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/IViewResolver.cs	(.../IViewResolver.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/IViewResolver.cs	(.../IViewResolver.cs)	(revision 6c6c9b6eb17d92348c51b05a7e862c860c3d018a)
@@ -27,71 +27,45 @@
 
 namespace Core.Common.Gui.Forms.ViewManager
 {
+    /// <summary>
+    /// Interface for an object capable of finding a view for a given data object.
+    /// </summary>
     public interface IViewResolver
     {
         /// <summary>
-        /// Default view types registered for data object types.
+        /// Default view types registered for data object types, that can be used to automatically
+        /// resolve to a particular view when multiple candidates are available.
         /// </summary>
         /// <remarks>The keys in this dictionary are the object types and the values the 
-        /// corresponding view object types.</remarks>
+        /// corresponding view types.</remarks>
         IDictionary<Type, Type> DefaultViewTypes { get; }
 
         /// <summary>
-        /// List of view info objects used for resolving views
+        /// Opens a view for specified data.
         /// </summary>
-        IList<ViewInfo> ViewInfos { get; }
-
-        /// <summary>
-        /// Opens a view for specified data. Using viewprovider to resolve the correct view.
-        /// </summary>
-        /// <param name="data">Data to open a view for</param>
-        /// <param name="alwaysShowDialog">Always present the user with a dialog to choose from</param>
+        /// <param name="data">Data to open a view for.</param>
+        /// <param name="alwaysShowDialog">Always present the user with a dialog to choose
+        /// the view that has to be opened.</param>
         bool OpenViewForData(object data, bool alwaysShowDialog = false);
 
         /// <summary>
-        /// Creates a view for the <paramref name="data"/> 
-        /// </summary>
-        /// <param name="data">The data to create a view for</param>
-        /// <param name="selectViewInfo">Function to filter the view infos to use</param>
-        /// <returns>A view for data</returns>
-        IView CreateViewForData(object data, Func<ViewInfo, bool> selectViewInfo = null);
-
-        /// <summary>
-        /// Check if a view can be created for the <paramref name="data"/>.
-        /// </summary>
-        /// <param name="data">The data to check for</param>
-        /// <returns></returns>
-        bool CanOpenViewFor(object data);
-
-        /// <summary>
-        /// Returns all currently opened views for the same data.
-        /// </summary>
-        /// <param name="data"></param>
-        /// <returns></returns>
-        IList<IView> GetViewsForData(object data);
-
-        /// <summary>
         /// Closes all views for <paramref name="data"/>.
         /// </summary>
-        /// <param name="data"></param>
-        /// <returns></returns>
+        /// <param name="data">The data object to close all views for.</param>
         void CloseAllViewsFor(object data);
 
         /// <summary>
-        /// Gives the default viewtype for the given data object.
+        /// Gets the view info objects for the <paramref name="data"/>.
         /// </summary>
-        /// <param name="dataObject"></param>
-        /// <returns></returns>
-        Type GetDefaultViewType(object dataObject);
+        /// <param name="data">Data used for finding matches.</param>
+        /// <returns>The matching view info object.</returns>
+        IEnumerable<ViewInfo> GetViewInfosFor(object data);
 
         /// <summary>
-        /// Gets the view info objects for the <paramref name="data"/>
+        /// Gets the name of the view.
         /// </summary>
-        /// <param name="data">Data used for searching the view infos</param>
-        /// <param name="viewType">The viewType of the view info</param>
-        /// <returns>The matching view infos for data and view type</returns>
-        IEnumerable<ViewInfo> GetViewInfosFor(object data, Type viewType = null);
-
+        /// <param name="view">The view.</param>
+        /// <returns>The name of the view.</returns>
         string GetViewName(IView view);
     }
 }
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewList.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r6c6c9b6eb17d92348c51b05a7e862c860c3d018a
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewList.cs	(.../ViewList.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewList.cs	(.../ViewList.cs)	(revision 6c6c9b6eb17d92348c51b05a7e862c860c3d018a)
@@ -103,7 +103,7 @@
 
         private bool Close(IView view, bool removeTabFromDockingManager, bool activateNextView)
         {
-            if (ViewResolver.IsViewOpening)
+            if (ViewResolver.IsOpeningView)
             {
                 throw new InvalidOperationException(Resources.ViewList_Close_View_is_being_closed_while_it_is_being_opened);
             }
Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r6c6c9b6eb17d92348c51b05a7e862c860c3d018a
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs	(.../ViewResolver.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs	(.../ViewResolver.cs)	(revision 6c6c9b6eb17d92348c51b05a7e862c860c3d018a)
@@ -23,28 +23,40 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
+
 using Core.Common.Controls.Views;
 using Core.Common.Gui.Plugin;
 using Core.Common.Gui.Properties;
 using Core.Common.Utils.Reflection;
+
 using log4net;
 
 namespace Core.Common.Gui.Forms.ViewManager
 {
+    /// <summary>
+    /// Object responsible for finding a view given some data-object.
+    /// </summary>
     public class ViewResolver : IViewResolver
     {
-        private static readonly ILog Log = LogManager.GetLogger(typeof(ViewResolver));
+        private static readonly ILog log = LogManager.GetLogger(typeof(ViewResolver));
+
         private readonly IDictionary<Type, Type> defaultViewTypes = new Dictionary<Type, Type>();
 
         private readonly ViewList viewList;
-        private readonly IList<ViewInfo> viewInfos;
-        private readonly IWin32Window owner;
+        private readonly ViewInfo[] viewInfos;
+        private readonly IWin32Window dialogParent;
 
-        public ViewResolver(ViewList viewList, IEnumerable<ViewInfo> viewInfos, IWin32Window owner)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ViewResolver"/> class.
+        /// </summary>
+        /// <param name="viewList">The view list.</param>
+        /// <param name="viewInfos">The sequence of available view info objects.</param>
+        /// <param name="dialogParent">The parent object for which dialogs should be shown on top.</param>
+        public ViewResolver(ViewList viewList, IEnumerable<ViewInfo> viewInfos, IWin32Window dialogParent)
         {
             this.viewList = viewList;
-            this.viewInfos = viewInfos.ToList();
-            this.owner = owner;
+            this.viewInfos = viewInfos.ToArray();
+            this.dialogParent = dialogParent;
         }
 
         public IDictionary<Type, Type> DefaultViewTypes
@@ -55,38 +67,30 @@
             }
         }
 
-        public IList<ViewInfo> ViewInfos
-        {
-            get
-            {
-                return viewInfos;
-            }
-        }
-
         public bool OpenViewForData(object data, bool alwaysShowDialog = false)
         {
             try
             {
-                IsViewOpening = true;
+                IsOpeningView = true;
 
                 if (data == null)
                 {
                     return false;
                 }
 
-                var viewInfoList = FilterOnInheritance(GetViewInfosFor(data)).ToList();
-
-                if (viewInfoList.Count == 0)
+                var viewInfoList = FilterOnInheritance(GetViewInfosFor(data)).ToArray();
+                if (viewInfoList.Length == 0)
                 {
-                    Log.DebugFormat(Resources.ViewResolver_OpenViewForData_No_view_registered_for_0_, data);
+                    log.DebugFormat(Resources.ViewResolver_OpenViewForData_No_view_registered_for_0_, data);
                     return false;
                 }
 
                 if (!alwaysShowDialog)
                 {
-                    if (viewInfoList.Count == 1)
+                    if (viewInfoList.Length == 1)
                     {
-                        return CreateViewFromViewInfo(data, viewInfoList[0]);
+                        CreateViewFromViewInfo(data, viewInfoList[0]);
+                        return true;
                     }
 
                     // Create default view
@@ -95,100 +99,50 @@
 
                     if (defaultViewInfo != null)
                     {
-                        if (CreateViewFromViewInfo(data, defaultViewInfo))
-                        {
-                            return true;
-                        }
-
-                        viewInfoList.Remove(defaultViewInfo);
+                        CreateViewFromViewInfo(data, defaultViewInfo);
+                        return true;
                     }
                 }
 
-                if (viewInfoList.Count == 0)
+                // Create chosen view
+                var chosenViewInfo = GetViewInfoUsingDialog(data, viewInfoList);
+                if (chosenViewInfo == null)
                 {
                     return false;
                 }
-
-                // Create chosen view
-                var chosenViewInfo = GetViewInfoUsingDialog(data, viewInfoList);
-
-                return chosenViewInfo != null && CreateViewFromViewInfo(data, chosenViewInfo);
+                else
+                {
+                    CreateViewFromViewInfo(data, chosenViewInfo);
+                    return true;
+                }
             }
             finally
             {
-                IsViewOpening = false;
+                IsOpeningView = false;
             }
         }
 
-        public IView CreateViewForData(object data, Func<ViewInfo, bool> selectViewInfo = null)
+        public void CloseAllViewsFor(object data)
         {
-            var viewInfoList = ((selectViewInfo == null)
-                                    ? GetViewInfosFor(data)
-                                    : GetViewInfosFor(data).Where(selectViewInfo))
-                .ToList();
-
-            if (viewInfoList.Count == 0)
+            if (data == null)
             {
-                return null;
+                return;
             }
 
-            if (viewInfoList.Count > 1)
+            foreach (var view in viewList.ToArray())
             {
-                throw new Exception(Resources.ViewResolver_CreateViewForData_More_than_one_view_for_data);
+                if (ShouldRemoveViewForData(view, data))
+                {
+                    viewList.Remove(view);
+                }
             }
-
-            return CreateViewForData(data, viewInfoList[0]);
         }
 
-        public bool CanOpenViewFor(object data)
+        public IEnumerable<ViewInfo> GetViewInfosFor(object data)
         {
-            return data != null && GetViewInfosFor(data).Any();
+            return viewInfos.Where(vi => data.GetType().Implements(vi.DataType) && vi.AdditionalDataCheck(data));
         }
 
-        public IList<IView> GetViewsForData(object data)
-        {
-            return GetViewsForData(viewList, data).ToList();
-        }
-
-        public void CloseAllViewsFor(object data)
-        {
-            DoWithMatchingViews(data, viewList,
-                                v => viewList.Remove(v),
-                                (v, o) =>
-                                {
-                                    var viewInfo = GetViewInfoForView(v);
-                                    if (viewInfo != null)
-                                    {
-                                        return viewInfo.CloseForData(v, o);
-                                    }
-
-                                    return false;
-                                });
-        }
-
-        public Type GetDefaultViewType(object dataObject)
-        {
-            if (dataObject == null)
-            {
-                return null;
-            }
-
-            var selectionType = dataObject.GetType();
-
-            return defaultViewTypes.Keys.Contains(selectionType)
-                       ? defaultViewTypes[selectionType]
-                       : null;
-        }
-
-        public IEnumerable<ViewInfo> GetViewInfosFor(object data, Type viewType = null)
-        {
-            var infos = ViewInfos.Where(vi => data.GetType().Implements(vi.DataType) && vi.AdditionalDataCheck(data));
-
-            return viewType != null
-                       ? infos.Where(vi => viewType.Implements(vi.ViewType))
-                       : infos;
-        }
-
         public string GetViewName(IView view)
         {
             var viewInfo = GetViewInfoForView(view);
@@ -201,39 +155,42 @@
         }
 
         /// <summary>
-        /// Checks consistency of ViewList / ViewResolver logic. Sometimes views are closed while being opened.
+        /// Indicates if the view resolver is opening a view. Can be used to ensure consistency 
+        /// of <see cref="ViewList"/> / <see cref="ViewResolver"/> logic. Sometimes views 
+        /// are closed while being opened.
         /// </summary>
-        internal static bool IsViewOpening { get; private set; }
+        internal static bool IsOpeningView { get; private set; }
 
-        private void DoWithMatchingViews(object data, IEnumerable<IView> views, Action<IView> viewAction, Func<IView, object, bool> extraCheck = null)
+        private bool ShouldRemoveViewForData(IView view, object data)
         {
-            var viewsToCheck = views.ToList();
-            foreach (var view in viewsToCheck)
+            if (IsViewData(view, data))
             {
-                if (IsViewData(view, data) || (extraCheck != null && extraCheck(view, data)))
-                {
-                    viewAction(view);
-                }
+                return true;
             }
+
+            var viewInfo = GetViewInfoForView(view);
+            return viewInfo != null && viewInfo.CloseForData(view, data);
         }
 
-        private IEnumerable<IView> GetViewsForData(IEnumerable<IView> viewsToCheck, object data)
+        private Type GetDefaultViewType(object dataObject)
         {
-            return data != null
-                       ? GetOpenViewsFor(viewsToCheck, data)
-                       : Enumerable.Empty<IView>();
+            var selectionType = dataObject.GetType();
+
+            return defaultViewTypes.ContainsKey(selectionType)
+                       ? defaultViewTypes[selectionType]
+                       : null;
         }
 
         private static IEnumerable<ViewInfo> FilterOnInheritance(IEnumerable<ViewInfo> compatibleStandaloneViewInfos)
         {
-            var viewInfos = compatibleStandaloneViewInfos.ToList();
+            var viewInfos = compatibleStandaloneViewInfos.ToArray();
 
             // filter on inheritance
-            var dataTypes = viewInfos.Select(i => i.DataType).ToList();
+            var dataTypes = viewInfos.Select(i => i.DataType).ToArray();
             return viewInfos.Where(i => !dataTypes.Any(t => t != i.DataType && t.Implements(i.DataType)));
         }
 
-        private bool CreateViewFromViewInfo(object data, ViewInfo viewInfo)
+        private void CreateViewFromViewInfo(object data, ViewInfo viewInfo)
         {
             var viewData = viewInfo.GetViewData(data);
             var view = (viewInfo.DataType == viewInfo.ViewDataType
@@ -246,20 +203,18 @@
                 viewInfo.OnActivateView(view, data);
                 viewList.ActiveView = view;
 
-                return true;
+                return;
             }
 
             var newView = CreateViewForData(data, viewInfo);
 
             viewList.Add(newView);
             viewList.SetImage(newView, viewInfo.Image);
-
-            return true;
         }
 
         private static IView CreateViewForData(object data, ViewInfo viewInfo)
         {
-            var view = (IView) Activator.CreateInstance(viewInfo.ViewType);
+            var view = (IView)Activator.CreateInstance(viewInfo.ViewType);
 
             view.Data = viewInfo.GetViewData(data);
 
@@ -280,7 +235,7 @@
                                       : null;
 
             var viewTypeDictionary = viewInfoList.ToDictionary(vi => vi.Description ?? vi.ViewType.Name);
-            using (var viewSelector = new SelectViewDialog(owner)
+            using (var viewSelector = new SelectViewDialog(dialogParent)
             {
                 DefaultViewName = defaultViewName,
                 Items = viewTypeDictionary.Keys.ToList()
@@ -306,39 +261,20 @@
             }
         }
 
-        private IEnumerable<IView> GetOpenViewsFor(IEnumerable<IView> viewsToCheck, object data, Func<IView, ViewInfo, bool> extraCheck = null)
+        private IEnumerable<IView> GetOpenViewsFor(IEnumerable<IView> viewsToCheck, object data)
         {
-            if (data == null)
-            {
-                yield break;
-            }
-
-            foreach (var view in viewsToCheck)
-            {
-                var viewInfo = GetViewInfoForView(view);
-
-                if (IsViewData(view, data) && (extraCheck == null || extraCheck(view, viewInfo)))
-                {
-                    yield return view;
-                }
-            }
+            return viewsToCheck.Where(view => IsViewData(view, data));
         }
 
         private bool IsViewData(IView view, object data)
         {
             var viewInfo = GetViewInfoForView(view);
-            return data.Equals(view.Data) || (IsDataForView(view, data) && Equals(viewInfo.GetViewData(data), view.Data));
+            return data.Equals(view.Data) || (IsDataForView(data, GetViewInfoForView(view)) && Equals(viewInfo.GetViewData(data), view.Data));
         }
 
-        private bool IsDataForView(IView view, object data)
+        private bool IsDataForView(object data, ViewInfo info)
         {
-            if (data == null)
-            {
-                return false;
-            }
-
-            var viewInfo = GetViewInfoForView(view);
-            return viewInfo != null && data.GetType().Implements(viewInfo.DataType) && viewInfo.AdditionalDataCheck(data);
+            return info != null && data.GetType().Implements(info.DataType) && info.AdditionalDataCheck(data);
         }
 
         private ViewInfo GetViewInfoForView(IView view)
@@ -350,7 +286,7 @@
         {
             var selectedItemType = data.GetType();
 
-            if (defaultViewTypes.Keys.Contains(selectedItemType))
+            if (defaultViewTypes.ContainsKey(selectedItemType))
             {
                 defaultViewTypes.Remove(selectedItemType);
             }
@@ -360,7 +296,7 @@
         {
             var selectedItemType = data.GetType();
 
-            if (defaultViewTypes.Keys.Contains(selectedItemType))
+            if (defaultViewTypes.ContainsKey(selectedItemType))
             {
                 defaultViewTypes[selectedItemType] = selectedViewType;
             }
@@ -374,7 +310,7 @@
         {
             var selectionType = dataObject.GetType();
 
-            return defaultViewTypes.Keys.Contains(selectionType) ? defaultViewTypes[selectionType] : null;
+            return defaultViewTypes.ContainsKey(selectionType) ? defaultViewTypes[selectionType] : null;
         }
     }
 }
\ No newline at end of file
Index: Core/Common/test/Core.Common.Gui.Test/Forms/ViewManager/TestView.Designer.cs
===================================================================
diff -u -r1e9f415cb615bf84526faeecb51f9a70498f9ffc -r6c6c9b6eb17d92348c51b05a7e862c860c3d018a
--- Core/Common/test/Core.Common.Gui.Test/Forms/ViewManager/TestView.Designer.cs	(.../TestView.Designer.cs)	(revision 1e9f415cb615bf84526faeecb51f9a70498f9ffc)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/ViewManager/TestView.Designer.cs	(.../TestView.Designer.cs)	(revision 6c6c9b6eb17d92348c51b05a7e862c860c3d018a)
@@ -1,4 +1,4 @@
-namespace Core.Common.Test.TestObjects
+namespace Core.Common.Gui.Test.Forms.ViewManager
 {
     partial class TestView
     {
Index: Core/Common/test/Core.Common.Gui.Test/Forms/ViewManager/TestView.cs
===================================================================
diff -u -r1e9f415cb615bf84526faeecb51f9a70498f9ffc -r6c6c9b6eb17d92348c51b05a7e862c860c3d018a
--- Core/Common/test/Core.Common.Gui.Test/Forms/ViewManager/TestView.cs	(.../TestView.cs)	(revision 1e9f415cb615bf84526faeecb51f9a70498f9ffc)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/ViewManager/TestView.cs	(.../TestView.cs)	(revision 6c6c9b6eb17d92348c51b05a7e862c860c3d018a)
@@ -1,7 +1,8 @@
 using System.Windows.Forms;
+
 using Core.Common.Controls.Views;
 
-namespace Core.Common.Test.TestObjects
+namespace Core.Common.Gui.Test.Forms.ViewManager
 {
     public partial class TestView : UserControl, IView
     {
Index: Core/Common/test/Core.Common.Gui.Test/Forms/ViewManager/ViewResolverTest.cs
===================================================================
diff -u -r1e9f415cb615bf84526faeecb51f9a70498f9ffc -r6c6c9b6eb17d92348c51b05a7e862c860c3d018a
--- Core/Common/test/Core.Common.Gui.Test/Forms/ViewManager/ViewResolverTest.cs	(.../ViewResolverTest.cs)	(revision 1e9f415cb615bf84526faeecb51f9a70498f9ffc)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/ViewManager/ViewResolverTest.cs	(.../ViewResolverTest.cs)	(revision 6c6c9b6eb17d92348c51b05a7e862c860c3d018a)
@@ -1,10 +1,10 @@
 using System;
 using System.Linq;
+using System.Windows.Forms;
 
 using Core.Common.Controls.Views;
 using Core.Common.Gui.Forms.ViewManager;
 using Core.Common.Gui.Plugin;
-using Core.Common.Test.TestObjects;
 using Core.Common.Utils;
 
 using NUnit.Framework;
@@ -13,134 +13,830 @@
 
 namespace Core.Common.Gui.Test.Forms.ViewManager
 {
+    [TestFixture]
     public class ViewResolverTest
     {
         [Test]
-        public void OpeningAViewForAObjectShouldUseNewView()
+        public void ParameteredConstructor_ExpectedValues()
         {
             // Setup
             var mocks = new MockRepository();
             var dockingManager = mocks.Stub<IDockingManager>();
+            var dialogParent = mocks.Stub<IWin32Window>();
             mocks.ReplayAll();
 
-            var viewList = new ViewList(dockingManager, ViewLocation.Left);
-            var viewResolver = new ViewResolver(viewList, new ViewInfo[]
+            using (var viewList = new ViewList(dockingManager, ViewLocation.Bottom))
             {
+                // Call
+                var viewResolver = new ViewResolver(viewList, Enumerable.Empty<ViewInfo>(), dialogParent);
+
+                // Assert
+                Assert.IsInstanceOf<IViewResolver>(viewResolver);
+                CollectionAssert.IsEmpty(viewResolver.DefaultViewTypes);
+
+                mocks.VerifyAll();
+            }
+        }
+
+        [Test]
+        [TestCase(true)]
+        [TestCase(false)]
+        public void OpenViewForData_DataIsNull_ReturnFalse(bool forceShowDialog)
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dockingManager = mocks.Stub<IDockingManager>();
+            var dialogParent = mocks.Stub<IWin32Window>();
+            mocks.ReplayAll();
+
+            var viewInfos = new ViewInfo[]
+            {
                 new ViewInfo<object, TestView>()
-            }, null);
+            };
 
-            var testObject = new object();
-            viewResolver.OpenViewForData(testObject);
-            var viewForTestObject = viewList[0];
-            Assert.AreEqual(testObject, viewForTestObject.Data);
+            using (var viewList = new ViewList(dockingManager, ViewLocation.Document))
+            {
+                var viewResolver = new ViewResolver(viewList, viewInfos, dialogParent);
 
-            var otherObject = new object();
-            viewResolver.OpenViewForData(otherObject);
+                // Call
+                var result = viewResolver.OpenViewForData(null, forceShowDialog);
 
-            // extra views. the first view now renders the other object
-            Assert.AreEqual(2, viewList.Count);
+                // Assert
+                Assert.IsFalse(result);
+            }
+        }
 
-            // no change in original view
-            Assert.AreEqual(testObject, viewForTestObject.Data);
+        [Test]
+        public void OpenViewForData_DataHasSingleMatch_ReturnTrueAndAddToViewList()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dockingManager = mocks.Stub<IDockingManager>();
+            var dialogParent = mocks.Stub<IWin32Window>();
+            mocks.ReplayAll();
 
+            var data = new object();
+            const string viewData = "<I'm a piece of view data>";
+            const string viewName = "<name of the view>";
+            bool afterCreateCalled = false;
+            bool activateViewCalled = false;
+
+            var viewInfos = new ViewInfo[]
+            {
+                new ViewInfo<ViewResolverTest, TestView>(), 
+                new ViewInfo<object, TestView>
+                {
+                    GetViewData = o =>
+                    {
+                        Assert.AreSame(data, o);
+                        return viewData;
+                    },
+                    AfterCreate = (view, o) =>
+                    {
+                        Assert.IsInstanceOf<TestView>(view);
+                        Assert.AreSame(data, o);
+                        afterCreateCalled = true;
+                    },
+                    GetViewName = (view, o) =>
+                    {
+                        Assert.IsInstanceOf<TestView>(view);
+                        Assert.AreSame(viewData, o);
+                        return viewName;
+                    },
+                    OnActivateView = (view, o) =>
+                    {
+                        Assert.IsInstanceOf<TestView>(view);
+                        Assert.AreSame(data, o);
+                        activateViewCalled = true;
+                    }
+                },
+                new ViewInfo<int, TestView>()
+            };
+
+            using (var viewList = new ViewList(dockingManager, ViewLocation.Document))
+            {
+                var viewResolver = new ViewResolver(viewList, viewInfos, dialogParent);
+                
+
+                // Call
+                var result = viewResolver.OpenViewForData(data);
+
+                // Assert
+                Assert.IsTrue(result);
+                Assert.AreEqual(1, viewList.Count);
+                var view = (TestView)viewList[0];
+                Assert.AreSame(view, viewList.ActiveView);
+                Assert.AreEqual(viewData, view.Data);
+                Assert.AreEqual(viewName, view.Text);
+
+                Assert.IsTrue(afterCreateCalled);
+                Assert.IsTrue(activateViewCalled);
+            }
+        }
+
+        [Test]
+        [TestCase(true)]
+        [TestCase(false)]
+        public void OpenViewForData_NoViewInfoRegistered_ReturnFalse(bool forceShowDialog)
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dockingManager = mocks.Stub<IDockingManager>();
+            var dialogParent = mocks.Stub<IWin32Window>();
+            mocks.ReplayAll();
+
+            var viewInfos = new ViewInfo[0];
+
+            using (var viewList = new ViewList(dockingManager, ViewLocation.Document))
+            {
+                var viewResolver = new ViewResolver(viewList, viewInfos, dialogParent);
+
+                // Call
+                var result = viewResolver.OpenViewForData(new object(), forceShowDialog);
+
+                // Assert
+                Assert.IsFalse(result);
+            }
+        }
+
+        [Test]
+        public void OpenViewForData_DataHasSingleMatchOnBaseType_ReturnTrueAndAddToViewList()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dockingManager = mocks.Stub<IDockingManager>();
+            var dialogParent = mocks.Stub<IWin32Window>();
+            mocks.ReplayAll();
+
+            var data = new InheritedFromA();
+            const string viewName = "<cool view name>";
+            bool afterCreateCalled = false;
+            bool activateViewCalled = false;
+
+            var viewInfos = new ViewInfo[]
+            {
+                new ViewInfo<ViewResolverTest, TestView>(), 
+                new ViewInfo<A, TestView>
+                {
+                    AfterCreate = (view, o) =>
+                    {
+                        Assert.IsInstanceOf<TestView>(view);
+                        Assert.AreSame(data, o);
+                        afterCreateCalled = true;
+                    },
+                    GetViewName = (view, o) =>
+                    {
+                        Assert.IsInstanceOf<TestView>(view);
+                        Assert.AreSame(data, o);
+                        return viewName;
+                    },
+                    OnActivateView = (view, o) =>
+                    {
+                        Assert.IsInstanceOf<TestView>(view);
+                        Assert.AreSame(data, o);
+                        activateViewCalled = true;
+                    }
+                },
+                new ViewInfo<int, TestView>()
+            };
+
+            using (var viewList = new ViewList(dockingManager, ViewLocation.Document))
+            {
+                var viewResolver = new ViewResolver(viewList, viewInfos, dialogParent);
+
+
+                // Call
+                var result = viewResolver.OpenViewForData(data);
+
+                // Assert
+                Assert.IsTrue(result);
+                Assert.AreEqual(1, viewList.Count);
+                var view = (TestView)viewList[0];
+                Assert.AreSame(view, viewList.ActiveView);
+                Assert.AreEqual(data, view.Data);
+                Assert.AreEqual(viewName, view.Text);
+
+                Assert.IsTrue(afterCreateCalled);
+                Assert.IsTrue(activateViewCalled);
+            }
+        }
+
+        [Test]
+        public void OpenViewForData_DataHasMultipleMatchesOnType_ResolveToMostSpecializedAndReturnTrueAndAddToViewList()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dockingManager = mocks.Stub<IDockingManager>();
+            var dialogParent = mocks.Stub<IWin32Window>();
+            mocks.ReplayAll();
+
+            var data = new InheritedFromA();
+
+            var viewInfos = new ViewInfo[]
+            {
+                new ViewInfo<InheritedFromA, TestViewDerivative>(), 
+                new ViewInfo<A, TestView>()
+            };
+
+            using (var viewList = new ViewList(dockingManager, ViewLocation.Document))
+            {
+                var viewResolver = new ViewResolver(viewList, viewInfos, dialogParent);
+
+                // Call
+                var result = viewResolver.OpenViewForData(data);
+
+                // Assert
+                Assert.IsTrue(result);
+                Assert.AreEqual(1, viewList.Count);
+                var view = (TestViewDerivative)viewList[0];
+                Assert.AreSame(view, viewList.ActiveView);
+                Assert.AreEqual(data, view.Data);
+                Assert.AreEqual(string.Empty, view.Text);
+            }
+        }
+
+        [Test]
+        public void OpenViewForData_ViewInfosForInheritedData_ResolveToMostSpecializedForDataAndReturnTrueAndAddToViewList()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dockingManager = mocks.Stub<IDockingManager>();
+            var dialogParent = mocks.Stub<IWin32Window>();
+            mocks.ReplayAll();
+
+            var data = new A();
+
+            var viewInfos = new ViewInfo[]
+            {
+                new ViewInfo<InheritedFromA, TestViewDerivative>(), // Should not be matched as A does not inherit from InheritedFromA!
+                new ViewInfo<A, TestView>()
+            };
+
+            using (var viewList = new ViewList(dockingManager, ViewLocation.Document))
+            {
+                var viewResolver = new ViewResolver(viewList, viewInfos, dialogParent);
+
+                // Call
+                var result = viewResolver.OpenViewForData(data);
+
+                // Assert
+                Assert.IsTrue(result);
+                Assert.AreEqual(1, viewList.Count);
+                var view = (TestView)viewList[0];
+                Assert.AreSame(view, viewList.ActiveView);
+                Assert.AreEqual(data, view.Data);
+                Assert.AreEqual(string.Empty, view.Text);
+            }
+        }
+
+        [Test]
+        public void OpenViewForData_DataHasMultipleSingleMatches_UseAdditionalDataCheckAndReturnTrueAndAddToViewList()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dockingManager = mocks.Stub<IDockingManager>();
+            var dialogParent = mocks.Stub<IWin32Window>();
+            mocks.ReplayAll();
+
+            var data = new object();
+
+            var viewInfos = new ViewInfo[]
+            {
+                new ViewInfo<object, TestViewDerivative>
+                {
+                    AdditionalDataCheck = o => true
+                }, 
+                new ViewInfo<object, TestView>
+                {
+                    AdditionalDataCheck = o => false
+                }
+            };
+
+            using (var viewList = new ViewList(dockingManager, ViewLocation.Document))
+            {
+                var viewResolver = new ViewResolver(viewList, viewInfos, dialogParent);
+
+                // Call
+                var result = viewResolver.OpenViewForData(data);
+
+                // Assert
+                Assert.IsTrue(result);
+                Assert.AreEqual(1, viewList.Count);
+                var view = (TestViewDerivative)viewList[0];
+                Assert.AreSame(view, viewList.ActiveView);
+                Assert.AreSame(data, view.Data);
+            }
+        }
+
+        [Test]
+        public void OpenViewForData_DataHasMultipleMatchesAndRegisteredDefaultView_ReturnTrueAndAddDefaultViewToViewList()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dockingManager = mocks.Stub<IDockingManager>();
+            var dialogParent = mocks.Stub<IWin32Window>();
+            mocks.ReplayAll();
+
+            var data = new object();
+
+            var viewInfos = new ViewInfo[]
+            {
+                new ViewInfo<object, TestViewDerivative>(), 
+                new ViewInfo<object, TestView>()
+            };
+
+            using (var viewList = new ViewList(dockingManager, ViewLocation.Document))
+            {
+                var viewResolver = new ViewResolver(viewList, viewInfos, dialogParent);
+                viewResolver.DefaultViewTypes[typeof(object)] = typeof(TestViewDerivative);
+
+                // Call
+                var result = viewResolver.OpenViewForData(data);
+
+                // Assert
+                Assert.IsTrue(result);
+                Assert.AreEqual(1, viewList.Count);
+                var view = (TestViewDerivative)viewList[0];
+                Assert.AreSame(view, viewList.ActiveView);
+                Assert.AreEqual(data, view.Data);
+                Assert.AreEqual(string.Empty, view.Text);
+            }
+        }
+
+        [Test]
+        public void OpenViewForData_OpenSameViewForTwoDifferentDataInstances_OpenTwoViews()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dockingManager = mocks.Stub<IDockingManager>();
+            var dialogParent = mocks.Stub<IWin32Window>();
+            mocks.ReplayAll();
+
+            using (var viewList = new ViewList(dockingManager, ViewLocation.Left))
+            {
+                var viewInfos = new ViewInfo[]
+                {
+                    new ViewInfo<object, TestView>()
+                };
+
+                var viewResolver = new ViewResolver(viewList, viewInfos, dialogParent);
+
+                var data1 = new object();
+                var data2 = new object();
+
+                // Call
+                viewResolver.OpenViewForData(data1);
+                viewResolver.OpenViewForData(data2);
+
+                // Assert
+                CollectionAssert.AllItemsAreInstancesOfType(viewList, typeof(TestView));
+                Assert.AreEqual(2, viewList.Count,
+                    "Should have opened 2 views for 2 different data instances.");
+
+                Assert.AreSame(data1, viewList[0].Data);
+                Assert.AreSame(data2, viewList[1].Data);
+            }
             mocks.VerifyAll();
         }
 
         [Test]
         [RequiresSTA]
         public void OpeningViewForDataTwiceShouldOnlySetActiveView()
         {
+            // Setup
+            var url = new WebLink("Deltares", new Uri("http://www.deltares.nl"));
+
             var mocks = new MockRepository();
             var dockingManager = mocks.Stub<IDockingManager>();
+            var dialogParent = mocks.Stub<IWin32Window>();
             mocks.ReplayAll();
 
-            var url = new WebLink("Deltares", new Uri("http://www.deltares.nl"));
+            using (var viewList = new ViewList(dockingManager, ViewLocation.Document))
+            {
+                var viewInfos = new ViewInfo[]
+                {
+                    new ViewInfo<WebLink, HtmlPageView>()
+                };
 
-            var viewList = new ViewList(dockingManager, ViewLocation.Document);
-            var viewResolver = new ViewResolver(viewList, new ViewInfo[]
+                var viewResolver = new ViewResolver(viewList, viewInfos, dialogParent);
+
+                // Open view...
+                viewResolver.OpenViewForData(url);
+
+                var originallyActiveView = viewList.ActiveView;
+
+                // ... then make it inactive.
+                viewList.ActiveView = null;
+
+                // Call
+                viewResolver.OpenViewForData(url);
+
+                // Assert
+                Assert.AreEqual(1, viewList.Count);
+                Assert.AreSame(originallyActiveView, viewList[0]);
+                Assert.AreEqual(originallyActiveView, viewList.ActiveView);
+            }
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void GetViewInfosFor_NoViewInfosRegistered_ReturnEmpty()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dockingManager = mocks.Stub<IDockingManager>();
+            var dialogParent = mocks.Stub<IWin32Window>();
+            mocks.ReplayAll();
+
+            using (var viewList = new ViewList(dockingManager, ViewLocation.Bottom))
             {
-                new ViewInfo<WebLink, HtmlPageView>()
-            }, null);
+                var viewResolver = new ViewResolver(viewList, Enumerable.Empty<ViewInfo>(), dialogParent);
 
-            viewResolver.OpenViewForData(url);
+                var data = new object();
 
-            var activeView = viewList.ActiveView;
+                // Call
+                var matchedViewInfos = viewResolver.GetViewInfosFor(data);
 
-            viewList.ActiveView = null;
-            viewResolver.OpenViewForData(url);
+                // Assert
+                CollectionAssert.IsEmpty(matchedViewInfos);
+            }
+            mocks.VerifyAll();
+        }
 
-            Assert.AreEqual(activeView, viewList.ActiveView);
+        [Test]
+        public void GetViewInfosFor_SingleDirectMatch_ReturnSingleMatchingViewInfo()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dockingManager = mocks.Stub<IDockingManager>();
+            var dialogParent = mocks.Stub<IWin32Window>();
+            mocks.ReplayAll();
 
+            using (var viewList = new ViewList(dockingManager, ViewLocation.Bottom))
+            {
+                var viewInfos = new ViewInfo[]
+                {
+                    new ViewInfo<A, TestView>(),
+                    new ViewInfo<int, TestView>(),
+                    new ViewInfo<string, TestView>()
+                };
+
+                var viewResolver = new ViewResolver(viewList, viewInfos, dialogParent);
+
+                var data = default(int);
+
+                // Call
+                var matchedViewInfos = viewResolver.GetViewInfosFor(data).ToArray();
+
+                // Assert
+                CollectionAssert.AreEqual(new[]{viewInfos[1]}, matchedViewInfos);
+            }
             mocks.VerifyAll();
         }
 
         [Test]
-        public void GetViewsForDataWithCustomData()
+        public void GetViewInfosFor_ViewInfosWithInheritance_ReturnMatchesBasedOnInheritaceDataType()
         {
+            // Setup
             var mocks = new MockRepository();
             var dockingManager = mocks.Stub<IDockingManager>();
+            var dialogParent = mocks.Stub<IWin32Window>();
             mocks.ReplayAll();
 
-            var viewList = new ViewList(dockingManager, ViewLocation.Left);
-            var viewResolver = new ViewResolver(viewList, new ViewInfo[]
+            using (var viewList = new ViewList(dockingManager, ViewLocation.Bottom))
             {
-                new ViewInfo<TestWrapper, string, TestView>
+                var viewInfos = new ViewInfo[]
                 {
-                    GetViewData = o => o.RealData
-                }
-            }, null);
+                    new ViewInfo<A, TestView>(),
+                    new ViewInfo<InheritedFromA, TestView>(),
+                    new ViewInfo<object, TestView>()
+                };
 
-            var someDataObject = "some data object";
-            var wrapper = new TestWrapper
+                var viewResolver = new ViewResolver(viewList, viewInfos, dialogParent);
+
+                var data = new A();
+
+                // Call
+                var matchedViewInfos = viewResolver.GetViewInfosFor(data).ToArray();
+
+                // Assert
+                var expected = new[]
+                {
+                    viewInfos[0],
+                    viewInfos[2]
+                };
+                CollectionAssert.AreEqual(expected, matchedViewInfos);
+            }
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void GetViewInfosFor_ViewInfosWithAdditionalDataCheck_ReturnMatchesWithAdditionalDataCheckTrue()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dockingManager = mocks.Stub<IDockingManager>();
+            var dialogParent = mocks.Stub<IWin32Window>();
+            mocks.ReplayAll();
+
+            using (var viewList = new ViewList(dockingManager, ViewLocation.Bottom))
             {
-                RealData = someDataObject
-            };
+                var viewInfos = new ViewInfo[]
+                {
+                    new ViewInfo<A, TestView>
+                    {
+                        AdditionalDataCheck = a => true
+                    },
+                    new ViewInfo<InheritedFromA, TestView>(),
+                    new ViewInfo<object, TestView>
+                    {
+                        AdditionalDataCheck = o => false
+                    }
+                };
 
-            var view = new TestView
+                var viewResolver = new ViewResolver(viewList, viewInfos, dialogParent);
+
+                var data = new InheritedFromA();
+
+                // Call
+                var matchedViewInfos = viewResolver.GetViewInfosFor(data).ToArray();
+
+                // Assert
+                var expected = new[]
+                {
+                    viewInfos[0],
+                    viewInfos[1]
+                };
+                CollectionAssert.AreEqual(expected, matchedViewInfos);
+            }
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void GetViewName_ViewNotRegistered_ReturnEmptyString()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dockingManager = mocks.Stub<IDockingManager>();
+            var dialogParent = mocks.Stub<IWin32Window>();
+            mocks.ReplayAll();
+
+            using (var view = new TestView())
+            using (var viewList = new ViewList(dockingManager, ViewLocation.Floating))
             {
-                Data = someDataObject
-            };
+                var viewResolver = new ViewResolver(viewList, Enumerable.Empty<ViewInfo>(), dialogParent);
 
-            viewList.Add(view);
+                // Call
+                var name = viewResolver.GetViewName(view);
 
-            var returnedViews = viewResolver.GetViewsForData(wrapper); // <-- must trigger IViewProvider.IsViewForData()
+                // Assert
+                Assert.AreEqual(string.Empty, name);
+            }
+            mocks.VerifyAll();
+        }
 
-            Assert.AreEqual(1, returnedViews.Count, "number of compatible views");
+        [Test]
+        public void GetViewName_RegisteredViewHasNoGetViewNameImplementation_ReturnNull()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dockingManager = mocks.Stub<IDockingManager>();
+            var dialogParent = mocks.Stub<IWin32Window>();
+            mocks.ReplayAll();
 
-            Assert.AreSame(view, returnedViews.First(), "correct view is returned back");
+            using (var view = new TestView())
+            using (var viewList = new ViewList(dockingManager, ViewLocation.Floating))
+            {
+                var viewInfos = new ViewInfo[]
+                {
+                    new ViewInfo<object, TestView>()
+                };
+                var viewResolver = new ViewResolver(viewList, viewInfos, dialogParent);
 
+                // Call
+                var name = viewResolver.GetViewName(view);
+
+                // Assert
+                Assert.IsNull(name);
+            }
             mocks.VerifyAll();
         }
 
         [Test]
-        public void OpenViewForItemShouldNotReturnSubClassedViews()
+        public void GetViewName_RegisteredViewWithGetViewNameImplementation_ReturnName()
         {
+            // Setup
             var mocks = new MockRepository();
             var dockingManager = mocks.Stub<IDockingManager>();
+            var dialogParent = mocks.Stub<IWin32Window>();
             mocks.ReplayAll();
 
-            var viewList = new ViewList(dockingManager, ViewLocation.Left);
-            var viewResolver = new ViewResolver(viewList, new ViewInfo[]
+            var data = new A();
+            const string viewName = "<view name>";
+
+            using (var view = new TestView { Data = data })
+            using (var viewList = new ViewList(dockingManager, ViewLocation.Floating))
             {
-                new ViewInfo<object, TestView>
+                var viewInfos = new ViewInfo[]
                 {
-                    Description = "Object view"
-                },
-                new ViewInfo<string, TestViewDerivative>
+                    new ViewInfo<object, TestView>
+                    {
+                        GetViewName = (testView, o) =>
+                        {
+                            Assert.AreSame(view, testView);
+                            Assert.AreSame(data, o);
+                            return viewName;
+                        }
+                    }
+                };
+                var viewResolver = new ViewResolver(viewList, viewInfos, dialogParent);
+
+                // Call
+                var name = viewResolver.GetViewName(view);
+
+                // Assert
+                Assert.AreEqual(viewName, name);
+            }
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void CloseAllViewsFor_DataDoesNotCorrespondToOpenedViews_DoNothing()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dockingManager = mocks.Stub<IDockingManager>();
+            var dialogParent = mocks.Stub<IWin32Window>();
+            mocks.ReplayAll();
+
+            using (var viewList = new ViewList(dockingManager, ViewLocation.Document))
+            {
+                var viewInfos = new ViewInfo[]
                 {
-                    Description = "String view"
-                } // string inherits from object 
-            }, null);
+                    new ViewInfo<A, TestView>(),
+                    new ViewInfo<InheritedFromA, TestViewDerivative>(),
+                };
 
-            var data = "string data";
-            viewResolver.OpenViewForData(data);
+                var data1 = new A();
+                var data2 = new InheritedFromA();
+                var unusedViewData = new object();
 
-            var view = viewList.ActiveView;
+                var viewResolver = new ViewResolver(viewList, viewInfos, dialogParent);
+                viewResolver.OpenViewForData(data1);
+                viewResolver.OpenViewForData(data2);
 
-            Assert.AreEqual(data, view.Data);
-            Assert.AreEqual(typeof(TestViewDerivative), view.GetType());
+                // Precondition
+                Assert.AreEqual(2, viewList.Count);
 
+                // Call
+                viewResolver.CloseAllViewsFor(unusedViewData);
+
+                // Assert
+                Assert.AreEqual(2, viewList.Count,
+                    "No elements should have been removed.");
+            }
             mocks.VerifyAll();
         }
+
+        [Test]
+        public void CloseAllViewsFor_DataDoesNotCorrespondToOpenedViewsButCloseForDataReturnsTrue_RemoveViews()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dockingManager = mocks.Stub<IDockingManager>();
+            var dialogParent = mocks.Stub<IWin32Window>();
+            mocks.ReplayAll();
+
+            using (var viewList = new ViewList(dockingManager, ViewLocation.Document))
+            {
+                var data1 = new A();
+                var data2 = new InheritedFromA();
+                var unusedViewData = new object();
+
+                var viewInfos = new ViewInfo[]
+                {
+                    new ViewInfo<A, TestView>
+                    {
+                        CloseForData = (view, o) =>
+                        {
+                            Assert.IsInstanceOf<TestView>(view);
+                            Assert.AreSame(data1, view.Data);
+                            Assert.AreSame(unusedViewData, o);
+                            return true;
+                        }
+                    },
+                    new ViewInfo<InheritedFromA, TestViewDerivative>
+                    {
+                        CloseForData = (view, o) =>
+                        {
+                            Assert.IsInstanceOf<TestView>(view);
+                            Assert.AreSame(data2, view.Data);
+                            Assert.AreSame(unusedViewData, o);
+                            return true;
+                        }
+                    }
+                };
+
+                var viewResolver = new ViewResolver(viewList, viewInfos, dialogParent);
+                viewResolver.OpenViewForData(data1);
+                viewResolver.OpenViewForData(data2);
+
+                // Precondition
+                Assert.AreEqual(2, viewList.Count);
+
+                // Call
+                viewResolver.CloseAllViewsFor(unusedViewData);
+
+                // Assert
+                Assert.AreEqual(0, viewList.Count,
+                    "Views should be closed due to CloseForData returning true.");
+            }
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void CloseAllViewsFor_DataIsNull_DoNothing()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dockingManager = mocks.Stub<IDockingManager>();
+            var dialogParent = mocks.Stub<IWin32Window>();
+            mocks.ReplayAll();
+
+            using (var viewList = new ViewList(dockingManager, ViewLocation.Document))
+            {
+                var viewInfos = new ViewInfo[]
+                {
+                    new ViewInfo<A, TestView>(),
+                    new ViewInfo<InheritedFromA, TestViewDerivative>(),
+                };
+
+                var data1 = new A();
+                var data2 = new InheritedFromA();
+
+                var viewResolver = new ViewResolver(viewList, viewInfos, dialogParent);
+                viewResolver.OpenViewForData(data1);
+                viewResolver.OpenViewForData(data2);
+
+                // Precondition
+                Assert.AreEqual(2, viewList.Count);
+
+                // Call
+                viewResolver.CloseAllViewsFor(null);
+
+                // Assert
+                Assert.AreEqual(2, viewList.Count,
+                    "No elements should have been removed.");
+            }
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void CloseAllViewsFor_DataCorrespondsToOpenedView_RemoveThatView()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dockingManager = mocks.Stub<IDockingManager>();
+            var dialogParent = mocks.Stub<IWin32Window>();
+            mocks.ReplayAll();
+
+            using (var viewList = new ViewList(dockingManager, ViewLocation.Document))
+            {
+                var viewInfos = new ViewInfo[]
+                {
+                    new ViewInfo<A, TestView>(),
+                    new ViewInfo<InheritedFromA, TestViewDerivative>(),
+                };
+
+                var data1 = new A();
+                var data2 = new InheritedFromA();
+
+                var viewResolver = new ViewResolver(viewList, viewInfos, dialogParent);
+                viewResolver.OpenViewForData(data1);
+                viewResolver.OpenViewForData(data2);
+
+                // Precondition
+                Assert.AreEqual(2, viewList.Count);
+
+                // Call
+                viewResolver.CloseAllViewsFor(data1);
+
+                // Assert
+                Assert.AreEqual(1, viewList.Count);
+                Assert.IsInstanceOf<TestViewDerivative>(viewList[0]);
+                Assert.AreSame(data2, viewList[0].Data);
+            }
+            mocks.VerifyAll();
+        }
+
+        private class A
+        {
+            
+        }
+
+        private class InheritedFromA : A
+        {
+            
+        }
     }
 }
\ No newline at end of file