diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs
deleted file mode 100644
index d0798d469f..0000000000
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs
+++ /dev/null
@@ -1,374 +0,0 @@
-////using System;
-////using System.Collections.Generic;
-////using System.Linq;
-////using Avalonia.Controls.Generators;
-////using Avalonia.Controls.Presenters;
-////using Avalonia.Controls.Primitives;
-////using Avalonia.Controls.Templates;
-////using Avalonia.Layout;
-////using Avalonia.Platform;
-////using Avalonia.Rendering;
-////using Avalonia.UnitTests;
-////using Avalonia.VisualTree;
-////using Xunit;
-
-////namespace Avalonia.Controls.UnitTests.Presenters
-////{
-////    public class ItemsPresenterTests_Virtualization
-////    {
-////        [Fact]
-////        public void Should_Not_Create_Items_Before_Added_To_Visual_Tree()
-////        {
-////            var items = Enumerable.Range(0, 10).Select(x => $"Item {x}").ToList();
-////            var target = new TestItemsPresenter(true)
-////            {
-////                Items = items,
-////                ItemsPanel = VirtualizingPanelTemplate(Orientation.Vertical),
-////                ItemTemplate = ItemTemplate(),
-////                VirtualizationMode = ItemVirtualizationMode.Simple,
-////            };
-
-////            var scroller = new ScrollContentPresenter
-////            {
-////                Content = target,
-////            };
-
-////            scroller.UpdateChild();
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            Assert.Empty(target.Panel.Children);
-
-////            var root = new TestRoot
-////            {
-////                Child = scroller,
-////            };
-
-////            target.InvalidateMeasure();
-////            target.Panel.InvalidateMeasure();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            Assert.Equal(10, target.Panel.Children.Count);
-////        }
-
-////        [Fact]
-////        public void Should_Return_IsLogicalScrollEnabled_False_When_Has_No_Virtualizing_Panel()
-////        {
-////            var target = CreateTarget();
-////            target.ClearValue(ItemsPresenter.ItemsPanelProperty);
-
-////            target.ApplyTemplate();
-
-////            Assert.False(((ILogicalScrollable)target).IsLogicalScrollEnabled);
-////        }
-
-////        [Fact]
-////        public void Should_Return_IsLogicalScrollEnabled_False_When_VirtualizationMode_None()
-////        {
-////            var target = CreateTarget(ItemVirtualizationMode.None);
-
-////            target.ApplyTemplate();
-
-////            Assert.False(((ILogicalScrollable)target).IsLogicalScrollEnabled);
-////        }
-
-////        [Fact]
-////        public void Should_Return_IsLogicalScrollEnabled_False_When_Doesnt_Have_ScrollPresenter_Parent()
-////        {
-////            var target = new ItemsPresenter
-////            {
-////                ItemsPanel = VirtualizingPanelTemplate(),
-////                ItemTemplate = ItemTemplate(),
-////                VirtualizationMode = ItemVirtualizationMode.Simple,
-////            };
-
-////            target.ApplyTemplate();
-
-////            Assert.False(((ILogicalScrollable)target).IsLogicalScrollEnabled);
-////        }
-
-////        [Fact]
-////        public void Should_Return_IsLogicalScrollEnabled_True()
-////        {
-////            var target = CreateTarget();
-
-////            target.ApplyTemplate();
-
-////            Assert.True(((ILogicalScrollable)target).IsLogicalScrollEnabled);
-////        }
-
-////        [Fact]
-////        public void Parent_ScrollContentPresenter_Properties_Should_Be_Set()
-////        {
-////            var target = CreateTarget();
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            var scroll = (ScrollContentPresenter)target.Parent;
-////            Assert.Equal(new Size(10, 20), scroll.Extent);
-////            Assert.Equal(new Size(100, 10), scroll.Viewport);
-////        }
-
-////        [Fact]
-////        public void Should_Fill_Panel_With_Containers()
-////        {
-////            var target = CreateTarget();
-
-////            target.ApplyTemplate();
-
-////            target.Measure(new Size(100, 100));
-////            Assert.Equal(10, target.Panel.Children.Count);
-
-////            target.Arrange(new Rect(0, 0, 100, 100));
-////            Assert.Equal(10, target.Panel.Children.Count);
-////        }
-
-////        [Fact]
-////        public void Should_Only_Create_Enough_Containers_To_Display_All_Items()
-////        {
-////            var target = CreateTarget(itemCount: 2);
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            Assert.Equal(2, target.Panel.Children.Count);
-////        }
-
-////        [Fact]
-////        public void Should_Expand_To_Fit_Containers_When_Flexible_Size()
-////        {
-////            var target = CreateTarget();
-
-////            target.ApplyTemplate();
-////            target.Measure(Size.Infinity);
-////            target.Arrange(new Rect(target.DesiredSize));
-
-////            Assert.Equal(new Size(10, 200), target.DesiredSize);
-////            Assert.Equal(new Size(10, 200), target.Bounds.Size);
-////            Assert.Equal(20, target.Panel.Children.Count);
-////        }
-
-////        [Fact]
-////        public void Initial_Item_DataContexts_Should_Be_Correct()
-////        {
-////            var target = CreateTarget();
-////            var items = (IList<string>)target.Items;
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            for (var i = 0; i < target.Panel.Children.Count; ++i)
-////            {
-////                Assert.Equal(items[i], target.Panel.Children[i].DataContext);
-////            }
-////        }
-
-////        [Fact]
-////        public void Should_Add_New_Items_When_Control_Is_Enlarged()
-////        {
-////            var target = CreateTarget();
-////            var items = (IList<string>)target.Items;
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            Assert.Equal(10, target.Panel.Children.Count);
-
-////            target.Measure(new Size(120, 120));
-////            target.Arrange(new Rect(0, 0, 100, 120));
-
-////            Assert.Equal(12, target.Panel.Children.Count);
-
-////            for (var i = 0; i < target.Panel.Children.Count; ++i)
-////            {
-////                Assert.Equal(items[i], target.Panel.Children[i].DataContext);
-////            }
-////        }
-
-////        [Fact]
-////        public void Should_Not_Create_Virtualizer_Before_Panel()
-////        {
-////            var target = CreateTarget();
-
-////            Assert.Null(target.Panel);
-////            Assert.Null(target.Virtualizer);
-////        }
-
-////        [Fact]
-////        public void Changing_VirtualizationMode_None_To_Simple_Should_Update_Control()
-////        {
-////            var target = CreateTarget(mode: ItemVirtualizationMode.None);
-////            var scroll = (ScrollContentPresenter)target.Parent;
-
-////            scroll.Measure(new Size(100, 100));
-////            scroll.Arrange(new Rect(0, 0, 100, 100));
-
-////            Assert.Equal(20, target.Panel.Children.Count);
-////            Assert.Equal(new Size(100, 200), scroll.Extent);
-////            Assert.Equal(new Size(100, 100), scroll.Viewport);
-
-////            target.VirtualizationMode = ItemVirtualizationMode.Simple;
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            Assert.Equal(10, target.Panel.Children.Count);
-////            Assert.Equal(new Size(10, 20), scroll.Extent);
-////            Assert.Equal(new Size(100, 10), scroll.Viewport);
-////        }
-
-////        [Fact]
-////        public void Changing_VirtualizationMode_None_To_Simple_Should_Add_Correct_Number_Of_Controls()
-////        {
-////            using (UnitTestApplication.Start(new TestServices()))
-////            {
-////                var target = CreateTarget(mode: ItemVirtualizationMode.None);
-////                var scroll = (TestScroller)target.Parent;
-
-////                scroll.Width = scroll.Height = 100;
-////                scroll.LayoutManager.ExecuteInitialLayoutPass();
-
-////                // Ensure than an intermediate measure pass doesn't add more controls than it
-////                // should. This can happen if target gets measured with Size.Infinity which
-////                // is what the available size should be when VirtualizationMode == None but not
-////                // what it should after VirtualizationMode is changed to Simple.
-////                target.Panel.Children.CollectionChanged += (s, e) =>
-////                {
-////                    Assert.InRange(target.Panel.Children.Count, 0, 10);
-////                };
-
-////                target.VirtualizationMode = ItemVirtualizationMode.Simple;
-////                ((ILayoutRoot)scroll.GetVisualRoot()).LayoutManager.ExecuteLayoutPass();
-
-////                Assert.Equal(10, target.Panel.Children.Count);
-////            }
-////        }
-
-////        [Fact]
-////        public void Changing_VirtualizationMode_Simple_To_None_Should_Update_Control()
-////        {
-////            var target = CreateTarget();
-////            var scroll = (ScrollContentPresenter)target.Parent;
-
-////            scroll.Measure(new Size(100, 100));
-////            scroll.Arrange(new Rect(0, 0, 100, 100));
-
-////            Assert.Equal(10, target.Panel.Children.Count);
-////            Assert.Equal(new Size(10, 20), scroll.Extent);
-////            Assert.Equal(new Size(100, 10), scroll.Viewport);
-
-////            target.VirtualizationMode = ItemVirtualizationMode.None;
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            // Here - unlike changing the other way - we need to do a layout pass on the scroll
-////            // content presenter as non-logical scroll values are only updated on arrange.
-////            scroll.Measure(new Size(100, 100));
-////            scroll.Arrange(new Rect(0, 0, 100, 100));
-
-////            Assert.Equal(20, target.Panel.Children.Count);
-////            Assert.Equal(new Size(100, 200), scroll.Extent);
-////            Assert.Equal(new Size(100, 100), scroll.Viewport);
-////        }
-
-////        private static ItemsPresenter CreateTarget(
-////            ItemVirtualizationMode mode = ItemVirtualizationMode.Simple,
-////            Orientation orientation = Orientation.Vertical,
-////            bool useContainers = true,
-////            int itemCount = 20)
-////        {
-////            ItemsPresenter result;
-////            var items = Enumerable.Range(0, itemCount).Select(x => $"Item {x}").ToList();
-
-////            var scroller = new TestScroller
-////            {
-////                CanHorizontallyScroll = false,
-////                CanVerticallyScroll = true,
-////                Content = result = new TestItemsPresenter(useContainers)
-////                {
-////                    Items = items,
-////                    ItemsPanel = VirtualizingPanelTemplate(orientation),
-////                    ItemTemplate = ItemTemplate(),
-////                    VirtualizationMode = mode,
-////                }
-////            };
-
-////            scroller.UpdateChild();
-
-////            return result;
-////        }
-
-////        private static IDataTemplate ItemTemplate()
-////        {
-////            return new FuncDataTemplate<string>((x, _) => new Canvas
-////            {
-////                Width = 10,
-////                Height = 10,
-////            });
-////        }
-
-////        private static ITemplate<Panel> VirtualizingPanelTemplate(
-////            Orientation orientation = Orientation.Vertical)
-////        {
-////            return new FuncTemplate<Panel>(() => new VirtualizingStackPanel
-////            {
-////                Orientation = orientation,
-////            });
-////        }
-
-////        private class TestScroller : ScrollContentPresenter, IRenderRoot, ILayoutRoot
-////        {
-////            public TestScroller()
-////            {
-////                LayoutManager = new LayoutManager(this);
-////            }
-
-////            public IRenderer Renderer { get; }
-////            public Size ClientSize { get; }
-////            public double RenderScaling => 1;
-
-////            public Size MaxClientSize => Size.Infinity;
-
-////            public double LayoutScaling => 1;
-
-////            public ILayoutManager LayoutManager { get; }
-
-////            public IRenderTarget CreateRenderTarget() => throw new NotImplementedException();
-////            public void Invalidate(Rect rect) => throw new NotImplementedException();
-////            public Point PointToClient(PixelPoint p) => throw new NotImplementedException();
-////            public PixelPoint PointToScreen(Point p) => throw new NotImplementedException();
-////        }
-
-////        private class TestItemsPresenter : ItemsPresenter
-////        {
-////            private bool _useContainers;
-
-////            public TestItemsPresenter(bool useContainers)
-////            {
-////                _useContainers = useContainers;
-////            }
-
-////            protected override IItemContainerGenerator CreateItemContainerGenerator()
-////            {
-////                return _useContainers ?
-////                    new ItemContainerGenerator<TestContainer>(this, TestContainer.ContentProperty, null) :
-////                    new ItemContainerGenerator(this);
-////            }
-////        }
-
-////        private class TestContainer : ContentControl
-////        {
-////            public TestContainer()
-////            {
-////                Width = 10;
-////                Height = 10;
-////            }
-////        }
-////    }
-////}
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs
deleted file mode 100644
index 131b86e4b1..0000000000
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs
+++ /dev/null
@@ -1,1110 +0,0 @@
-////using System;
-////using System.Collections;
-////using System.Collections.Generic;
-////using System.Collections.ObjectModel;
-////using System.Linq;
-////using Avalonia.Collections;
-////using Avalonia.Controls.Generators;
-////using Avalonia.Controls.Presenters;
-////using Avalonia.Controls.Primitives;
-////using Avalonia.Controls.Templates;
-////using Avalonia.Input;
-////using Avalonia.Layout;
-////using Avalonia.LogicalTree;
-////using Avalonia.Platform;
-////using Avalonia.Rendering;
-////using Avalonia.Styling;
-////using Avalonia.UnitTests;
-////using Xunit;
-
-////namespace Avalonia.Controls.UnitTests.Presenters
-////{
-////    public class ItemsPresenterTests_Virtualization_Simple
-////    {
-////        [Fact]
-////        public void Should_Return_Items_Count_For_Extent_Vertical()
-////        {
-////            var target = CreateTarget();
-
-////            target.ApplyTemplate();
-
-////            Assert.Equal(new Size(0, 20), ((ILogicalScrollable)target).Extent);
-////        }
-
-////        [Fact]
-////        public void Should_Return_Items_Count_For_Extent_Horizontal()
-////        {
-////            var target = CreateTarget(orientation: Orientation.Horizontal);
-
-////            target.ApplyTemplate();
-
-////            Assert.Equal(new Size(20, 0), ((ILogicalScrollable)target).Extent);
-////        }
-
-////        [Fact]
-////        public void Should_Have_Number_Of_Visible_Items_As_Viewport_Vertical()
-////        {
-////            var target = CreateTarget();
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            Assert.Equal(new Size(100, 10), ((ILogicalScrollable)target).Viewport);
-////        }
-
-////        [Fact]
-////        public void Should_Have_Number_Of_Visible_Items_As_Viewport_Horizontal()
-////        {
-////            var target = CreateTarget(orientation: Orientation.Horizontal);
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            Assert.Equal(new Size(10, 100), ((ILogicalScrollable)target).Viewport);
-////        }
-
-////        [Fact]
-////        public void Should_Add_Containers_When_Panel_Is_Not_Full()
-////        {
-////            var target = CreateTarget(itemCount: 5);
-////            var items = (IList<string>)target.Items;
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            Assert.Equal(5, target.Panel.Children.Count);
-
-////            items.Add("New Item");
-
-////            Assert.Equal(6, target.Panel.Children.Count);
-////        }
-
-////        [Fact]
-////        public void Should_Remove_Items_When_Control_Is_Shrank()
-////        {
-////            var target = CreateTarget();
-////            var items = (IList<string>)target.Items;
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            Assert.Equal(10, target.Panel.Children.Count);
-
-////            target.Measure(new Size(100, 80));
-////            target.Arrange(new Rect(0, 0, 100, 80));
-
-////            Assert.Equal(8, target.Panel.Children.Count);
-////        }
-
-////        [Fact]
-////        public void Should_Add_New_Containers_At_Top_When_Control_Is_Scrolled_To_Bottom_And_Enlarged()
-////        {
-////            var target = CreateTarget();
-////            var items = (IList<string>)target.Items;
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            Assert.Equal(10, target.Panel.Children.Count);
-
-////            ((IScrollable)target).Offset = new Vector(0, 10);
-////            target.Measure(new Size(120, 120));
-////            target.Arrange(new Rect(0, 0, 100, 120));
-
-////            Assert.Equal(12, target.Panel.Children.Count);
-
-////            for (var i = 0; i < target.Panel.Children.Count; ++i)
-////            {
-////                Assert.Equal(items[i + 8], target.Panel.Children[i].DataContext);
-////            }
-////        }
-
-////        [Fact]
-////        public void Should_Update_Containers_When_Items_Changes()
-////        {
-////            var target = CreateTarget();
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            target.Items = new[] { "foo", "bar", "baz" };
-
-////            Assert.Equal(3, target.Panel.Children.Count);
-////        }
-
-////        [Fact]
-////        public void Should_Decrease_The_Viewport_Size_By_One_If_There_Is_A_Partial_Item()
-////        {
-////            var target = CreateTarget();
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 95));
-////            target.Arrange(new Rect(0, 0, 100, 95));
-
-////            Assert.Equal(new Size(100, 9), ((ILogicalScrollable)target).Viewport);
-////        }
-
-////        [Fact]
-////        public void Moving_To_And_From_The_End_With_Partial_Item_Should_Set_Panel_PixelOffset()
-////        {
-////            var target = CreateTarget();
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 95));
-////            target.Arrange(new Rect(0, 0, 100, 95));
-
-////            ((ILogicalScrollable)target).Offset = new Vector(0, 11);
-
-////            var minIndex = target.ItemContainerGenerator.Containers.Min(x => x.Index);
-////            Assert.Equal(new Vector(0, 11), ((ILogicalScrollable)target).Offset);
-////            Assert.Equal(10, minIndex);
-////            Assert.Equal(10, ((IVirtualizingPanel)target.Panel).PixelOffset);
-
-////            ((ILogicalScrollable)target).Offset = new Vector(0, 10);
-
-////            minIndex = target.ItemContainerGenerator.Containers.Min(x => x.Index);
-////            Assert.Equal(new Vector(0, 10), ((ILogicalScrollable)target).Offset);
-////            Assert.Equal(10, minIndex);
-////            Assert.Equal(0, ((IVirtualizingPanel)target.Panel).PixelOffset);
-
-////            ((ILogicalScrollable)target).Offset = new Vector(0, 11);
-
-////            minIndex = target.ItemContainerGenerator.Containers.Min(x => x.Index);
-////            Assert.Equal(new Vector(0, 11), ((ILogicalScrollable)target).Offset);
-////            Assert.Equal(10, minIndex);
-////            Assert.Equal(10, ((IVirtualizingPanel)target.Panel).PixelOffset);
-////        }
-
-////        [Fact]
-////        public void Inserting_Items_Should_Update_Containers()
-////        {
-////            var target = CreateTarget();
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            ((ILogicalScrollable)target).Offset = new Vector(0, 5);
-
-////            var expected = Enumerable.Range(5, 10).Select(x => $"Item {x}").ToList();
-////            var items = (ObservableCollection<string>)target.Items;
-////            var actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-
-////            Assert.Equal(expected, actual);
-
-////            items.Insert(6, "Inserted");
-////            expected.Insert(1, "Inserted");
-////            expected.RemoveAt(expected.Count - 1);
-
-////            actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-////            Assert.Equal(expected, actual);
-////        }
-
-////        [Fact]
-////        public void Inserting_Items_Before_Visibile_Containers_Should_Update_Containers()
-////        {
-////            var target = CreateTarget();
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            ((ILogicalScrollable)target).Offset = new Vector(0, 5);
-
-////            var expected = Enumerable.Range(5, 10).Select(x => $"Item {x}").ToList();
-////            var items = (ObservableCollection<string>)target.Items;
-////            var actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-
-////            Assert.Equal(expected, actual);
-
-////            items.Insert(0, "Inserted");
-
-////            expected = Enumerable.Range(4, 10).Select(x => $"Item {x}").ToList();
-////            actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-////            Assert.Equal(expected, actual);
-////        }
-
-////        [Fact]
-////        public void Removing_First_Materialized_Item_Should_Update_Containers()
-////        {
-////            var target = CreateTarget();
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            var expected = Enumerable.Range(0, 10).Select(x => $"Item {x}").ToList();
-////            var items = (ObservableCollection<string>)target.Items;
-////            var actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-
-////            Assert.Equal(expected, actual);
-
-////            items.RemoveAt(0);
-////            expected = Enumerable.Range(1, 10).Select(x => $"Item {x}").ToList();
-
-////            actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-////            Assert.Equal(expected, actual);
-////        }
-
-////        [Fact]
-////        public void Removing_Items_From_Middle_Should_Update_Containers_When_All_Items_Visible()
-////        {
-////            var target = CreateTarget();
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 200));
-////            target.Arrange(new Rect(0, 0, 100, 200));
-
-////            var items = (ObservableCollection<string>)target.Items;
-////            var actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-
-////            Assert.Equal(items, actual);
-
-////            items.RemoveAt(2);
-
-////            actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-////            Assert.Equal(items, actual);
-
-////            items.RemoveAt(items.Count - 2);
-
-////            actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-////            Assert.Equal(items, actual);
-////        }
-
-////        [Fact]
-////        public void Removing_Last_Item_Should_Update_Containers_When_All_Items_Visible()
-////        {
-////            var target = CreateTarget();
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 200));
-////            target.Arrange(new Rect(0, 0, 100, 200));
-
-////            ((ILogicalScrollable)target).Offset = new Vector(0, 5);
-
-////            var expected = Enumerable.Range(0, 20).Select(x => $"Item {x}").ToList();
-////            var items = (ObservableCollection<string>)target.Items;
-////            var actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-
-////            Assert.Equal(expected, actual);
-
-////            items.Remove(items.Last());
-////            expected.Remove(expected.Last());
-
-////            actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-////            Assert.Equal(expected, actual);
-////        }
-
-////        [Fact]
-////        public void Removing_Items_When_Scrolled_To_End_Should_Recyle_Containers_At_Top()
-////        {
-////            var target = CreateTarget(useAvaloniaList: true);
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            ((ILogicalScrollable)target).Offset = new Vector(0, 10);
-
-////            var expected = Enumerable.Range(10, 10).Select(x => $"Item {x}").ToList();
-////            var items = (AvaloniaList<string>)target.Items;
-////            var actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-
-////            Assert.Equal(expected, actual);
-
-////            items.RemoveRange(18, 2);
-////            expected = Enumerable.Range(8, 10).Select(x => $"Item {x}").ToList();
-
-////            actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-////            Assert.Equal(expected, actual);
-////        }
-
-////        [Fact]
-////        public void Removing_Items_When_Scrolled_To_Near_End_Should_Recycle_Containers_At_Bottom_And_Top()
-////        {
-////            var target = CreateTarget(useAvaloniaList: true);
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            ((ILogicalScrollable)target).Offset = new Vector(0, 9);
-
-////            var expected = Enumerable.Range(9, 10).Select(x => $"Item {x}").ToList();
-////            var items = (AvaloniaList<string>)target.Items;
-////            var actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-
-////            Assert.Equal(expected, actual);
-
-////            items.RemoveRange(15, 3);
-////            expected = Enumerable.Range(7, 8).Select(x => $"Item {x}")
-////                .Concat(Enumerable.Range(18, 2).Select(x => $"Item {x}"))
-////                .ToList();
-
-////            actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-////            Assert.Equal(expected, actual);
-////        }
-
-////        [Fact]
-////        public void Measuring_To_Infinity_When_Scrolled_To_End_Should_Not_Throw()
-////        {
-////            var target = CreateTarget(useAvaloniaList: true);
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            ((ILogicalScrollable)target).Offset = new Vector(0, 10);
-
-////            // Check for issue #589: this should not throw.
-////            target.Measure(Size.Infinity);
-
-////            var expected = Enumerable.Range(0, 20).Select(x => $"Item {x}").ToList();
-////            var items = (AvaloniaList<string>)target.Items;
-////            var actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-
-////            Assert.Equal(expected, actual);
-////        }
-
-////        [Fact]
-////        public void Replacing_Items_Should_Update_Containers()
-////        {
-////            var target = CreateTarget();
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            var expected = Enumerable.Range(0, 10).Select(x => $"Item {x}").ToList();
-////            var items = (ObservableCollection<string>)target.Items;
-////            var actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-
-////            Assert.Equal(expected, actual);
-
-////            items[4] = expected[4] = "Replaced";
-
-////            actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-////            Assert.Equal(expected, actual);
-////        }
-
-////        [Fact]
-////        public void Moving_Items_Should_Update_Containers()
-////        {
-////            var target = CreateTarget();
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            var expected = Enumerable.Range(0, 10).Select(x => $"Item {x}").ToList();
-////            var items = (ObservableCollection<string>)target.Items;
-////            var actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-
-////            Assert.Equal(expected, actual);
-
-////            items.Move(4, 8);
-////            var i = expected[4];
-////            expected.RemoveAt(4);
-////            expected.Insert(8, i);
-
-////            actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-////            Assert.Equal(expected, actual);
-////        }
-
-////        [Fact]
-////        public void Setting_Items_To_Null_Should_Remove_Containers()
-////        {
-////            var target = CreateTarget();
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            var expected = Enumerable.Range(0, 10).Select(x => $"Item {x}").ToList();
-////            var items = (ObservableCollection<string>)target.Items;
-////            var actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-
-////            Assert.Equal(expected, actual);
-
-////            target.Items = null;
-
-////            Assert.Empty(target.Panel.Children);
-////        }
-
-////        [Fact]
-////        public void Reassigning_Items_Should_Create_Containers()
-////        {
-////            var target = CreateTarget(itemCount: 5);
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            var expected = Enumerable.Range(0, 5).Select(x => $"Item {x}").ToList();
-////            var items = (ObservableCollection<string>)target.Items;
-////            var actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-
-////            Assert.Equal(expected, actual);
-
-////            expected = Enumerable.Range(0, 6).Select(x => $"Item {x}").ToList();
-////            target.Items = expected;
-
-////            actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-////            Assert.Equal(expected, actual);
-////        }
-
-////        [Fact]
-////        public void Inserting_Then_Removing_Should_Add_Remove_Containers()
-////        {
-////            var items = new AvaloniaList<string>(Enumerable.Range(0, 5).Select(x => $"Item {x}"));
-////            var toAdd = Enumerable.Range(0, 3).Select(x => $"Added Item {x}").ToArray();
-////            var target = new ItemsPresenter
-////            {
-////                VirtualizationMode = ItemVirtualizationMode.None,
-////                Items = items,
-////                ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Height = 10 }),
-////            };
-
-////            target.ApplyTemplate();
-
-////            Assert.Equal(items.Count, target.Panel.Children.Count);
-
-////            int addIndex = 1;
-////            foreach (var item in toAdd)
-////            {
-////                items.Insert(addIndex++, item);
-////            }
-
-////            Assert.Equal(items.Count, target.Panel.Children.Count);
-
-////            foreach (var item in toAdd)
-////            {
-////                items.Remove(item);
-////            }
-
-////            Assert.Equal(items.Count, target.Panel.Children.Count);
-////        }
-
-////        [Fact]
-////        public void Reassigning_Items_Should_Remove_Containers()
-////        {
-////            var target = CreateTarget(itemCount: 6);
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            var expected = Enumerable.Range(0, 6).Select(x => $"Item {x}").ToList();
-////            var actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-
-////            Assert.Equal(expected, actual);
-
-////            expected = Enumerable.Range(0, 5).Select(x => $"Item {x}").ToList();
-////            target.Items = expected;
-
-////            actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-////            Assert.Equal(expected, actual);
-////        }
-
-////        [Fact]
-////        public void Clearing_Items_And_ReAdding_Should_Remove_Containers()
-////        {
-////            var target = CreateTarget(itemCount: 6);
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            var expected = Enumerable.Range(0, 6).Select(x => $"Item {x}").ToList();
-////            var items = (ObservableCollection<string>)target.Items;
-////            var actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-
-////            Assert.Equal(expected, actual);
-
-////            expected = Enumerable.Range(0, 5).Select(x => $"Item {x}").ToList();
-////            target.Items = null;
-////            target.Items = expected;
-
-////            actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-////            Assert.Equal(expected, actual);
-////        }
-
-////        [Fact]
-////        public void Scrolling_To_Partial_Last_Item_Then_Adding_Item_Updates_Containers()
-////        {
-////            var target = CreateTarget(itemCount: 10);
-////            var items = (IList<string>)target.Items;
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 95));
-////            target.Arrange(new Rect(0, 0, 100, 95));
-
-////            ((ILogicalScrollable)target).Offset = new Vector(0, 1);
-////            Assert.Equal(new Vector(0, 1), ((ILogicalScrollable)target).Offset);
-
-////            var expected = Enumerable.Range(0, 10).Select(x => $"Item {x}").ToList();
-////            var actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-////            Assert.Equal(expected, actual);
-////            Assert.Equal(10, ((IVirtualizingPanel)target.Panel).PixelOffset);
-
-////            items.Add("Item 10");
-
-////            expected = Enumerable.Range(1, 10).Select(x => $"Item {x}").ToList();
-////            actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-////            Assert.Equal(expected, actual);
-////            Assert.Equal(0, ((IVirtualizingPanel)target.Panel).PixelOffset);
-////        }
-
-////        [Fact]
-////        public void Scrolling_To_Item_In_Zero_Sized_Presenter_Doesnt_Throw()
-////        {
-////            using (UnitTestApplication.Start(new TestServices()))
-////            {
-////                var target = CreateTarget(itemCount: 10);
-////                var items = (IList<string>)target.Items;
-////                target.ApplyTemplate();
-////                target.Measure(Size.Empty);
-////                target.Arrange(Rect.Empty);
-
-////                // Check for issue #591: this should not throw.
-////                target.ScrollIntoView(0);
-////            }
-////        }
-
-////        [Fact]
-////        public void InsertRange_Items_Should_Update_Containers()
-////        {
-////            var target = CreateTarget(useAvaloniaList: true);
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            var expected = Enumerable.Range(0, 10).Select(x => $"Item {x}").ToList();
-////            var items = (AvaloniaList<string>)target.Items;
-////            var actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-
-////            Assert.Equal(expected, actual);
-
-////            var toAdd = Enumerable.Range(0, 3).Select(x => $"New Item {x}").ToList();
-
-////            int index = 1;
-
-////            items.InsertRange(index, toAdd);
-////            expected.InsertRange(index, toAdd);
-////            expected.RemoveRange(10, toAdd.Count);
-
-////            actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-////            Assert.Equal(expected, actual);
-////        }
-
-////        [Fact]
-////        public void InsertRange_Items_Before_Last_Should_Update_Containers()
-////        {
-////            var target = CreateTarget(useAvaloniaList: true);
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            var expected = Enumerable.Range(0, 10).Select(x => $"Item {x}").ToList();
-////            var items = (AvaloniaList<string>)target.Items;
-////            var actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-
-////            Assert.Equal(expected, actual);
-
-////            var toAdd = Enumerable.Range(0, 3).Select(x => $"New Item {x}").ToList();
-
-////            int index = 8;
-
-////            items.InsertRange(index, toAdd);
-////            expected.InsertRange(index, toAdd);
-////            expected.RemoveRange(10, toAdd.Count);
-
-////            actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-////            Assert.Equal(expected, actual);
-////        }
-
-////        [Fact]
-////        public void RemoveRange_Items_Should_Update_Containers()
-////        {
-////            var target = CreateTarget(useAvaloniaList: true);
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            var expected = Enumerable.Range(0, 13).Select(x => $"Item {x}").ToList();
-////            var items = (AvaloniaList<string>)target.Items;
-////            var actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-
-////            Assert.Equal(expected.Take(10), actual);
-
-////            int index = 5;
-////            int count = 3;
-
-////            items.RemoveRange(index, count);
-////            expected.RemoveRange(index, count);
-
-////            actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-////            Assert.Equal(expected, actual);
-////        }
-
-////        [Fact]
-////        public void RemoveRange_Items_Before_Last_Should_Update_Containers()
-////        {
-////            var target = CreateTarget(useAvaloniaList: true);
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            var expected = Enumerable.Range(0, 13).Select(x => $"Item {x}").ToList();
-////            var items = (AvaloniaList<string>)target.Items;
-////            var actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-
-////            Assert.Equal(expected.Take(10), actual);
-
-////            int index = 8;
-////            int count = 3;
-
-////            items.RemoveRange(index, count);
-////            expected.RemoveRange(index, count);
-
-////            actual = target.Panel.Children.Select(x => x.DataContext).ToList();
-////            Assert.Equal(expected, actual);
-////        }
-
-////        [Fact]
-////        public void Should_Add_Containers_For_Items_After_Clear()
-////        {
-////            var target = CreateTarget(itemCount: 10);
-////            var defaultItems = (IList<string>)target.Items;
-////            var items = new AvaloniaList<string>(defaultItems);
-////            target.Items = items;
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(target.DesiredSize));
-
-////            Assert.Equal(10, target.Panel.Children.Count);
-
-////            items.Clear();
-
-////            target.Panel.Measure(new Size(100, 100));
-////            target.Panel.Arrange(new Rect(target.Panel.DesiredSize));
-
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(target.DesiredSize));
-
-////            Assert.Empty(target.Panel.Children);
-
-////            items.AddRange(defaultItems.Select(s => s + " new"));
-
-////            target.Panel.Measure(new Size(100, 100));
-////            target.Panel.Arrange(new Rect(target.Panel.DesiredSize));
-
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(target.DesiredSize));
-
-////            Assert.Equal(10, target.Panel.Children.Count);
-////        }
-
-////        [Fact]
-////        public void Scroll_To_Last_Should_Work()
-////        {
-////            var target = CreateTarget(itemCount: 11);
-////            var scroller = (TestScroller)target.Parent;
-
-////            scroller.Width = scroller.Height = 100;
-////            scroller.LayoutManager.ExecuteInitialLayoutPass();
-
-////            var last = (target.Items as IList)[10];
-
-////            target.ScrollIntoView(10);
-
-////            Assert.Equal(new Vector(0, 1), ((ILogicalScrollable)target).Offset);
-////            Assert.Same(target.Panel.Children[9].DataContext, last);
-////        }
-
-////        [Fact]
-////        public void Second_Scroll_To_Last_Should_Work()
-////        {
-////            var target = CreateTarget(itemCount: 11);
-////            var scroller = (TestScroller)target.Parent;
-
-////            scroller.Width = scroller.Height = 100;
-////            scroller.LayoutManager.ExecuteInitialLayoutPass();
-
-////            var last = (target.Items as IList)[10];
-
-////            target.ScrollIntoView(10);
-
-////            Assert.Equal(new Vector(0, 1), ((ILogicalScrollable)target).Offset);
-////            Assert.Same(target.Panel.Children[9].DataContext, last);
-
-////            target.ScrollIntoView(10);
-
-////            Assert.Equal(new Vector(0, 1), ((ILogicalScrollable)target).Offset);
-////            Assert.Same(target.Panel.Children[9].DataContext, last);
-////        }
-
-////        [Fact]
-////        public void Scrolling_Less_Than_A_Page_Should_Move_Recycled_Items()
-////        {
-////            var target = CreateTarget();
-////            var items = (IList<string>)target.Items;
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            var containers = target.Panel.Children.ToList();
-////            var scroller = (ScrollContentPresenter)target.Parent;
-
-////            scroller.Offset = new Vector(0, 5);
-
-////            var scrolledContainers = containers
-////                .Skip(5)
-////                .Take(5)
-////                .Concat(containers.Take(5)).ToList();
-
-////            Assert.Equal(new Vector(0, 5), ((ILogicalScrollable)target).Offset);
-////            Assert.Equal(scrolledContainers, target.Panel.Children);
-
-////            for (var i = 0; i < target.Panel.Children.Count; ++i)
-////            {
-////                Assert.Equal(items[i + 5], target.Panel.Children[i].DataContext);
-////            }
-
-////            scroller.Offset = new Vector(0, 0);
-////            Assert.Equal(new Vector(0, 0), ((ILogicalScrollable)target).Offset);
-////            Assert.Equal(containers, target.Panel.Children);
-
-////            var dcs = target.Panel.Children.Select(x => x.DataContext).ToList();
-
-////            for (var i = 0; i < target.Panel.Children.Count; ++i)
-////            {
-////                Assert.Equal(items[i], target.Panel.Children[i].DataContext);
-////            }
-////        }
-
-////        [Fact]
-////        public void Scrolling_More_Than_A_Page_Should_Recycle_Items()
-////        {
-////            var target = CreateTarget(itemCount: 50);
-////            var items = (IList<string>)target.Items;
-
-////            target.ApplyTemplate();
-////            target.Measure(new Size(100, 100));
-////            target.Arrange(new Rect(0, 0, 100, 100));
-
-////            var containers = target.Panel.Children.ToList();
-////            var scroller = (ScrollContentPresenter)target.Parent;
-
-////            scroller.Offset = new Vector(0, 20);
-
-////            Assert.Equal(new Vector(0, 20), ((ILogicalScrollable)target).Offset);
-////            Assert.Equal(containers, target.Panel.Children);
-
-////            for (var i = 0; i < target.Panel.Children.Count; ++i)
-////            {
-////                Assert.Equal(items[i + 20], target.Panel.Children[i].DataContext);
-////            }
-
-////            scroller.Offset = new Vector(0, 0);
-
-////            Assert.Equal(new Vector(0, 0), ((ILogicalScrollable)target).Offset);
-////            Assert.Equal(containers, target.Panel.Children);
-
-////            for (var i = 0; i < target.Panel.Children.Count; ++i)
-////            {
-////                Assert.Equal(items[i], target.Panel.Children[i].DataContext);
-////            }
-////        }
-
-////        public class Vertical
-////        {
-////            [Fact]
-////            public void GetControlInDirection_Down_Should_Return_Existing_Container_If_Materialized()
-////            {
-////                var target = CreateTarget();
-////                var scroller = (TestScroller)target.Parent;
-
-////                scroller.Width = scroller.Height = 100;
-////                scroller.LayoutManager.ExecuteInitialLayoutPass();
-
-////                var from = target.Panel.Children[5];
-////                var result = ((ILogicalScrollable)target).GetControlInDirection(
-////                    NavigationDirection.Down,
-////                    from);
-
-////                Assert.Same(target.Panel.Children[6], result);
-////            }
-
-////            [Fact]
-////            public void GetControlInDirection_Down_Should_Scroll_If_Necessary()
-////            {
-////                var target = CreateTarget();
-////                var scroller = (TestScroller)target.Parent;
-
-////                scroller.Width = scroller.Height = 100;
-////                scroller.LayoutManager.ExecuteInitialLayoutPass();
-
-////                var from = target.Panel.Children[9];
-////                var result = ((ILogicalScrollable)target).GetControlInDirection(
-////                    NavigationDirection.Down,
-////                    from);
-
-////                Assert.Equal(new Vector(0, 1), ((ILogicalScrollable)target).Offset);
-////                Assert.Same(target.Panel.Children[9], result);
-////            }
-
-////            [Fact]
-////            public void GetControlInDirection_Down_Should_Scroll_If_Partially_Visible()
-////            {
-////                var target = CreateTarget();
-////                var scroller = (TestScroller)target.Parent;
-
-////                scroller.Width = 100;
-////                scroller.Height = 95;
-////                scroller.LayoutManager.ExecuteInitialLayoutPass();
-
-////                var from = target.Panel.Children[8];
-////                var result = ((ILogicalScrollable)target).GetControlInDirection(
-////                    NavigationDirection.Down,
-////                    from);
-
-////                Assert.Equal(new Vector(0, 1), ((ILogicalScrollable)target).Offset);
-////                Assert.Same(target.Panel.Children[8], result);
-////            }
-
-////            [Fact]
-////            public void GetControlInDirection_Up_Should_Scroll_If_Partially_Visible_Item_Is_Currently_Shown()
-////            {
-////                var target = CreateTarget();
-////                var scroller = (TestScroller)target.Parent;
-
-////                scroller.Width = 100;
-////                scroller.Height = 95;
-////                scroller.LayoutManager.ExecuteInitialLayoutPass();
-////                ((ILogicalScrollable)target).Offset = new Vector(0, 11);
-
-////                var from = target.Panel.Children[1];
-////                var result = ((ILogicalScrollable)target).GetControlInDirection(
-////                    NavigationDirection.Up,
-////                    from);
-
-////                Assert.Equal(new Vector(0, 10), ((ILogicalScrollable)target).Offset);
-////                Assert.Same(target.Panel.Children[0], result);
-////            }
-
-////            [Fact]
-////            public void Should_Return_Horizontal_Extent_And_Viewport()
-////            {
-////                var target = CreateTarget();
-
-////                target.ApplyTemplate();
-////                target.Measure(new Size(5, 100));
-////                target.Arrange(new Rect(0, 0, 5, 100));
-
-////                Assert.Equal(new Size(10, 20), ((ILogicalScrollable)target).Extent);
-////                Assert.Equal(new Size(5, 10), ((ILogicalScrollable)target).Viewport);
-////            }
-
-////            [Fact]
-////            public void Horizontal_Scroll_Should_Update_Item_Position()
-////            {
-////                var target = CreateTarget();
-
-////                target.ApplyTemplate();
-
-////                target.Measure(new Size(5, 100));
-////                target.Arrange(new Rect(0, 0, 5, 100));
-
-////                ((ILogicalScrollable)target).Offset = new Vector(5, 0);
-
-////                target.Measure(new Size(5, 100));
-////                target.Arrange(new Rect(0, 0, 5, 100));
-
-////                Assert.Equal(new Rect(-5, 0, 10, 10), target.Panel.Children[0].Bounds);
-////            }
-////        }
-
-////        public class Horizontal
-////        {
-////            [Fact]
-////            public void GetControlInDirection_Right_Should_Return_Existing_Container_If_Materialized()
-////            {
-////                var target = CreateTarget(orientation: Orientation.Horizontal);
-////                var scroller = (TestScroller)target.Parent;
-
-////                scroller.Width = scroller.Height = 100;
-////                scroller.LayoutManager.ExecuteInitialLayoutPass();
-
-////                var from = target.Panel.Children[5];
-////                var result = ((ILogicalScrollable)target).GetControlInDirection(
-////                    NavigationDirection.Right,
-////                    from);
-
-////                Assert.Same(target.Panel.Children[6], result);
-////            }
-
-////            [Fact]
-////            public void GetControlInDirection_Right_Should_Scroll_If_Necessary()
-////            {
-////                var target = CreateTarget(orientation: Orientation.Horizontal);
-////                var scroller = (TestScroller)target.Parent;
-
-////                scroller.Width = scroller.Height = 100;
-////                scroller.LayoutManager.ExecuteInitialLayoutPass();
-
-////                var from = target.Panel.Children[9];
-////                var result = ((ILogicalScrollable)target).GetControlInDirection(
-////                    NavigationDirection.Right,
-////                    from);
-
-////                Assert.Equal(new Vector(1, 0), ((ILogicalScrollable)target).Offset);
-////                Assert.Same(target.Panel.Children[9], result);
-////            }
-
-////            [Fact]
-////            public void GetControlInDirection_Right_Should_Scroll_If_Partially_Visible()
-////            {
-////                var target = CreateTarget(orientation: Orientation.Horizontal);
-////                var scroller = (TestScroller)target.Parent;
-
-////                scroller.Width = 95;
-////                scroller.Height = 100;
-////                scroller.LayoutManager.ExecuteInitialLayoutPass();
-
-////                var from = target.Panel.Children[8];
-////                var result = ((ILogicalScrollable)target).GetControlInDirection(
-////                    NavigationDirection.Right,
-////                    from);
-
-////                Assert.Equal(new Vector(1, 0), ((ILogicalScrollable)target).Offset);
-////                Assert.Same(target.Panel.Children[8], result);
-////            }
-
-////            [Fact]
-////            public void GetControlInDirection_Left_Should_Scroll_If_Partially_Visible_Item_Is_Currently_Shown()
-////            {
-////                var target = CreateTarget(orientation: Orientation.Horizontal);
-////                var scroller = (TestScroller)target.Parent;
-
-////                scroller.Width = 95;
-////                scroller.Height = 100;
-////                scroller.LayoutManager.ExecuteInitialLayoutPass();
-////                ((ILogicalScrollable)target).Offset = new Vector(11, 0);
-
-////                var from = target.Panel.Children[1];
-////                var result = ((ILogicalScrollable)target).GetControlInDirection(
-////                    NavigationDirection.Left,
-////                    from);
-
-////                Assert.Equal(new Vector(10, 0), ((ILogicalScrollable)target).Offset);
-////                Assert.Same(target.Panel.Children[0], result);
-////            }
-////        }
-
-////        private static ItemsPresenter CreateTarget(
-////            Orientation orientation = Orientation.Vertical,
-////            int itemCount = 20,
-////            bool useAvaloniaList = false)
-////        {
-////            ItemsPresenter result;
-////            var itemsSource = Enumerable.Range(0, itemCount).Select(x => $"Item {x}");
-////            var items = useAvaloniaList ?
-////                (IEnumerable)new AvaloniaList<string>(itemsSource) :
-////                (IEnumerable)new ObservableCollection<string>(itemsSource);
-
-////            var scroller = new TestScroller
-////            {
-////                CanHorizontallyScroll = true,
-////                CanVerticallyScroll = true,
-////                Content = result = new TestItemsPresenter
-////                {
-////                    Items = items,
-////                    ItemsPanel = VirtualizingPanelTemplate(orientation),
-////                    DataTemplates = { StringDataTemplate() },
-////                    VirtualizationMode = ItemVirtualizationMode.Simple,
-////                }
-////            };
-
-////            scroller.UpdateChild();
-////            return result;
-////        }
-
-////        private static IDataTemplate StringDataTemplate()
-////        {
-////            return new FuncDataTemplate<string>((x, _) => new Canvas
-////            {
-////                Width = 10,
-////                Height = 10,
-////            });
-////        }
-
-////        private static ITemplate<Panel> VirtualizingPanelTemplate(
-////            Orientation orientation = Orientation.Vertical)
-////        {
-////            return new FuncTemplate<Panel>(() => new VirtualizingStackPanel
-////            {
-////                Orientation = orientation,
-////            });
-////        }
-
-////        private class TestScroller : ScrollContentPresenter, IRenderRoot, ILayoutRoot, ILogicalRoot
-////        {
-////            public TestScroller()
-////            {
-////                LayoutManager = new LayoutManager(this);
-////            }
-
-////            public IRenderer Renderer { get; }
-////            public Size ClientSize { get; }
-////            public double RenderScaling => 1;
-
-////            public Size MaxClientSize => Size.Infinity;
-
-////            public double LayoutScaling => 1;
-
-////            public ILayoutManager LayoutManager { get; }
-
-////            public IRenderTarget CreateRenderTarget() => throw new NotImplementedException();
-////            public void Invalidate(Rect rect) => throw new NotImplementedException();
-////            public Point PointToClient(PixelPoint p) => throw new NotImplementedException();
-////            public PixelPoint PointToScreen(Point p) => throw new NotImplementedException();
-////        }
-
-////        private class TestItemsPresenter : ItemsPresenter
-////        {
-////            protected override IItemContainerGenerator CreateItemContainerGenerator()
-////            {
-////                return new ItemContainerGenerator<TestContainer>(
-////                    this,
-////                    TestContainer.ContentProperty,
-////                    null);
-////            }
-////        }
-
-////        private class TestContainer : ContentControl
-////        {
-////            public TestContainer()
-////            {
-////                Template = new FuncControlTemplate<TestContainer>((parent, scope) => new ContentPresenter
-////                {
-////                    Name = "PART_ContentPresenter",
-////                    [~ContentPresenter.ContentProperty] = parent[~ContentControl.ContentProperty],
-////                    [~ContentPresenter.ContentTemplateProperty] = parent[~ContentControl.ContentTemplateProperty],
-////                }.RegisterInNameScope(scope));
-////            }
-////        }
-////    }
-////}