diff --git a/tests/Highbyte.DotNet6502.Systems.Tests/SystemConfigurerTests.cs b/tests/Highbyte.DotNet6502.Systems.Tests/SystemConfigurerTests.cs
index 4d3caac0..ad14759b 100644
--- a/tests/Highbyte.DotNet6502.Systems.Tests/SystemConfigurerTests.cs
+++ b/tests/Highbyte.DotNet6502.Systems.Tests/SystemConfigurerTests.cs
@@ -28,17 +28,17 @@ public Task PersistHostSystemConfig(IHostSystemConfig hostSystemConfig)
             return Task.CompletedTask;
         }
 
-        public Task<ISystemConfig> GetNewConfig(string configurationVariant, IHostSystemConfig hostSystemConfig)
-        {
-            return Task.FromResult<ISystemConfig>(new TestSystemConfig());
-        }
+        //public Task<ISystemConfig> GetNewConfig(string configurationVariant, IHostSystemConfig hostSystemConfig)
+        //{
+        //    return Task.FromResult<ISystemConfig>(new TestSystemConfig());
+        //}
 
-        public Task PersistConfig(ISystemConfig systemConfig)
-        {
-            return Task.CompletedTask;
-        }
+        //public Task PersistConfig(ISystemConfig systemConfig)
+        //{
+        //    return Task.CompletedTask;
+        //}
 
-        public ISystem BuildSystem(ISystemConfig systemConfig)
+        public ISystem BuildSystem(string configurationVariant, IHostSystemConfig hostSystemConfig)
         {
             return new TestSystem();
         }
@@ -79,17 +79,17 @@ public Task PersistHostSystemConfig(IHostSystemConfig hostSystemConfig)
             return Task.CompletedTask;
         }
 
-        public Task<ISystemConfig> GetNewConfig(string configurationVariant, IHostSystemConfig hostSystemConfig)
-        {
-            return Task.FromResult<ISystemConfig>(new TestSystem2Config());
-        }
+        //public Task<ISystemConfig> GetNewConfig(string configurationVariant, IHostSystemConfig hostSystemConfig)
+        //{
+        //    return Task.FromResult<ISystemConfig>(new TestSystem2Config());
+        //}
 
-        public Task PersistConfig(ISystemConfig systemConfig)
-        {
-            return Task.CompletedTask;
-        }
+        //public Task PersistConfig(ISystemConfig systemConfig)
+        //{
+        //    return Task.CompletedTask;
+        //}
 
-        public ISystem BuildSystem(ISystemConfig systemConfig)
+        public ISystem BuildSystem(string configurationVariant, IHostSystemConfig hostSystemConfig)
         {
             return new TestSystem2();
         }
diff --git a/tests/Highbyte.DotNet6502.Tests/Utils/StreamHelperTest.cs b/tests/Highbyte.DotNet6502.Tests/Utils/StreamHelperTest.cs
index b01eaf49..3ad8a731 100644
--- a/tests/Highbyte.DotNet6502.Tests/Utils/StreamHelperTest.cs
+++ b/tests/Highbyte.DotNet6502.Tests/Utils/StreamHelperTest.cs
@@ -27,7 +27,7 @@ public void FetchWord_Returns_LittleEndian_Word_From_Stream()
     public void FetchWord_Returns_Negative_If_No_Byte_Left_In_Stream()
     {
         // Arrange
-        var storedData = new byte[] { };
+        var storedData = Array.Empty<byte>();
 
         // Act
         int readWord;