Index: Core/Common/test/Core.Common.IO.Test/Core.Common.IO.Test.csproj
===================================================================
diff -u -rfdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 -r0818a014ee1122d90925191931d6869e47794071
--- Core/Common/test/Core.Common.IO.Test/Core.Common.IO.Test.csproj	(.../Core.Common.IO.Test.csproj)	(revision fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9)
+++ Core/Common/test/Core.Common.IO.Test/Core.Common.IO.Test.csproj	(.../Core.Common.IO.Test.csproj)	(revision 0818a014ee1122d90925191931d6869e47794071)
@@ -1,6 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
+    <Compile Remove="test-data\**" />
+    <EmbeddedResource Remove="test-data\**" />
+    <None Remove="test-data\**" />
+  </ItemGroup>
+  <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
@@ -11,10 +16,10 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj"/>
-    <ProjectReference Include="..\..\src\Core.Common.IO\Core.Common.IO.csproj"/>
-    <ProjectReference Include="..\..\src\Core.Common.Util\Core.Common.Util.csproj"/>
-    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj" />
+    <ProjectReference Include="..\..\src\Core.Common.IO\Core.Common.IO.csproj" />
+    <ProjectReference Include="..\..\src\Core.Common.Util\Core.Common.Util.csproj" />
+    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="NUnit">
Index: Core/Common/test/Core.Common.TestUtil.Test/Core.Common.TestUtil.Test.csproj
===================================================================
diff -u -rfdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 -r0818a014ee1122d90925191931d6869e47794071
--- Core/Common/test/Core.Common.TestUtil.Test/Core.Common.TestUtil.Test.csproj	(.../Core.Common.TestUtil.Test.csproj)	(revision fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9)
+++ Core/Common/test/Core.Common.TestUtil.Test/Core.Common.TestUtil.Test.csproj	(.../Core.Common.TestUtil.Test.csproj)	(revision 0818a014ee1122d90925191931d6869e47794071)
@@ -1,6 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
+    <Compile Remove="test-data\**" />
+    <EmbeddedResource Remove="test-data\**" />
+    <None Remove="test-data\**" />
+  </ItemGroup>
+  <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -12,10 +17,10 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj"/>
-    <ProjectReference Include="..\..\src\Core.Common.Gui\Core.Common.Gui.csproj"/>
-    <ProjectReference Include="..\..\src\Core.Common.Util\Core.Common.Util.csproj"/>
-    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj" />
+    <ProjectReference Include="..\..\src\Core.Common.Gui\Core.Common.Gui.csproj" />
+    <ProjectReference Include="..\..\src\Core.Common.Util\Core.Common.Util.csproj" />
+    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
Index: Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj
===================================================================
diff -u -rfdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 -r0818a014ee1122d90925191931d6869e47794071
--- Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj	(.../Core.Common.TestUtil.csproj)	(revision fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9)
+++ Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj	(.../Core.Common.TestUtil.csproj)	(revision 0818a014ee1122d90925191931d6869e47794071)
@@ -1,6 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$(SolutionDir)\build\TestUtil.targets" />
   <ItemGroup>
+    <Compile Remove="test-data\**" />
+    <EmbeddedResource Remove="test-data\**" />
+    <None Remove="test-data\**" />
+  </ItemGroup>
+  <ItemGroup>
     <Reference Include="NUnitForms">
       <HintPath>..\..\..\..\lib\NUnitForms.dll</HintPath>
     </Reference>
@@ -15,9 +20,9 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj"/>
-    <ProjectReference Include="..\..\src\Core.Common.Gui\Core.Common.Gui.csproj"/>
-    <ProjectReference Include="..\..\src\Core.Common.Util\Core.Common.Util.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj" />
+    <ProjectReference Include="..\..\src\Core.Common.Gui\Core.Common.Gui.csproj" />
+    <ProjectReference Include="..\..\src\Core.Common.Util\Core.Common.Util.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
Index: Core/Common/test/Core.Common.Util.Test/Core.Common.Util.Test.csproj
===================================================================
diff -u -rfdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 -r0818a014ee1122d90925191931d6869e47794071
--- Core/Common/test/Core.Common.Util.Test/Core.Common.Util.Test.csproj	(.../Core.Common.Util.Test.csproj)	(revision fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9)
+++ Core/Common/test/Core.Common.Util.Test/Core.Common.Util.Test.csproj	(.../Core.Common.Util.Test.csproj)	(revision 0818a014ee1122d90925191931d6869e47794071)
@@ -1,6 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
+    <Compile Remove="test-data\**" />
+    <EmbeddedResource Remove="test-data\**" />
+    <None Remove="test-data\**" />
+  </ItemGroup>
+  <ItemGroup>
     <Reference Include="PresentationCore" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -9,8 +14,8 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Core.Common.Util\Core.Common.Util.csproj"/>
-    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Common.Util\Core.Common.Util.csproj" />
+    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">