diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj
index 9ed980b88b..141e0a2947 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj
@@ -72,6 +72,7 @@
     <Compile Include="Designer\OutlineView\SelectionTests.cs" />
     <Compile Include="Designer\PlacementTests.cs" />
     <Compile Include="Designer\SetPropertyTests.cs" />
+    <Compile Include="XamlDom\CollectionTests.cs" />
     <Compile Include="XamlDom\ExampleClass.cs" />
     <Compile Include="XamlDom\ExampleClassContainer.cs" />
     <Compile Include="XamlDom\ExampleService.cs" />
@@ -101,7 +102,5 @@
       <Name>WpfDesign.Designer</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Designer\OutlineView" />
-  </ItemGroup>
+  <ItemGroup />
 </Project>
\ No newline at end of file
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/CollectionTests.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/CollectionTests.cs
new file mode 100644
index 0000000000..32ef6c95cc
--- /dev/null
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/CollectionTests.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Documents;
+using System.Windows.Media.Animation;
+using ICSharpCode.WpfDesign.XamlDom;
+using NUnit.Framework;
+
+namespace ICSharpCode.WpfDesign.Tests.XamlDom
+{
+    [TestFixture]
+    public class CollectionTests
+    {
+        [Test]
+        public void LineBreakNoCollection()
+        {
+            var isCollection = CollectionSupport.IsCollectionType(typeof(LineBreak));
+
+            Assert.IsFalse(isCollection);
+        }
+    }
+}
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs
index a6c2731e50..bb3f834eed 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs
@@ -140,5 +140,99 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
   </StackPanel>
 </Page>");
 		}
+		
+		[Test]
+		public void Resources2()
+		{
+			TestLoading(@"<UserControl
+    xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+    xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
+    <FrameworkElement.Resources>
+       <ResourceDictionary />
+   </FrameworkElement.Resources>
+  </UserControl>");
+		}
+		
+		[Test]
+		public void Animation1()
+		{
+			TestLoading(@"<Window
+    xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+    xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
+<Canvas>
+<Button Width=""100"" Height=""100"" Canvas.Left=""8"" Canvas.Top=""8"">
+  <Button.Triggers>
+    <EventTrigger RoutedEvent=""Button.Loaded"">
+      <BeginStoryboard>
+        <Storyboard>
+          <DoubleAnimation Duration=""0:0:10""
+                           From=""1""
+                           To=""0""
+                           Storyboard.TargetProperty=""Opacity"" />
+        </Storyboard>
+      </BeginStoryboard>
+    </EventTrigger>
+  </Button.Triggers>
+</Button>
+</Canvas>
+</Window>");
+		}
+		
+		[Test]
+		public void Animation2()
+		{
+			//Loaded Property has to be found, because this so also works in WPF
+			
+			TestLoading(@"<Window
+    xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+    xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
+<Canvas>
+<Button Width=""100"" Height=""100"" Canvas.Left=""8"" Canvas.Top=""8"">
+  <Button.Triggers>
+    <EventTrigger RoutedEvent=""Loaded"">
+      <BeginStoryboard>
+        <Storyboard>
+          <DoubleAnimation Duration=""0:0:10""
+                           From=""1""
+                           To=""0""
+                           Storyboard.TargetProperty=""Opacity"" />
+        </Storyboard>
+      </BeginStoryboard>
+    </EventTrigger>
+  </Button.Triggers>
+</Button>
+</Canvas>
+</Window>");
+		}
+		
+		[Test]
+		public void Animation3()
+		{
+			TestLoading(@"<Window 
+    xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+    xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
+<Canvas>
+<Button Width=""100"" Height=""100"" Canvas.Left=""8"" Canvas.Top=""8"">
+  <Button.Triggers>
+    <EventTrigger RoutedEvent=""Button.Loaded"">
+      <BeginStoryboard>
+      <BeginStoryboard.Storyboard>
+        <Storyboard>
+          <DoubleAnimation Duration=""0:0:10""
+                           From=""1""
+                           To=""0""
+                           Storyboard.TargetProperty=""Opacity"" />
+        </Storyboard>
+        </BeginStoryboard.Storyboard>
+      </BeginStoryboard>
+    </EventTrigger>
+  </Button.Triggers>
+</Button>
+</Canvas>
+</Window>");
+		}
+		
+		
+		
 	}
 }
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObject.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObject.cs
index 0429d5192c..fbe1131988 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObject.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObject.cs
@@ -70,7 +70,7 @@ namespace ICSharpCode.WpfDesign.XamlDom
 			if (property.IsAttached == false) {
 				foreach (XamlProperty p in properties) {
 					if (p.IsAttached == false && p.PropertyName == property.PropertyName)
-						Debug.Fail("duplicate property");
+						throw new XamlLoadException("duplicate property");
 				}
 			}
 			#endif