Tweaked a couple of tests.

tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests.cs

@@ -152,7 +152,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
             Assert.Equal("foo", target.DataContext);
         }
 
-        private class TestContentControl : TemplatedControl
+        private class TestContentControl : ContentControl
         {
             public IControl Child { get; set; }
         }

tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs

@@ -77,6 +77,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 
                 var canvas = (Canvas)target.Presenter.Child;
                 Assert.Same(viewModel, target.DataContext);
+                Assert.Same(viewModel.Child, target.Presenter.DataContext);
                 Assert.Same(viewModel.Child.Child, canvas.DataContext);
             }
         }