Index: build/Test.targets
===================================================================
diff -u -rad9df99944a8cdd44fa9ab821efc6dc99bcff6aa -rd6da8253e97f1de6d9466a188216eb2464834367
--- build/Test.targets	(.../Test.targets)	(revision ad9df99944a8cdd44fa9ab821efc6dc99bcff6aa)
+++ build/Test.targets	(.../Test.targets)	(revision d6da8253e97f1de6d9466a188216eb2464834367)
@@ -2,10 +2,18 @@
   <PropertyGroup>
     <TestProjectType>UnitTest</TestProjectType>
     <OutDir>$(OutputPath)</OutDir>
-    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <OutputPath>$(SolutionDir)\bin\$(Configuration)\Test\Built-in\Managed\Core</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseForCodeCoverage|x86'">
     <DebugType>none</DebugType>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\build\Source.targets" />
+  <Target Name="CopyTestData" AfterTargets="Build">
+    <ItemGroup>
+      <MySourceFiles Include="$(ProjectDir)test-data\**\*.*"/>
+    </ItemGroup>
+    <Copy SourceFiles="@(MySourceFiles)"
+	      DestinationFiles="@(MySourceFiles->'$(OutDir)test-data\$(ProjectName)\%(RecursiveDir)%(Filename)%(Extension)')"
+		  SkipUnchangedFiles="true"/>
+  </Target> 
 </Project>
\ No newline at end of file
Index: build/TestUtil.targets
===================================================================
diff -u -rad9df99944a8cdd44fa9ab821efc6dc99bcff6aa -rd6da8253e97f1de6d9466a188216eb2464834367
--- build/TestUtil.targets	(.../TestUtil.targets)	(revision ad9df99944a8cdd44fa9ab821efc6dc99bcff6aa)
+++ build/TestUtil.targets	(.../TestUtil.targets)	(revision d6da8253e97f1de6d9466a188216eb2464834367)
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <OutDir>$(OutputPath)</OutDir>
-    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <OutputPath>$(SolutionDir)\bin\$(Configuration)\Test\Built-in\Managed\Core</OutputPath>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\build\Source.targets" />
 </Project>
\ No newline at end of file