diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/src/Umbraco.Tests.Common/TestHelperBase.cs
index 88886246cd..236190d8a9 100644
--- a/src/Umbraco.Tests.Common/TestHelperBase.cs
+++ b/src/Umbraco.Tests.Common/TestHelperBase.cs
@@ -28,11 +28,8 @@ namespace Umbraco.Tests.Common
     public abstract class TestHelperBase
     {
         private readonly ITypeFinder _typeFinder;
-        private IConfigsFactory _configsFactory;
         private UriUtility _uriUtility;
         private IIOHelper _ioHelper;
-        private Configs _configs;
-        private IUmbracoVersion _umbracoVersion;
 
         public TestHelperBase(Assembly entryAssembly)
         {
@@ -48,15 +45,7 @@ namespace Umbraco.Tests.Common
             return new TypeLoader(IOHelper, Mock.Of<ITypeFinder>(), Mock.Of<IAppPolicyCache>(), new DirectoryInfo(IOHelper.MapPath("~/App_Data/TEMP")), Mock.Of<IProfilingLogger>());
         }
 
-        public Configs Configs
-        {
-            get
-            {
-                if (_configs == null)
-                    _configs = ConfigsFactory.Create();
-                return _configs;
-            }
-        }
+        public Configs GetConfigs() => GetConfigsFactory().Create();
 
         public IRuntimeState GetRuntimeState()
         {
@@ -65,7 +54,7 @@ namespace Umbraco.Tests.Common
                 Mock.Of<IGlobalSettings>(),
                 new Lazy<IMainDom>(),
                 new Lazy<IServerRegistrar>(),
-                UmbracoVersion,
+                GetUmbracoVersion(),
                 GetHostingEnvironment(),
                 GetBackOfficeInfo()
                 );
@@ -73,15 +62,7 @@ namespace Umbraco.Tests.Common
 
         public abstract IBackOfficeInfo GetBackOfficeInfo();
 
-        public IConfigsFactory ConfigsFactory
-        {
-            get
-            {
-                if (_configsFactory == null)
-                    _configsFactory = new ConfigsFactory();
-                return _configsFactory;
-            }
-        }
+        public IConfigsFactory GetConfigsFactory() => new ConfigsFactory();
 
         /// <summary>
         /// Gets the current assembly directory.
@@ -143,19 +124,16 @@ namespace Umbraco.Tests.Common
             return relativePath.Replace("~/", CurrentAssemblyDirectory + "/");
         }
 
-        public IUmbracoVersion UmbracoVersion
+        public IUmbracoVersion GetUmbracoVersion()
         {
-            get
-            {
-                if (_umbracoVersion == null)
-                    _umbracoVersion = new UmbracoVersion(Configs.Global());
-                return _umbracoVersion;
-            }
+            if (_umbracoVersion == null)
+                _umbracoVersion = new UmbracoVersion(GetConfigs().Global());
+            return _umbracoVersion;
         }
 
         public IRegister GetRegister()
         {
-            return RegisterFactory.Create(Configs.Global());
+            return RegisterFactory.Create(GetConfigs().Global());
         }
 
         public abstract IHostingEnvironment GetHostingEnvironment();
diff --git a/src/Umbraco.Tests.Integration/ContainerTests.cs b/src/Umbraco.Tests.Integration/ContainerTests.cs
index 77725ce575..b85471b95a 100644
--- a/src/Umbraco.Tests.Integration/ContainerTests.cs
+++ b/src/Umbraco.Tests.Integration/ContainerTests.cs
@@ -42,10 +42,10 @@ namespace Umbraco.Tests.Integration
 
             // Register in the container
             var composition = new Composition(umbracoContainer, typeLoader,
-                testHelper.Logger, runtimeState, testHelper.Configs, testHelper.IOHelper, testHelper.AppCaches);
+                testHelper.Logger, runtimeState, testHelper.GetConfigs(), testHelper.IOHelper, testHelper.AppCaches);
             composition.RegisterEssentials(testHelper.Logger, testHelper.Profiler, testHelper.Logger, testHelper.MainDom,
                 testHelper.AppCaches, umbracoDatabaseFactory, typeLoader, runtimeState, testHelper.GetTypeFinder(),
-                testHelper.IOHelper, testHelper.UmbracoVersion, dbProviderFactoryCreator);
+                testHelper.IOHelper, testHelper.GetUmbracoVersion(), dbProviderFactoryCreator);
 
             // Cross wire - this would be called by the Host Builder at the very end of ConfigureServices
             var lightInjectServiceProvider = serviceProviderFactory.CreateServiceProvider(umbracoContainer.Container);
diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
index e98f4d108a..5254892b23 100644
--- a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
@@ -69,7 +69,7 @@ namespace Umbraco.Tests.Integration.Implementations
         public override IBackOfficeInfo GetBackOfficeInfo()
         {
             if (_backOfficeInfo == null)
-                _backOfficeInfo = new AspNetCoreBackOfficeInfo(SettingsForTests.GetDefaultGlobalSettings(UmbracoVersion));
+                _backOfficeInfo = new AspNetCoreBackOfficeInfo(SettingsForTests.GetDefaultGlobalSettings(GetUmbracoVersion()));
             return _backOfficeInfo;
         }
 
diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index 0a8b250cec..6ccfdd76d6 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -35,7 +35,7 @@ namespace Umbraco.Tests.Integration
 
             // Create the core runtime
             var testHelper = new TestHelper();
-            var coreRuntime = new CoreRuntime(testHelper.Configs, testHelper.UmbracoVersion,
+            var coreRuntime = new CoreRuntime(testHelper.GetConfigs(), testHelper.GetUmbracoVersion(),
                 testHelper.IOHelper, testHelper.Logger, testHelper.Profiler, testHelper.UmbracoBootPermissionChecker,
                 testHelper.GetHostingEnvironment(), testHelper.GetBackOfficeInfo(), testHelper.DbProviderFactoryCreator,
                 testHelper.MainDom, testHelper.GetTypeFinder());
diff --git a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
index fd9813b080..92ab825ee2 100644
--- a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
+++ b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
@@ -177,7 +177,6 @@ namespace Umbraco.Tests.Runtimes
 
             public override void Terminate()
             {
-                ((IRegisteredObject) _mainDom).Stop(false);
                 base.Terminate();
             }
 
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
index cf3554f3af..05d4de6e23 100644
--- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -56,7 +56,7 @@ namespace Umbraco.Tests.TestHelpers
 
             public override IBackOfficeInfo GetBackOfficeInfo()
                 => new AspNetBackOfficeInfo(
-                    SettingsForTests.GenerateMockGlobalSettings(UmbracoVersion),
+                    SettingsForTests.GenerateMockGlobalSettings(GetUmbracoVersion()),
                     TestHelper.IOHelper, Mock.Of<ILogger>(), SettingsForTests.GenerateMockWebRoutingSettings());
 
             public override IHostingEnvironment GetHostingEnvironment()
@@ -70,13 +70,13 @@ namespace Umbraco.Tests.TestHelpers
 
         public static TypeLoader GetMockedTypeLoader() => _testHelperInternal.GetMockedTypeLoader();
 
-        public static Configs GetConfigs() => _testHelperInternal.Configs;
+        public static Configs GetConfigs() => _testHelperInternal.GetConfigs();
 
         public static IRuntimeState GetRuntimeState() => _testHelperInternal.GetRuntimeState();
 
         public static IBackOfficeInfo GetBackOfficeInfo() => _testHelperInternal.GetBackOfficeInfo();
 
-        public static IConfigsFactory GetConfigsFactory() => _testHelperInternal.ConfigsFactory;
+        public static IConfigsFactory GetConfigsFactory() => _testHelperInternal.GetConfigsFactory();
 
         /// <summary>
         /// Gets the current assembly directory.
@@ -314,7 +314,7 @@ namespace Umbraco.Tests.TestHelpers
         }
 
 
-        public static IUmbracoVersion GetUmbracoVersion() => _testHelperInternal.UmbracoVersion;
+        public static IUmbracoVersion GetUmbracoVersion() => _testHelperInternal.GetUmbracoVersion();
 
         public static IRegister GetRegister() => _testHelperInternal.GetRegister();