Index: Core/Common/test/Core.Common.Gui.TestUtil/PluginTestHelper.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -rc1cc1f19fd990be1c975122d38e80d5cfd16f30c
--- Core/Common/test/Core.Common.Gui.TestUtil/PluginTestHelper.cs	(.../PluginTestHelper.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/test/Core.Common.Gui.TestUtil/PluginTestHelper.cs	(.../PluginTestHelper.cs)	(revision c1cc1f19fd990be1c975122d38e80d5cfd16f30c)
@@ -34,9 +34,9 @@
     {
         /// <summary>
         /// Asserts that the given <paramref name="propertyInfos"/> contains a definition for the combination of
-        /// <paramref name="dataObjectType"/> and <paramref name="propertyObjectType"/>. 
+        /// <paramref name="dataObjectType"/> and <paramref name="propertyObjectType"/>.
         /// </summary>
-        /// <param name="propertyInfos">Collection of <see cref="PropertyInfo"/> definitions.</param>
+        /// <param name="propertyInfos">The collection of <see cref="PropertyInfo"/> definitions.</param>
         /// <param name="dataObjectType">The type of the data object for which property info is defined.</param>
         /// <param name="propertyObjectType">The type of the object which shows the data object properties.</param>
         /// <returns>The found property info.</returns>
@@ -56,7 +56,7 @@
         }
 
         /// <summary>
-        /// Asserts that a view info is defined in the collection of view infos given. 
+        /// Asserts that a view info is defined in the collection of view infos given.
         /// </summary>
         /// <param name="viewInfos">The collection of <see cref="ViewInfo"/> to search in.</param>
         /// <param name="dataType">The type of the data which is passed to the <see cref="ViewInfo"/>.</param>
@@ -65,34 +65,33 @@
         /// <returns>The <see cref="ViewInfo"/> that was found within the collection of <see cref="viewInfos"/>.</returns>
         /// <exception cref="AssertionException">Thrown when either:
         /// <list type="bullet">
-        /// <item><paramref name="viewInfos"/> is <c>null</c></item>
-        /// <item>no <see cref="ViewInfo"/> can be found for type <paramref name="dataType"/></item>
-        /// <item>the found <see cref="ViewInfo"/> does not define the expected <paramref name="viewDataType"/> or 
-        /// <paramref name="viewType"/></item>
-        /// </list></exception>
+        /// <item><paramref name="viewInfos"/> is <c>null</c>;</item>
+        /// <item>no <see cref="ViewInfo"/> can be found for the combination of <paramref name="viewDataType"/> and <paramref name="viewType"/>;</item>
+        /// <item>the found <see cref="ViewInfo"/> does not define the expected <paramref name="dataType"/>.</item>
+        /// </list>
+        /// </exception>
         public static ViewInfo AssertViewInfoDefined(IEnumerable<ViewInfo> viewInfos, Type dataType, Type viewDataType, Type viewType)
         {
             Assert.NotNull(viewInfos);
-            ViewInfo viewInfo = viewInfos.SingleOrDefault(vi => vi.DataType == dataType);
-            Assert.NotNull(viewInfo, "Could not find viewInfo for the dataType {0}", dataType);
-            Assert.AreEqual(viewDataType, viewInfo.ViewDataType);
-            Assert.AreEqual(viewType, viewInfo.ViewType);
+            ViewInfo viewInfo = viewInfos.SingleOrDefault(vi => vi.ViewDataType == viewDataType && vi.ViewType == viewType);
+            Assert.NotNull(viewInfo, "Could not find viewInfo for the combination of viewDataType {0} and viewType {1} ", viewDataType, viewType);
+            Assert.AreEqual(dataType, viewInfo.DataType);
             return viewInfo;
         }
 
         /// <summary>
-        /// Asserts that a view info is defined in the collection of view infos given. 
+        /// Asserts that a view info is defined in the collection of view infos given.
         /// </summary>
         /// <param name="viewInfos">The collection of <see cref="ViewInfo"/> to search in.</param>
         /// <param name="dataType">The type of the data which is passed to the <see cref="ViewInfo"/> and is set on the view.</param>
         /// <param name="viewType">The type of the view.</param>
         /// <returns>The <see cref="ViewInfo"/> that was found within the collection of <see cref="viewInfos"/>.</returns>
         /// <exception cref="AssertionException">Thrown when either:
         /// <list type="bullet">
-        /// <item><paramref name="viewInfos"/> is <c>null</c></item>
-        /// <item>no <see cref="ViewInfo"/> can be found for type <paramref name="dataType"/></item>
-        /// <item>the found <see cref="ViewInfo"/> does not define the expected <paramref name="viewType"/></item>
-        /// </list></exception>
+        /// <item><paramref name="viewInfos"/> is <c>null</c>;</item>
+        /// <item>no <see cref="ViewInfo"/> can be found for the combination of <paramref name="dataType"/> and <paramref name="viewType"/>.</item>
+        /// </list>
+        /// </exception>
         public static ViewInfo AssertViewInfoDefined(IEnumerable<ViewInfo> viewInfos, Type dataType, Type viewType)
         {
             return AssertViewInfoDefined(viewInfos, dataType, dataType, viewType);