From c72b6649bfc64e6bf44c1a92dabbb9745ed03836 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Sat, 8 Feb 2020 11:33:49 +0100
Subject: [PATCH] Fixed failing unit tests.

---
 src/Umbraco.Tests/Published/ConvertersTests.cs         | 3 ++-
 src/Umbraco.Tests/Published/NestedContentTests.cs      | 5 ++---
 src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs | 3 ++-
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs           | 4 +---
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Tests/Published/ConvertersTests.cs b/src/Umbraco.Tests/Published/ConvertersTests.cs
index 19adf28528..7a456f427a 100644
--- a/src/Umbraco.Tests/Published/ConvertersTests.cs
+++ b/src/Umbraco.Tests/Published/ConvertersTests.cs
@@ -15,13 +15,14 @@ using Umbraco.Core.Strings;
 using Umbraco.Tests.Components;
 using Umbraco.Tests.PublishedContent;
 using Umbraco.Tests.TestHelpers;
+using Umbraco.Tests.Testing;
 using Umbraco.Web;
 using Umbraco.Web.PublishedCache;
 
 namespace Umbraco.Tests.Published
 {
     [TestFixture]
-    public class ConvertersTests
+    public class ConvertersTests : UmbracoTestBase
     {
         #region SimpleConverter1
 
diff --git a/src/Umbraco.Tests/Published/NestedContentTests.cs b/src/Umbraco.Tests/Published/NestedContentTests.cs
index 1b79b65b19..3bb2c0a5e4 100644
--- a/src/Umbraco.Tests/Published/NestedContentTests.cs
+++ b/src/Umbraco.Tests/Published/NestedContentTests.cs
@@ -17,16 +17,15 @@ using Umbraco.Web;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Web.PropertyEditors.ValueConverters;
 using Umbraco.Web.PublishedCache;
+using Umbraco.Tests.Testing;
 
 namespace Umbraco.Tests.Published
 {
     [TestFixture]
-    public class NestedContentTests
+    public class NestedContentTests : UmbracoTestBase
     {
         private (IPublishedContentType, IPublishedContentType) CreateContentTypes()
         {
-            Current.Reset();
-
             var logger = Mock.Of<ILogger>();
             var profiler = Mock.Of<IProfiler>();
             var proflog = new ProfilingLogger(logger, profiler);
diff --git a/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs b/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs
index 8f8e4ae7a9..d3e6dae26b 100644
--- a/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs
+++ b/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs
@@ -12,13 +12,14 @@ using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
 using Umbraco.Tests.TestHelpers;
+using Umbraco.Tests.Testing;
 using Umbraco.Web;
 using Umbraco.Web.PublishedCache;
 
 namespace Umbraco.Tests.Published
 {
     [TestFixture]
-    public class PropertyCacheLevelTests
+    public class PropertyCacheLevelTests : UmbracoTestBase
     {
         [TestCase(PropertyCacheLevel.None, 2)]
         [TestCase(PropertyCacheLevel.Element, 1)]
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index 93a3e52446..9d29516c2a 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -49,13 +49,11 @@ using Umbraco.Web.Templates;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Core.Dictionary;
 using Umbraco.Core.Models.Identity;
-using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 using Umbraco.Net;
 using Umbraco.Web.Security;
 using Current = Umbraco.Web.Composing.Current;
-
 namespace Umbraco.Tests.Testing
 {
     /// <summary>
@@ -296,7 +294,7 @@ namespace Umbraco.Tests.Testing
             Composition.RegisterUnique<HtmlUrlParser>();
             Composition.RegisterUnique<HtmlImageSourceParser>();
             Composition.RegisterUnique<RichTextEditorPastedImages>();
-
+            Composition.RegisterUnique<IPublishedValueFallback, NoopPublishedValueFallback>();
         }
 
         protected virtual void ComposeMisc()