diff --git a/src/TestabilityKata.Tests/CustomFileWriterTest.cs b/src/TestabilityKata.Tests/CustomFileWriterTest.cs
index b0cf46c..b7d80cb 100644
--- a/src/TestabilityKata.Tests/CustomFileWriterTest.cs
+++ b/src/TestabilityKata.Tests/CustomFileWriterTest.cs
@@ -10,13 +10,23 @@ namespace TestabilityKata.Tests
     [TestClass]
     public class CustomFileWriterTest
     {
+        private IMailSender fakeMailSender;
+
+        [TestInitialize]
+        public void Initialize()
+        {
+            fakeMailSender = Substitute.For<IMailSender>();
+        }
+
         [TestMethod]
         public void WhenCreatingFileAnEmailIsSentOut()
         {
-            var fakeMailSender = Substitute.For<IMailSender>();
-
             const string testFilePath = @"C:\WhenCreatingFileAnEmailIsSentOut.txt";
 
+            var customFileWriter = new CustomFileWriter(
+                fakeMailSender,
+                testFilePath);
+
             //if the existing file exists, delete it before running the test, since
             //we need to get to the point where a new file is created.
             if(File.Exists(testFilePath))
@@ -25,9 +35,6 @@ public void WhenCreatingFileAnEmailIsSentOut()
                 File.Delete(testFilePath);
             }
 
-            var customFileWriter = new CustomFileWriter(
-                fakeMailSender,
-                testFilePath);
             customFileWriter.AppendLine("Some line");
 
             fakeMailSender
diff --git a/src/TestabilityKata.Tests/MailSenderTest.cs b/src/TestabilityKata.Tests/MailSenderTest.cs
index 358b5b6..5d1c3e2 100644
--- a/src/TestabilityKata.Tests/MailSenderTest.cs
+++ b/src/TestabilityKata.Tests/MailSenderTest.cs
@@ -8,11 +8,18 @@ namespace TestabilityKata.Tests
     [TestClass]
     public class MailSenderTest
     {
+        private IMailSender mailSender;
+
+        [TestInitialize]
+        public void Initialize()
+        {
+            mailSender = new MailSender();
+        }
+
         [TestMethod]
         [ExpectedException(typeof(ArgumentException))]
         public void MailSenderThrowsExceptionIfEmailIsInvalid()
         {
-            var mailSender = new MailSender();
             mailSender.SendMail("my-invalid-email", "some content");
         }
     }
diff --git a/src/TestabilityKata.Tests/ProgramTest.cs b/src/TestabilityKata.Tests/ProgramTest.cs
index 9aa99b9..8e61b38 100644
--- a/src/TestabilityKata.Tests/ProgramTest.cs
+++ b/src/TestabilityKata.Tests/ProgramTest.cs
@@ -9,16 +9,25 @@ namespace TestabilityKata.Tests
     [TestClass]
     public class ProgramTest
     {
-        [TestMethod]
-        public void ProgramSendsEmailWhenStartingUp()
+        private IMailSender fakeMailSender;
+        private ILogger fakeLogger;
+
+        private IProgram program;
+
+        [TestInitialize]
+        public void Initialize()
         {
-            var fakeMailSender = Substitute.For<IMailSender>();
-            var fakeLogger = Substitute.For<ILogger>();
+            fakeMailSender = Substitute.For<IMailSender>();
+            fakeLogger = Substitute.For<ILogger>();
 
-            var program = new Program(
+            program = new Program(
                 fakeLogger,
                 fakeMailSender);
+        }
 
+        [TestMethod]
+        public void ProgramSendsEmailWhenStartingUp()
+        {
             program.Run();
 
             //we here make sure that SendMail was called
@@ -34,13 +43,6 @@ public void ProgramSendsEmailWhenStartingUp()
         [TestMethod]
         public void ProgramLogsErrorWhenExceptionIsThrown()
         {
-            var fakeMailSender = Substitute.For<IMailSender>();
-            var fakeLogger = Substitute.For<ILogger>();
-
-            var program = new Program(
-                fakeLogger,
-                fakeMailSender);
-
             //we here make the EmailSender's SendMail throw an exception no 
             //matter what arguments it was called with.
             fakeMailSender
diff --git a/src/TestabilityKata.Tests/TestabilityKata.Tests.csproj b/src/TestabilityKata.Tests/TestabilityKata.Tests.csproj
index f8c14f3..14ce7f0 100644
--- a/src/TestabilityKata.Tests/TestabilityKata.Tests.csproj
+++ b/src/TestabilityKata.Tests/TestabilityKata.Tests.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluffySpoon.Testing.Autofake.Autofac" Version="1.0.5" />
-    <PackageReference Include="FluffySpoon.Testing.Autofake.NSubstitute" Version="1.0.5" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
+    <PackageReference Include="FluffySpoon.Testing.Autofake.Autofac" Version="1.34.0" />
+    <PackageReference Include="FluffySpoon.Testing.Autofake.NSubstitute" Version="1.34.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/TestabilityKata/TestabilityKata.csproj b/src/TestabilityKata/TestabilityKata.csproj
index ce1697a..41f1d5a 100644
--- a/src/TestabilityKata/TestabilityKata.csproj
+++ b/src/TestabilityKata/TestabilityKata.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
 </Project>