diff --git a/build.cake b/build.cake
index 5d9ce22fc..41a539607 100644
--- a/build.cake
+++ b/build.cake
@@ -76,8 +76,6 @@ var nugetPackage = new NuGetPackage(
 				"testcentric.engine.dll", "testcentric.engine.core.dll", "testcentric.engine.api.dll", "TestCentric.InternalTrace.dll",
 				"testcentric.engine.metadata.dll", "testcentric.extensibility.dll", "testcentric.extensibility.api.dll",
 				"testcentric.engine.pdb", "../../nuget/testcentric.nuget.addins"),
-			new DirectoryContent("tools/Images").WithFiles(
-				"Images/DebugTests.png", "Images/RunTests.png", "Images/StopRun.png", "Images/GroupBy_16x.png", "Images/SummaryReport.png"),
 			new DirectoryContent("tools/Images/Tree/Circles").WithFiles(
 				"Images/Tree/Circles/Success.jpg", "Images/Tree/Circles/Failure.jpg", "Images/Tree/Circles/Ignored.jpg", "Images/Tree/Circles/Inconclusive.jpg", "Images/Tree/Circles/Skipped.jpg"),
 			new DirectoryContent("tools/Images/Tree/Classic").WithFiles(
@@ -95,7 +93,6 @@ var nugetPackage = new NuGetPackage(
 	checks: new PackageCheck[] {
 		HasFiles("CHANGES.txt", "LICENSE.txt", "NOTICES.txt", "testcentric.png"),
 		HasDirectory("tools").WithFiles(GUI_FILES).AndFiles(ENGINE_FILES).AndFile("testcentric.nuget.addins"),
-		HasDirectory("tools/Images").WithFiles("DebugTests.png", "RunTests.png", "StopRun.png", "GroupBy_16x.png", "SummaryReport.png"),
 		HasDirectory("tools/Images/Tree/Circles").WithFiles(TREE_ICONS_JPG),
 		HasDirectory("tools/Images/Tree/Classic").WithFiles(TREE_ICONS_JPG),
 		HasDirectory("tools/Images/Tree/Default").WithFiles(TREE_ICONS_PNG),
@@ -118,8 +115,6 @@ var chocolateyPackage = new ChocolateyPackage(
 				"testcentric.engine.dll", "testcentric.engine.core.dll", "testcentric.engine.api.dll", "TestCentric.InternalTrace.dll",
 				"testcentric.engine.metadata.dll", "testcentric.extensibility.dll", "testcentric.extensibility.api.dll",
 				"testcentric.engine.pdb", "../../choco/testcentric.choco.addins"),
-			new DirectoryContent("tools/Images").WithFiles(
-				"Images/DebugTests.png", "Images/RunTests.png", "Images/StopRun.png", "Images/GroupBy_16x.png", "Images/SummaryReport.png"),
 			new DirectoryContent("tools/Images/Tree/Circles").WithFiles(
 				"Images/Tree/Circles/Success.jpg", "Images/Tree/Circles/Failure.jpg", "Images/Tree/Circles/Ignored.jpg", "Images/Tree/Circles/Inconclusive.jpg", "Images/Tree/Circles/Skipped.jpg"),
 			new DirectoryContent("tools/Images/Tree/Classic").WithFiles(
@@ -136,7 +131,6 @@ var chocolateyPackage = new ChocolateyPackage(
 	testRunner: new GuiSelfTester(BuildSettings.ChocolateyTestDirectory + "testcentric-gui/tools/testcentric.exe"),
 	checks: new PackageCheck[] {
 		HasDirectory("tools").WithFiles("CHANGES.txt", "LICENSE.txt", "NOTICES.txt", "VERIFICATION.txt", "testcentric.choco.addins").AndFiles(GUI_FILES).AndFiles(ENGINE_FILES).AndFile("testcentric.choco.addins"),
-		HasDirectory("tools/Images").WithFiles("DebugTests.png", "RunTests.png", "StopRun.png", "GroupBy_16x.png", "SummaryReport.png"),
 		HasDirectory("tools/Images/Tree/Circles").WithFiles(TREE_ICONS_JPG),
 		HasDirectory("tools/Images/Tree/Classic").WithFiles(TREE_ICONS_JPG),
 		HasDirectory("tools/Images/Tree/Default").WithFiles(TREE_ICONS_PNG),
diff --git a/src/GuiException/UiException/nunit.uiexception.dll.csproj b/src/GuiException/UiException/nunit.uiexception.dll.csproj
index 0e9ee176e..b43e9825a 100644
--- a/src/GuiException/UiException/nunit.uiexception.dll.csproj
+++ b/src/GuiException/UiException/nunit.uiexception.dll.csproj
@@ -1,18 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <RootNamespace>NUnit.UiException</RootNamespace>
-    <AssemblyName>nunit.uiexception</AssemblyName>
-    <TargetFramework>net462</TargetFramework>
-    <OutputPath>..\..\..\bin\$(Configuration)\</OutputPath>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\testcentric.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Remove="data\TextCode.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Windows.Forms" />
-  </ItemGroup>
+	
+    <PropertyGroup>
+        <RootNamespace>NUnit.UiException</RootNamespace>
+        <AssemblyName>nunit.uiexception</AssemblyName>
+        <TargetFramework>net462</TargetFramework>
+        <OutputPath>..\..\..\bin\$(Configuration)\</OutputPath>
+        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>..\..\testcentric.snk</AssemblyOriginatorKeyFile>
+    </PropertyGroup>
+    
+    <ItemGroup>
+        <Compile Remove="data\TextCode.cs" />
+    </ItemGroup>
+    
+	<ItemGroup>
+        <Reference Include="System.Windows.Forms" />
+    </ItemGroup>
+	
 </Project>
\ No newline at end of file
diff --git a/src/GuiException/tests/nunit.uiexception.tests.csproj b/src/GuiException/tests/nunit.uiexception.tests.csproj
index ccdaf6ef1..8f63e91eb 100644
--- a/src/GuiException/tests/nunit.uiexception.tests.csproj
+++ b/src/GuiException/tests/nunit.uiexception.tests.csproj
@@ -1,31 +1,38 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <RootNamespace>NUnit.UiException.Tests</RootNamespace>
-    <AssemblyName>nunit.uiexception.tests</AssemblyName>
-	<OutputType>Exe</OutputType>
-	<TargetFramework>net462</TargetFramework>
-    <OutputPath>..\..\..\bin\$(Configuration)\</OutputPath>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System.Windows.Forms" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\UiException\nunit.uiexception.dll.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="data\Basic.cs" />
-    <EmbeddedResource Include="data\HelloWorld.txt" />
-    <EmbeddedResource Include="data\TextCode.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="NSubstitute" Version="4.0.0" />
-	  <PackageReference Include="NUnit" Version="3.13.2" />
-	  <PackageReference Include="NUnitLite" Version="3.13.2" />
-	  <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.1" />
-  </ItemGroup>
+    
+	<PropertyGroup>
+        <RootNamespace>NUnit.UiException.Tests</RootNamespace>
+        <AssemblyName>nunit.uiexception.tests</AssemblyName>
+	    <OutputType>Exe</OutputType>
+	    <TargetFramework>net462</TargetFramework>
+        <OutputPath>..\..\..\bin\$(Configuration)\</OutputPath>
+        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    </PropertyGroup>
+    
+	<ItemGroup>
+        <Reference Include="System.Windows.Forms" />
+    </ItemGroup>
+    
+	<ItemGroup>
+        <ProjectReference Include="..\UiException\nunit.uiexception.dll.csproj" />
+    </ItemGroup>
+    
+	<ItemGroup>
+        <EmbeddedResource Include="data\Basic.cs" />
+        <EmbeddedResource Include="data\HelloWorld.txt" />
+        <EmbeddedResource Include="data\TextCode.txt" />
+    </ItemGroup>
+    
+	<ItemGroup>
+        <None Include="app.config" />
+    </ItemGroup>
+    
+	<ItemGroup>
+        <PackageReference Include="NSubstitute" Version="4.0.0" />
+	    <PackageReference Include="NUnit" Version="3.13.2" />
+	    <PackageReference Include="NUnitLite" Version="3.13.2" />
+	    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.1" />
+    </ItemGroup>
+	
 </Project>
\ No newline at end of file
diff --git a/src/TestCentric/testcentric.exe/TestCentric.Gui.Exe.csproj b/src/TestCentric/testcentric.exe/TestCentric.Gui.Exe.csproj
index 7d4aaaa1a..7eb72edf9 100644
--- a/src/TestCentric/testcentric.exe/TestCentric.Gui.Exe.csproj
+++ b/src/TestCentric/testcentric.exe/TestCentric.Gui.Exe.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+	
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
 		<RootNamespace>TestCentric.Gui</RootNamespace>
@@ -7,23 +8,26 @@
 		<OutputPath>..\..\..\bin\$(Configuration)\</OutputPath>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <AssemblyTitle>TestCentric Runner</AssemblyTitle>
-    <Description>GUI Runner Executable</Description>
-  </PropertyGroup>
+        <AssemblyTitle>TestCentric Runner</AssemblyTitle>
+        <Description>GUI Runner Executable</Description>
+    </PropertyGroup>
+	
 	<ItemGroup>
 		<Reference Include="System.Windows.Forms" />
 	</ItemGroup>
-    <PropertyGroup>
+    
+	<PropertyGroup>
         <ApplicationIcon>..\..\..\testcentric.ico</ApplicationIcon>
     </PropertyGroup>
-    <ItemGroup>
-        <ProjectReference Include="..\testcentric.gui\TestCentric.Gui.csproj">
-            <Name>TestCentric.Gui</Name>
-        </ProjectReference>
+    
+	<ItemGroup>
+        <ProjectReference Include="..\testcentric.gui\TestCentric.Gui.csproj" />
     </ItemGroup>
-    <ItemGroup>
+    
+	<ItemGroup>
         <Content Include="..\..\..\testcentric.ico">
             <Link>testcentric.ico</Link>
         </Content>
     </ItemGroup>
+	
 </Project>
\ No newline at end of file
diff --git a/src/TestCentric/testcentric.gui/TestCentric.Gui.csproj b/src/TestCentric/testcentric.gui/TestCentric.Gui.csproj
index ad081a3a0..7f5419e4c 100644
--- a/src/TestCentric/testcentric.gui/TestCentric.Gui.csproj
+++ b/src/TestCentric/testcentric.gui/TestCentric.Gui.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+	
 	<PropertyGroup>
 		<RootNamespace>TestCentric.Gui</RootNamespace>
 		<AssemblyName>TestCentric.Gui.Runner</AssemblyName>
@@ -6,113 +7,118 @@
 		<OutputPath>..\..\..\bin\$(Configuration)\</OutputPath>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <AssemblyTitle>TestCentric Runner</AssemblyTitle>
-    <Description>TestCentric GUI Implementation</Description>
-    <UseWindowsForms>true</UseWindowsForms>
-  </PropertyGroup>
+        <AssemblyTitle>TestCentric Runner</AssemblyTitle>
+        <Description>TestCentric GUI Implementation</Description>
+        <UseWindowsForms>true</UseWindowsForms>
+    </PropertyGroup>
+	
 	<ItemGroup>
 		<Reference Include="System.Windows.Forms" />
 	</ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\TestModel\model\TestCentric.Gui.Model.csproj" />
-    <ProjectReference Include="..\..\GuiException\UiException\nunit.uiexception.dll.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="..\..\..\testcentric.ico">
-      <Link>testcentric.ico</Link>
-    </Content>
-    <Content Include="Images\DebugTests.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\Ellipsis.gif" />
-    <Content Include="Images\GroupBy_16x.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\RunTests.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\StopRun.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\SummaryReport.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\Tree\Circles\Failure.jpg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\Tree\Circles\Ignored.jpg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\Tree\Circles\Inconclusive.jpg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\Tree\Circles\Skipped.jpg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\Tree\Circles\Success.jpg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\Tree\Classic\Failure.jpg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\Tree\Classic\Ignored.jpg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\Tree\Classic\Inconclusive.jpg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\Tree\Classic\Skipped.jpg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\Tree\Classic\Success.jpg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\Tree\Default\Failure.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\Tree\Default\Ignored.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\Tree\Default\Inconclusive.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\Tree\Default\Skipped.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\Tree\Default\Success.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\Tree\Visual Studio\Failure.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\Tree\Visual Studio\Ignored.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\Tree\Visual Studio\Inconclusive.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\Tree\Visual Studio\Skipped.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\Tree\Visual Studio\Success.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Images\pinned.gif" />
-    <EmbeddedResource Include="Images\unpinned.gif" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
+    
+	<ItemGroup>
+        <ProjectReference Include="..\..\TestModel\model\TestCentric.Gui.Model.csproj" />
+        <ProjectReference Include="..\..\GuiException\UiException\nunit.uiexception.dll.csproj" />
+    </ItemGroup>
+  
+	<ItemGroup>
+        <Content Include="..\..\..\testcentric.ico">
+            <Link>testcentric.ico</Link>
+        </Content>
+		<!--
+		<Content Include="Images\DebugTests.png">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Images\Ellipsis.gif" />
+        <Content Include="Images\GroupBy_16x.png">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Images\StopRun.png">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Images\SummaryReport.png">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>-->
+        <Content Include="Images\Tree\Circles\Failure.jpg">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Images\Tree\Circles\Ignored.jpg">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Images\Tree\Circles\Inconclusive.jpg">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Images\Tree\Circles\Skipped.jpg">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Images\Tree\Circles\Success.jpg">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Images\Tree\Classic\Failure.jpg">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Images\Tree\Classic\Ignored.jpg">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Images\Tree\Classic\Inconclusive.jpg">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Images\Tree\Classic\Skipped.jpg">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Images\Tree\Classic\Success.jpg">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Images\Tree\Default\Failure.png">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Images\Tree\Default\Ignored.png">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Images\Tree\Default\Inconclusive.png">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Images\Tree\Default\Skipped.png">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Images\Tree\Default\Success.png">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Images\Tree\Visual Studio\Failure.png">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Images\Tree\Visual Studio\Ignored.png">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Images\Tree\Visual Studio\Inconclusive.png">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Images\Tree\Visual Studio\Skipped.png">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Images\Tree\Visual Studio\Success.png">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+    </ItemGroup>
+    
+	<ItemGroup>
+        <EmbeddedResource Include="Images\pinned.gif" />
+        <EmbeddedResource Include="Images\unpinned.gif" />
+    </ItemGroup>
+    
+	<ItemGroup>
+        <Compile Update="Properties\Resources.Designer.cs">
+            <DesignTime>True</DesignTime>
+            <AutoGen>True</AutoGen>
+            <DependentUpon>Resources.resx</DependentUpon>
+        </Compile>
+    </ItemGroup>
+    
+	<ItemGroup>
+        <EmbeddedResource Update="Properties\Resources.resx">
+            <Generator>ResXFileCodeGenerator</Generator>
+            <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+        </EmbeddedResource>
+    </ItemGroup>
+	
 </Project>
\ No newline at end of file
diff --git a/src/TestCentric/tests/TestCentric.Gui.Tests.csproj b/src/TestCentric/tests/TestCentric.Gui.Tests.csproj
index 372c368fa..abbd2ba23 100644
--- a/src/TestCentric/tests/TestCentric.Gui.Tests.csproj
+++ b/src/TestCentric/tests/TestCentric.Gui.Tests.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+	
 	<PropertyGroup>
 		<RootNamespace>TestCentric.Gui</RootNamespace>
 		<AssemblyName>TestCentric.Gui.Tests</AssemblyName>
@@ -7,31 +8,27 @@
 		<OutputPath>..\..\..\bin\$(Configuration)\</OutputPath>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <AssemblyTitle>TestCentric GUI Tests</AssemblyTitle>
-  </PropertyGroup>
+        <AssemblyTitle>TestCentric GUI Tests</AssemblyTitle>
+    </PropertyGroup>
+	
 	<ItemGroup>
 		<Reference Include="System.Windows.Forms" />
 	</ItemGroup>
-    <ItemGroup>
-        <ProjectReference Include="..\..\TestModel\model\TestCentric.Gui.Model.csproj">
-            <Name>TestCentric.Gui.Model</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\testcentric.gui\TestCentric.Gui.csproj">
-            <Name>TestCentric.Gui</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\..\GuiException\UiException\nunit.uiexception.dll.csproj">
-            <Name>nunit.uiexception.dll</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\..\tests\mock-assembly\mock-assembly.csproj">
-            <Name>mock-assembly</Name>
-        </ProjectReference>
+    
+	<ItemGroup>
+        <ProjectReference Include="..\..\TestModel\model\TestCentric.Gui.Model.csproj" />
+        <ProjectReference Include="..\testcentric.gui\TestCentric.Gui.csproj" />
+        <ProjectReference Include="..\..\GuiException\UiException\nunit.uiexception.dll.csproj" />
+        <ProjectReference Include="..\..\tests\mock-assembly\mock-assembly.csproj" />
     </ItemGroup>
-    <ItemGroup>
+    
+	<ItemGroup>
         <None Include="TestCentric.Gui.Tests.addins">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
     </ItemGroup>
-    <ItemGroup>
+    
+	<ItemGroup>
         <PackageReference Include="NSubstitute" Version="4.0.0" />
 		<PackageReference Include="NUnit" Version="3.13.2" />
 		<PackageReference Include="NUnitLite" Version="3.13.2" />
@@ -41,4 +38,5 @@
         <PackageReference Include="NUnit.Extension.VSProjectLoader" Version="3.8.0" />
 		<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.1" />
 	</ItemGroup>
+	
 </Project>
\ No newline at end of file
diff --git a/src/TestModel/tests/TestCentric.Gui.Model.Tests.csproj b/src/TestModel/tests/TestCentric.Gui.Model.Tests.csproj
index 5b2d8c6a9..27378d4c7 100644
--- a/src/TestModel/tests/TestCentric.Gui.Model.Tests.csproj
+++ b/src/TestModel/tests/TestCentric.Gui.Model.Tests.csproj
@@ -15,12 +15,8 @@
     </ItemGroup>
     
 	<ItemGroup>
-        <ProjectReference Include="..\..\tests\mock-assembly\mock-assembly.csproj">
-          <Name>mock-assembly</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\model\TestCentric.Gui.Model.csproj">
-          <Name>TestCentric.Gui.Model</Name>
-        </ProjectReference>
+        <ProjectReference Include="..\..\tests\mock-assembly\mock-assembly.csproj" />
+        <ProjectReference Include="..\model\TestCentric.Gui.Model.csproj" />
     </ItemGroup>
     
 	<ItemGroup>