Move Core into wix

350 files changed, 0 insertions, 11766 deletions

diff --git a/src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj b/src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj
deleted file mode 100644
index 88210bd4..00000000
--- a/src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ExtensionWxs Include="..\Example.Extension\Data\example.wxs">
-      <WixlibPath>$(BaseOutputPath)TestData\$(Configuration)\example.wixlib</WixlibPath>
-    </ExtensionWxs>
-  </ItemGroup>
-
-  <Target Name="BuildExtensionWixlibs"
-          AfterTargets="AfterBuild"
-          Inputs="@(ExtensionWxs)"
-          Outputs="%(ExtensionWxs.WixlibPath)"
-          Condition=" '$(NCrunch)'!='1' ">
-
-    <Exec Command="dotnet @(TargetPathWithTargetPlatformMoniker) &quot;$(IntermediateOutputPath) &quot; &quot;%(ExtensionWxs.WixlibPath)&quot; &quot;%(ExtensionWxs.Filename)%(ExtensionWxs.Extension)&quot;"
-          WorkingDirectory="%(ExtensionWxs.RelativeDir)" />
-
-    <Message Importance="high" Text="@(ExtensionWxs) -&gt; %(ExtensionWxs.WixlibPath)" />
-  </Target>
-</Project>
diff --git a/src/test/CompileCoreTestExtensionWixlib/Program.cs b/src/test/CompileCoreTestExtensionWixlib/Program.cs
deleted file mode 100644
index 323b5e5e..00000000
--- a/src/test/CompileCoreTestExtensionWixlib/Program.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright(c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-using System.Collections.Generic;
-using WixToolset.Core.TestPackage;
-
-namespace CompileCoreTestExtensionWixlib
-{
-    // We want to be able to test Core with extensions, but there's no easy way to build an extension without Tools.
-    // So we have this helper exe.
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            var intermediateFolder = args[0];
-            var wixlibPath = args[1];
-
-            var buildArgs = new List<string>();
-            buildArgs.Add("build");
-            buildArgs.Add("-bindfiles");
-            buildArgs.Add("-bindpath");
-            buildArgs.Add("Data");
-            buildArgs.Add("-intermediateFolder");
-            buildArgs.Add(intermediateFolder);
-            buildArgs.Add("-o");
-            buildArgs.Add(wixlibPath);
-
-            foreach (var path in args[2].Split(';'))
-            {
-                buildArgs.Add(path);
-            }
-
-            var result = WixRunner.Execute(buildArgs.ToArray());
-
-            result.AssertSuccess();
-        }
-    }
-}
diff --git a/src/test/Example.Extension/Data/example.txt b/src/test/Example.Extension/Data/example.txt
deleted file mode 100644
index 1b4ffe8a..00000000
--- a/src/test/Example.Extension/Data/example.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is example.txt.
\ No newline at end of file
diff --git a/src/test/Example.Extension/Data/example.wxs b/src/test/Example.Extension/Data/example.wxs
deleted file mode 100644
index af5d5086..00000000
--- a/src/test/Example.Extension/Data/example.wxs
+++ /dev/null
@@ -1,15 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <Property Id="PropertyFromExampleWir" Value="FromWir" />
-
-    <Binary Id="BinFromWir" SourceFile="example.txt" />
-  </Fragment>
-  <Fragment>
-    <BootstrapperApplication Id="fakeba">
-      <BootstrapperApplicationDll SourceFile="example.txt" />
-    </BootstrapperApplication>
-  </Fragment>
-  <Fragment>
-    <BundleExtension Id="ExampleBundleExtension" SourceFile="example.txt" />
-  </Fragment>
-</Wix>
diff --git a/src/test/Example.Extension/Example.Extension.csproj b/src/test/Example.Extension/Example.Extension.csproj
deleted file mode 100644
index 9be10d35..00000000
--- a/src/test/Example.Extension/Example.Extension.csproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <DebugType>embedded</DebugType>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <!-- This .wixlib is built by CompileCoreTestExtensionWixlib.csproj -->
-    <EmbeddedResource Include="$(BaseOutputPath)TestData\$(Configuration)\Example.wixlib" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\CompileCoreTestExtensionWixlib\CompileCoreTestExtensionWixlib.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/test/Example.Extension/ExampleCompilerExtension.cs b/src/test/Example.Extension/ExampleCompilerExtension.cs
deleted file mode 100644
index 5b8d4b3f..00000000
--- a/src/test/Example.Extension/ExampleCompilerExtension.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace Example.Extension
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Xml.Linq;
-    using WixToolset.Data;
-    using WixToolset.Extensibility;
-
-    internal class ExampleCompilerExtension : BaseCompilerExtension
-    {
-        public override XNamespace Namespace => "http://www.example.com/scheams/v1/wxs";
-        public string BundleExtensionId => "ExampleBundleExtension";
-
-        public override void ParseElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary<string, string> context)
-        {
-            var processed = false;
-
-            switch (parentElement.Name.LocalName)
-            {
-                case "Bundle":
-                case "Fragment":
-                    switch (element.Name.LocalName)
-                    {
-                        case "ExampleEnsureTable":
-                            this.ParseExampleEnsureTableElement(intermediate, section, element);
-                            processed = true;
-                            break;
-                        case "ExampleSearch":
-                            this.ParseExampleSearchElement(intermediate, section, element);
-                            processed = true;
-                            break;
-                        case "ExampleSearchRef":
-                            this.ParseExampleSearchRefElement(intermediate, section, element);
-                            processed = true;
-                            break;
-                    }
-                    break;
-                case "Component":
-                    switch (element.Name.LocalName)
-                    {
-                        case "Example":
-                            this.ParseExampleElement(intermediate, section, element);
-                            processed = true;
-                            break;
-                    }
-                    break;
-            }
-
-            if (!processed)
-            {
-                base.ParseElement(intermediate, section, parentElement, element, context);
-            }
-        }
-
-        private void ParseExampleElement(Intermediate intermediate, IntermediateSection section, XElement element)
-        {
-            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
-            Identifier id = null;
-            string value = null;
-
-            foreach (var attrib in element.Attributes())
-            {
-                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
-                {
-                    switch (attrib.Name.LocalName)
-                    {
-                        case "Id":
-                            id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
-                            break;
-
-                        case "Value":
-                            value = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
-                            break;
-
-                        default:
-                            this.ParseHelper.UnexpectedAttribute(element, attrib);
-                            break;
-                    }
-                }
-                else
-                {
-                    this.ParseAttribute(intermediate, section, element, attrib, null);
-                }
-            }
-
-            if (null == id)
-            {
-                //this.Messaging(WixErrors.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id"));
-            }
-
-            if (!this.Messaging.EncounteredError)
-            {
-                var symbol = this.ParseHelper.CreateSymbol(section, sourceLineNumbers, "Example", id);
-                symbol.Set(0, value);
-            }
-        }
-
-        private void ParseExampleEnsureTableElement(Intermediate intermediate, IntermediateSection section, XElement element)
-        {
-            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
-            this.ParseHelper.EnsureTable(section, sourceLineNumbers, ExampleTableDefinitions.NotInAll);
-        }
-
-        private void ParseExampleSearchElement(Intermediate intermediate, IntermediateSection section, XElement element)
-        {
-            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
-            Identifier id = null;
-            string searchFor = null;
-            string variable = null;
-            string condition = null;
-            string after = null;
-
-            foreach (var attrib in element.Attributes())
-            {
-                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
-                {
-                    switch (attrib.Name.LocalName)
-                    {
-                        case "Id":
-                            id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
-                            break;
-                        case "Variable":
-                            variable = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
-                            break;
-                        case "Condition":
-                            condition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
-                            break;
-                        case "After":
-                            after = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
-                            break;
-                        case "SearchFor":
-                            searchFor = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
-                            break;
-
-                        default:
-                            this.ParseHelper.UnexpectedAttribute(element, attrib);
-                            break;
-                    }
-                }
-                else
-                {
-                    this.ParseAttribute(intermediate, section, element, attrib, null);
-                }
-            }
-
-            if (null == id)
-            {
-                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id"));
-            }
-
-            if (!this.Messaging.EncounteredError)
-            {
-                this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, this.BundleExtensionId);
-            }
-
-            if (!this.Messaging.EncounteredError)
-            {
-                var symbol = section.AddSymbol(new ExampleSearchSymbol(sourceLineNumbers, id)
-                {
-                    SearchFor = searchFor,
-                });
-            }
-        }
-
-        private void ParseExampleSearchRefElement(Intermediate intermediate, IntermediateSection section, XElement element)
-        {
-            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
-
-            foreach (var attrib in element.Attributes())
-            {
-                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
-                {
-                    switch (attrib.Name.LocalName)
-                    {
-                        case "Id":
-                            var refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ExampleSymbolDefinitions.ExampleSearch, refId);
-                            break;
-                        default:
-                            this.ParseHelper.UnexpectedAttribute(element, attrib);
-                            break;
-                    }
-                }
-                else
-                {
-                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib);
-                }
-            }
-
-            this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
-        }
-    }
-}
diff --git a/src/test/Example.Extension/ExampleExtensionData.cs b/src/test/Example.Extension/ExampleExtensionData.cs
deleted file mode 100644
index 91d60eb9..00000000
--- a/src/test/Example.Extension/ExampleExtensionData.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace Example.Extension
-{
-    using WixToolset.Data;
-    using WixToolset.Extensibility;
-
-    internal class ExampleExtensionData : IExtensionData
-    {
-        public string DefaultCulture => null;
-
-        public Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)
-        {
-            return Intermediate.Load(typeof(ExampleExtensionData).Assembly, "Example.Extension.Example.wixlib", symbolDefinitions);
-        }
-
-        public bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
-        {
-            symbolDefinition = ExampleSymbolDefinitions.ByName(name);
-            return symbolDefinition != null;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/Example.Extension/ExampleExtensionFactory.cs b/src/test/Example.Extension/ExampleExtensionFactory.cs
deleted file mode 100644
index e54561ee..00000000
--- a/src/test/Example.Extension/ExampleExtensionFactory.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace Example.Extension
-{
-    using System;
-    using WixToolset.Extensibility;
-    using WixToolset.Extensibility.Services;
-
-    public class ExampleExtensionFactory : IExtensionFactory
-    {
-        private ExamplePreprocessorExtensionAndCommandLine preprocessorExtension;
-
-        public ExampleExtensionFactory(IWixToolsetCoreServiceProvider serviceProvider)
-        {
-            this.ServiceProvider = serviceProvider;
-        }
-
-        /// <summary>
-        /// This exists just to show it is possible to get a service provider to the extension factory.
-        /// </summary>
-        private IWixToolsetCoreServiceProvider ServiceProvider { get; }
-
-        public bool TryCreateExtension(Type extensionType, out object extension)
-        {
-            if (extensionType == typeof(IExtensionCommandLine) || extensionType == typeof(IPreprocessorExtension))
-            {
-                if (this.preprocessorExtension == null)
-                {
-                    this.preprocessorExtension = new ExamplePreprocessorExtensionAndCommandLine();
-                }
-
-                extension = this.preprocessorExtension;
-            }
-            else if (extensionType == typeof(ICompilerExtension))
-            {
-                extension = new ExampleCompilerExtension();
-            }
-            else if (extensionType == typeof(IExtensionData))
-            {
-                extension = new ExampleExtensionData();
-            }
-            else if (extensionType == typeof(IWindowsInstallerBackendBinderExtension))
-            {
-                extension = new ExampleWindowsInstallerBackendExtension();
-            }
-            else
-            {
-                extension = null;
-            }
-
-            return extension != null;
-        }
-    }
-}
diff --git a/src/test/Example.Extension/ExamplePreprocessorExtensionAndCommandLine.cs b/src/test/Example.Extension/ExamplePreprocessorExtensionAndCommandLine.cs
deleted file mode 100644
index 7244798a..00000000
--- a/src/test/Example.Extension/ExamplePreprocessorExtensionAndCommandLine.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace Example.Extension
-{
-    using System;
-    using System.Collections.Generic;
-    using WixToolset.Extensibility;
-    using WixToolset.Extensibility.Data;
-    using WixToolset.Extensibility.Services;
-
-    internal class ExamplePreprocessorExtensionAndCommandLine : BasePreprocessorExtension, IExtensionCommandLine
-    {
-        private string exampleValueFromCommandLine;
-
-        public IReadOnlyCollection<ExtensionCommandLineSwitch> CommandLineSwitches => throw new NotImplementedException();
-
-        public ExamplePreprocessorExtensionAndCommandLine()
-        {
-            this.Prefixes = new[] { "ex" };
-        }
-
-        public void PreParse(ICommandLineContext context)
-        {
-        }
-
-        public bool TryParseArgument(ICommandLineParser parser, string argument)
-        {
-            if (parser.IsSwitch(argument) && argument.Substring(1).Equals("example", StringComparison.OrdinalIgnoreCase))
-            {
-                this.exampleValueFromCommandLine = parser.GetNextArgumentOrError(argument);
-                return true;
-            }
-
-            return false;
-        }
-
-        public bool TryParseCommand(ICommandLineParser parser, string argument, out ICommandLineCommand command)
-        {
-            command = null;
-            return false;
-        }
-
-        public void PostParse()
-        {
-        }
-
-        public override string GetVariableValue(string prefix, string name)
-        {
-            if (prefix == "ex" && "test".Equals(name, StringComparison.OrdinalIgnoreCase))
-            {
-                return String.IsNullOrWhiteSpace(this.exampleValueFromCommandLine) ? "(null)" : this.exampleValueFromCommandLine;
-            }
-
-            return null;
-        }
-    }
-}
diff --git a/src/test/Example.Extension/ExampleRow.cs b/src/test/Example.Extension/ExampleRow.cs
deleted file mode 100644
index fc20c6c9..00000000
--- a/src/test/Example.Extension/ExampleRow.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace Example.Extension
-{
-    using WixToolset.Data;
-    using WixToolset.Data.WindowsInstaller;
-
-    public class ExampleRow : Row
-    {
-        public ExampleRow(SourceLineNumber sourceLineNumbers, Table table)
-            : base(sourceLineNumbers, table)
-        {
-        }
-
-        public ExampleRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDefinition)
-            : base(sourceLineNumbers, tableDefinition)
-        {
-        }
-
-        public string Example
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        public string Value
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-    }
-}
diff --git a/src/test/Example.Extension/ExampleSearchSymbol.cs b/src/test/Example.Extension/ExampleSearchSymbol.cs
deleted file mode 100644
index 40a39292..00000000
--- a/src/test/Example.Extension/ExampleSearchSymbol.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace Example.Extension
-{
-    using WixToolset.Data;
-
-    public enum ExampleSearchSymbolFields
-    {
-        SearchFor,
-    }
-
-    public class ExampleSearchSymbol : IntermediateSymbol
-    {
-        public ExampleSearchSymbol() : base(ExampleSymbolDefinitions.ExampleSearch, null, null)
-        {
-        }
-
-        public ExampleSearchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ExampleSymbolDefinitions.ExampleSearch, sourceLineNumber, id)
-        {
-        }
-
-        public IntermediateField this[ExampleSymbolFields index] => this.Fields[(int)index];
-
-        public string SearchFor
-        {
-            get => this.Fields[(int)ExampleSearchSymbolFields.SearchFor]?.AsString();
-            set => this.Set((int)ExampleSearchSymbolFields.SearchFor, value);
-        }
-    }
-}
diff --git a/src/test/Example.Extension/ExampleSymbol.cs b/src/test/Example.Extension/ExampleSymbol.cs
deleted file mode 100644
index 314087e9..00000000
--- a/src/test/Example.Extension/ExampleSymbol.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace Example.Extension
-{
-    using WixToolset.Data;
-
-    public enum ExampleSymbolFields
-    {
-        Value,
-    }
-
-    public class ExampleSymbol : IntermediateSymbol
-    {
-        public ExampleSymbol() : base(ExampleSymbolDefinitions.Example, null, null)
-        {
-        }
-
-        public ExampleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ExampleSymbolDefinitions.Example, sourceLineNumber, id)
-        {
-        }
-
-        public IntermediateField this[ExampleSymbolFields index] => this.Fields[(int)index];
-
-        public string Value
-        {
-            get => this.Fields[(int)ExampleSymbolFields.Value]?.AsString();
-            set => this.Set((int)ExampleSymbolFields.Value, value);
-        }
-    }
-}
diff --git a/src/test/Example.Extension/ExampleSymbolDefinitions.cs b/src/test/Example.Extension/ExampleSymbolDefinitions.cs
deleted file mode 100644
index f13d716d..00000000
--- a/src/test/Example.Extension/ExampleSymbolDefinitions.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace Example.Extension
-{
-    using System;
-    using WixToolset.Data;
-    using WixToolset.Data.Burn;
-
-    public enum ExampleSymbolDefinitionType
-    {
-        Example,
-        ExampleSearch,
-    }
-
-    public static class ExampleSymbolDefinitions
-    {
-        public static readonly IntermediateSymbolDefinition Example = new IntermediateSymbolDefinition(
-            ExampleSymbolDefinitionType.Example.ToString(),
-            new[]
-            {
-                new IntermediateFieldDefinition(nameof(ExampleSymbolFields.Value), IntermediateFieldType.String),
-            },
-            typeof(ExampleSymbol));
-
-        public static readonly IntermediateSymbolDefinition ExampleSearch = new IntermediateSymbolDefinition(
-            ExampleSymbolDefinitionType.ExampleSearch.ToString(),
-            new[]
-            {
-                new IntermediateFieldDefinition(nameof(ExampleSearchSymbolFields.SearchFor), IntermediateFieldType.String),
-            },
-            typeof(ExampleSearchSymbol));
-
-        static ExampleSymbolDefinitions()
-        {
-            ExampleSearch.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag);
-        }
-
-        public static bool TryGetSymbolType(string name, out ExampleSymbolDefinitionType type)
-        {
-            return Enum.TryParse(name, out type);
-        }
-
-        public static IntermediateSymbolDefinition ByName(string name)
-        {
-            if (!TryGetSymbolType(name, out var type))
-            {
-                return null;
-            }
-            return ByType(type);
-        }
-
-        public static IntermediateSymbolDefinition ByType(ExampleSymbolDefinitionType type)
-        {
-            switch (type)
-            {
-                case ExampleSymbolDefinitionType.Example:
-                    return ExampleSymbolDefinitions.Example;
-
-                case ExampleSymbolDefinitionType.ExampleSearch:
-                    return ExampleSymbolDefinitions.ExampleSearch;
-
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(type));
-            }
-        }
-    }
-}
diff --git a/src/test/Example.Extension/ExampleTableDefinitions.cs b/src/test/Example.Extension/ExampleTableDefinitions.cs
deleted file mode 100644
index a2b81698..00000000
--- a/src/test/Example.Extension/ExampleTableDefinitions.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace Example.Extension
-{
-    using WixToolset.Data.WindowsInstaller;
-
-    public static class ExampleTableDefinitions
-    {
-        public static readonly TableDefinition ExampleTable = new TableDefinition(
-            "Wix4Example",
-            ExampleSymbolDefinitions.Example,
-            new[]
-            {
-                new ColumnDefinition("Example", ColumnType.String, 72, true, false, ColumnCategory.Identifier),
-                new ColumnDefinition("Value", ColumnType.String, 0, false, false, ColumnCategory.Formatted),
-            },
-            strongRowType: typeof(ExampleRow),
-            symbolIdIsPrimaryKey: true
-        );
-
-        public static readonly TableDefinition NotInAll = new TableDefinition(
-            "TableDefinitionNotExposedByExtension",
-            null,
-            new[]
-            {
-                new ColumnDefinition("Example", ColumnType.String, 72, true, false, ColumnCategory.Identifier),
-                new ColumnDefinition("Value", ColumnType.String, 0, false, false, ColumnCategory.Formatted),
-            },
-            symbolIdIsPrimaryKey: true
-        );
-
-        public static readonly TableDefinition[] All = new[] { ExampleTable };
-    }
-}
diff --git a/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs b/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs
deleted file mode 100644
index afccc56f..00000000
--- a/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace Example.Extension
-{
-    using System.Collections.Generic;
-    using WixToolset.Data;
-    using WixToolset.Data.WindowsInstaller;
-    using WixToolset.Extensibility;
-
-    internal class ExampleWindowsInstallerBackendExtension : BaseWindowsInstallerBackendBinderExtension
-    {
-        public override IReadOnlyCollection<TableDefinition> TableDefinitions => ExampleTableDefinitions.All;
-
-        public override bool TryProcessSymbol(IntermediateSection section, IntermediateSymbol symbol, WindowsInstallerData output, TableDefinitionCollection tableDefinitions)
-        {
-            if (ExampleSymbolDefinitions.TryGetSymbolType(symbol.Definition.Name, out var symbolType))
-            {
-                switch (symbolType)
-                {
-                    case ExampleSymbolDefinitionType.Example:
-                        {
-                            var row = (ExampleRow)this.BackendHelper.CreateRow(section, symbol, output, ExampleTableDefinitions.ExampleTable);
-                            row.Example = symbol.Id.Id;
-                            row.Value = symbol[0].AsString();
-                        }
-                        return true;
-                }
-            }
-
-            return base.TryProcessSymbol(section, symbol, output, tableDefinitions);
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.Core.Burn/BurnReaderFixture.cs b/src/test/WixToolsetTest.Core.Burn/BurnReaderFixture.cs
deleted file mode 100644
index a83da7f6..00000000
--- a/src/test/WixToolsetTest.Core.Burn/BurnReaderFixture.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.Core.Burn
-{
-    using System;
-    using WixToolset.Core.Burn.Bundles;
-    using Xunit;
-
-    public class BurnReaderFixture
-    {
-        [Fact]
-        public void CanReadUInt16Max()
-        {
-            var bytes = new byte[] { 0xFF, 0xFF };
-            var offset = 0u;
-
-            var result = BurnCommon.ReadUInt16(bytes, offset);
-
-            Assert.Equal(UInt16.MaxValue, result);
-        }
-
-        [Fact]
-        public void CanReadUInt32Max()
-        {
-            var bytes = new byte[] { 0xFF, 0xFF, 0xFF, 0xFF };
-            var offset = 0u;
-
-            var result = BurnCommon.ReadUInt32(bytes, offset);
-
-            Assert.Equal(UInt32.MaxValue, result);
-        }
-
-        [Fact]
-        public void CanReadUInt64Max()
-        {
-            var bytes = new byte[] { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
-            var offset = 0u;
-
-            var result = BurnCommon.ReadUInt64(bytes, offset);
-
-            Assert.Equal(UInt64.MaxValue, result);
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.Core.Burn/WixToolsetTest.Core.Burn.csproj b/src/test/WixToolsetTest.Core.Burn/WixToolsetTest.Core.Burn.csproj
deleted file mode 100644
index 175ee1a9..00000000
--- a/src/test/WixToolsetTest.Core.Burn/WixToolsetTest.Core.Burn.csproj
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <DebugType>embedded</DebugType>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <NoWarn>NU1701</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
-  </ItemGroup>
-</Project>
diff --git a/src/test/WixToolsetTest.CoreIntegration/ApprovedExeFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ApprovedExeFixture.cs
deleted file mode 100644
index 47b47ef5..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/ApprovedExeFixture.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System.IO;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using Xunit;
-
-    public class ApprovedExeFixture
-    {
-        [Fact]
-        public void CanBuildWithApprovedExe()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var exePath = Path.Combine(baseFolder, @"bin\test.exe");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "BundleWithApprovedExe", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", Path.Combine(folder, ".Data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", exePath,
-                });
-
-                Assert.NotEqual(0, result.ExitCode);
-                Assert.False(File.Exists(exePath));
-            }
-        }
-
-        [Fact]
-        public void CanBuildWithApprovedExe64()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var exePath = Path.Combine(baseFolder, @"bin\test.exe");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "BundleWithApprovedExe", "Bundle64.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", Path.Combine(folder, ".Data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", exePath,
-                });
-
-                Assert.NotEqual(0, result.ExitCode);
-                Assert.False(File.Exists(exePath));
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/BadInputFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BadInputFixture.cs
deleted file mode 100644
index 62ffe1eb..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/BadInputFixture.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System;
-    using System.IO;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using WixToolset.Data;
-    using Xunit;
-
-    public class BadInputFixture
-    {
-        [Fact]
-        public void SwitchIsNotConsideredAnArgument()
-        {
-            var result = WixRunner.Execute(new[]
-            {
-                "build",
-                "-bindpath", "-thisisaswitchnotanarg",
-            });
-
-            Assert.Single(result.Messages, m => m.Id == (int)ErrorMessages.Ids.ExpectedArgument);
-            // TODO: when CantBuildSingleExeBundleWithInvalidArgument is fixed, uncomment:
-            //Assert.Equal((int)ErrorMessages.Ids.ExpectedArgument, result.ExitCode);
-        }
-
-        [Fact]
-        public void HandleInvalidIds()
-        {
-            var folder = TestData.Get(@"TestData\BadInput");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var wixlibPath = Path.Combine(intermediateFolder, @"test.wixlib");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "InvalidIds.wxs"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", wixlibPath,
-                });
-
-                Assert.Equal(330, result.ExitCode);
-            }
-        }
-
-        [Fact]
-        public void CantBuildSingleExeBundleWithInvalidArgument()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var exePath = Path.Combine(baseFolder, @"bin\test.exe");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "SingleExeBundle", "SingleExePackageGroup.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", Path.Combine(folder, ".Data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", exePath,
-                    "-nonexistentswitch", "param",
-                });
-
-                Assert.NotEqual(0, result.ExitCode);
-                Assert.False(File.Exists(exePath));
-            }
-        }
-
-        [Fact]
-        public void RegistryKeyWithoutAttributesDoesntCrash()
-        {
-            var folder = TestData.Get(@"TestData\BadInput");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var wixlibPath = Path.Combine(intermediateFolder, @"test.wixlib");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "RegistryKey.wxs"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", wixlibPath,
-                });
-
-                Assert.InRange(result.ExitCode, 2, Int32.MaxValue);
-            }
-        }
-
-        [Fact]
-        public void BundleVariableWithBadTypeIsRejected()
-        {
-            var folder = TestData.Get(@"TestData\BadInput");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var wixlibPath = Path.Combine(intermediateFolder, @"test.wixlib");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "BundleVariable.wxs"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", wixlibPath,
-                });
-
-                Assert.Equal(21, result.ExitCode);
-            }
-        }
-
-        [Fact]
-        public void BundleVariableWithHiddenPersistedIsRejected()
-        {
-            var folder = TestData.Get(@"TestData\BadInput");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var wixlibPath = Path.Combine(intermediateFolder, @"test.wixlib");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "HiddenPersistedBundleVariable.wxs"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", wixlibPath,
-                });
-
-                Assert.Equal(193, result.ExitCode);
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/BindVariablesFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BindVariablesFixture.cs
deleted file mode 100644
index 39e6b4aa..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/BindVariablesFixture.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System;
-    using System.IO;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using Xunit;
-
-    public class BindVariablesFixture
-    {
-        [Fact]
-        public void CanBuildBundleWithPackageBindVariables()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var exePath = Path.Combine(baseFolder, @"bin\test.exe");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "BundleBindVariables", "CacheIdFromPackageDescription.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", Path.Combine(folder, ".Data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", exePath,
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(exePath));
-            }
-        }
-
-        [Fact]
-        public void CanBuildWithDefaultValue()
-        {
-            var folder = TestData.Get(@"TestData", "BindVariables");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var wixlibPath = Path.Combine(intermediateFolder, @"test.wixlib");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "DefaultedVariable.wxs"),
-                    "-bf",
-                    "-intermediateFolder", intermediateFolder,
-                    "-bindpath", folder,
-                    "-o", wixlibPath,
-                });
-
-                result.AssertSuccess();
-            }
-        }
-
-        [Fact]
-        public void CannotBuildWixlibWithBinariesFromMissingNamedBindPaths()
-        {
-            var folder = TestData.Get(@"TestData", "WixlibWithBinaries");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var wixlibPath = Path.Combine(intermediateFolder, @"test.wixlib");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-bf",
-                    "-bindpath", Path.Combine(folder, "data"),
-                    // Use names that aren't excluded in default .gitignores.
-                    "-bindpath", $"AlphaBits={Path.Combine(folder, "data", "alpha")}",
-                    "-bindpath", $"PowerBits={Path.Combine(folder, "data", "powerpc")}",
-                    "-bindpath", $"{Path.Combine(folder, "data", "alpha")}",
-                    "-bindpath", $"{Path.Combine(folder, "data", "powerpc")}",
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", wixlibPath,
-                });
-
-                Assert.Equal(103, result.ExitCode);
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/BootstrapperApplicationFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BootstrapperApplicationFixture.cs
deleted file mode 100644
index 9bdc9496..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/BootstrapperApplicationFixture.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System.IO;
-    using System.Linq;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using WixToolset.Data;
-    using WixToolset.Data.Symbols;
-    using Xunit;
-
-    public class BootstrapperApplicationFixture
-    {
-        [Fact]
-        public void CanSetBootstrapperApplicationDllDpiAwareness()
-        {
-            var folder = TestData.Get(@"TestData\BootstrapperApplication");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var wixlibPath = Path.Combine(intermediateFolder, @"test.wixlib");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "DpiAwareness.wxs"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", wixlibPath,
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(wixlibPath);
-                var allSymbols = intermediate.Sections.SelectMany(s => s.Symbols);
-                var baDllSymbol = allSymbols.OfType<WixBootstrapperApplicationDllSymbol>()
-                                              .SingleOrDefault();
-                Assert.NotNull(baDllSymbol);
-
-                Assert.Equal(WixBootstrapperApplicationDpiAwarenessType.GdiScaled, baDllSymbol.DpiAwareness);
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/BundleExtractionFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BundleExtractionFixture.cs
deleted file mode 100644
index b33b8891..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/BundleExtractionFixture.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System.IO;
-    using System.Linq;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core;
-    using WixToolset.Core.TestPackage;
-    using WixToolset.Data;
-    using WixToolset.Extensibility.Services;
-    using Xunit;
-
-    public class BundleExtractionFixture
-    {
-        [Fact]
-        public void CanExtractBundleWithDetachedContainer()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var exePath = Path.Combine(baseFolder, @"bin\test.exe");
-                var pdbPath = Path.Combine(baseFolder, @"bin\test.wixpdb");
-                var extractFolderPath = Path.Combine(baseFolder, "extract");
-                var baFolderPath = Path.Combine(extractFolderPath, "UX");
-                var attachedContainerFolderPath = Path.Combine(extractFolderPath, "AttachedContainer");
-
-                // TODO: use WixRunner.Execute(string[]) to always go through the command line.
-                var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider();
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "BundleWithDetachedContainer", "Bundle.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "MinimalPackageGroup.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", Path.Combine(folder, ".Data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", exePath,
-                }, serviceProvider, out var messages).Result;
-
-                WixRunnerResult.AssertSuccess(result, messages);
-                Assert.Empty(messages.Where(m => m.Level == MessageLevel.Warning));
-
-                Assert.True(File.Exists(exePath));
-
-                var unbinder = serviceProvider.GetService<IUnbinder>();
-                unbinder.Unbind(exePath, OutputType.Bundle, extractFolderPath);
-
-                Assert.True(File.Exists(Path.Combine(baFolderPath, "manifest.xml")));
-                Assert.False(Directory.Exists(attachedContainerFolderPath));
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
deleted file mode 100644
index ab644080..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
+++ /dev/null
@@ -1,478 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Text;
-    using System.Xml;
-    using Example.Extension;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core;
-    using WixToolset.Core.Burn;
-    using WixToolset.Core.TestPackage;
-    using WixToolset.Data;
-    using WixToolset.Data.Burn;
-    using WixToolset.Data.Symbols;
-    using WixToolset.Dtf.Resources;
-    using Xunit;
-
-    public class BundleFixture
-    {
-        [Fact]
-        public void CanBuildMultiFileBundle()
-        {
-            var folder = TestData.Get(@"TestData\SimpleBundle");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "MultiFileBootstrapperApplication.wxs"),
-                    Path.Combine(folder, "MultiFileBundle.wxs"),
-                    "-loc", Path.Combine(folder, "Bundle.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.exe")
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.exe")));
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb")));
-            }
-        }
-
-        [Fact]
-        public void CanBuildSimpleBundle()
-        {
-            var folder = TestData.Get(@"TestData\SimpleBundle");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var exePath = Path.Combine(baseFolder, @"bin\test.exe");
-                var pdbPath = Path.Combine(baseFolder, @"bin\test.wixpdb");
-                var baFolderPath = Path.Combine(baseFolder, "ba");
-                var extractFolderPath = Path.Combine(baseFolder, "extract");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Bundle.wxs"),
-                    "-loc", Path.Combine(folder, "Bundle.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", exePath,
-                });
-
-                result.AssertSuccess();
-                Assert.Empty(result.Messages.Where(m => m.Level == MessageLevel.Warning));
-
-                Assert.True(File.Exists(exePath));
-                Assert.True(File.Exists(pdbPath));
-
-                using (var wixOutput = WixOutput.Read(pdbPath))
-                {
-
-                    var intermediate = Intermediate.Load(wixOutput);
-                    var section = intermediate.Sections.Single();
-
-                    var bundleSymbol = section.Symbols.OfType<WixBundleSymbol>().Single();
-                    Assert.Equal("1.0.0.0", bundleSymbol.Version);
-
-                    var previousVersion = bundleSymbol.Fields[(int)WixBundleSymbolFields.Version].PreviousValue;
-                    Assert.Equal("!(bind.packageVersion.test.msi)", previousVersion.AsString());
-
-                    var msiSymbol = section.Symbols.OfType<WixBundlePackageSymbol>().Single();
-                    Assert.Equal("test.msi", msiSymbol.Id.Id);
-
-                    var extractResult = BundleExtractor.ExtractBAContainer(null, exePath, baFolderPath, extractFolderPath);
-                    extractResult.AssertSuccess();
-
-                    var burnManifestData = wixOutput.GetData(BurnConstants.BurnManifestWixOutputStreamName);
-                    var extractedBurnManifestData = File.ReadAllText(Path.Combine(baFolderPath, "manifest.xml"), Encoding.UTF8);
-                    Assert.Equal(extractedBurnManifestData, burnManifestData);
-
-                    var baManifestData = wixOutput.GetData(BurnConstants.BootstrapperApplicationDataWixOutputStreamName);
-                    var extractedBaManifestData = File.ReadAllText(Path.Combine(baFolderPath, "BootstrapperApplicationData.xml"), Encoding.UTF8);
-                    Assert.Equal(extractedBaManifestData, baManifestData);
-
-                    var bextManifestData = wixOutput.GetData(BurnConstants.BundleExtensionDataWixOutputStreamName);
-                    var extractedBextManifestData = File.ReadAllText(Path.Combine(baFolderPath, "BundleExtensionData.xml"), Encoding.UTF8);
-                    Assert.Equal(extractedBextManifestData, bextManifestData);
-
-                    var logElements = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Log");
-                    var logElement = (XmlNode)Assert.Single(logElements);
-                    Assert.Equal("<Log PathVariable='WixBundleLog' Prefix='~TestBundle' Extension='log' />", logElement.GetTestXml());
-
-                    var registrationElements = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Registration");
-                    var registrationElement = (XmlNode)Assert.Single(registrationElements);
-                    Assert.Equal($"<Registration Id='{bundleSymbol.BundleId}' ExecutableName='test.exe' PerMachine='yes' Tag='' Version='1.0.0.0' ProviderKey='{bundleSymbol.BundleId}'>" +
-                        "<Arp Register='yes' DisplayName='~TestBundle' DisplayVersion='1.0.0.0' Publisher='Example Corporation' />" +
-                        "</Registration>", registrationElement.GetTestXml());
-
-                    var msiPayloads = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Payload[@Id='test.msi']");
-                    var msiPayload = (XmlNode)Assert.Single(msiPayloads);
-                    Assert.Equal("<Payload Id='test.msi' FilePath='test.msi' FileSize='*' Hash='*' Packaging='embedded' SourcePath='a0' Container='WixAttachedContainer' />",
-                        msiPayload.GetTestXml(new Dictionary<string, List<string>>() { { "Payload", new List<string> { "FileSize", "Hash" } } }));
-                }
-
-                var manifestResource = new Resource(ResourceType.Manifest, "#1", 1033);
-                manifestResource.Load(exePath);
-                var actualManifestData = Encoding.UTF8.GetString(manifestResource.Data);
-                Assert.Equal("<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
-                    "<assembly manifestVersion=\"1.0\" xmlns=\"urn:schemas-microsoft-com:asm.v1\">" +
-                    "<assemblyIdentity name=\"test.exe\" version=\"1.0.0.0\" processorArchitecture=\"x86\" type=\"win32\" />" +
-                    "<description>~TestBundle</description>" +
-                    "<dependency><dependentAssembly><assemblyIdentity name=\"Microsoft.Windows.Common-Controls\" version=\"6.0.0.0\" processorArchitecture=\"x86\" publicKeyToken=\"6595b64144ccf1df\" language=\"*\" type=\"win32\" /></dependentAssembly></dependency>" +
-                    "<compatibility xmlns=\"urn:schemas-microsoft-com:compatibility.v1\"><application><supportedOS Id=\"{e2011457-1546-43c5-a5fe-008deee3d3f0}\" /><supportedOS Id=\"{35138b9a-5d96-4fbd-8e2d-a2440225f93a}\" /><supportedOS Id=\"{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}\" /><supportedOS Id=\"{1f676c76-80e1-4239-95bb-83d0f6d0da78}\" /><supportedOS Id=\"{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}\" /></application></compatibility>" +
-                    "<trustInfo xmlns=\"urn:schemas-microsoft-com:asm.v3\"><security><requestedPrivileges><requestedExecutionLevel level=\"asInvoker\" uiAccess=\"false\" /></requestedPrivileges></security></trustInfo>" +
-                    "<application xmlns=\"urn:schemas-microsoft-com:asm.v3\"><windowsSettings><dpiAware xmlns=\"http://schemas.microsoft.com/SMI/2005/WindowsSettings\">true/pm</dpiAware><dpiAwareness xmlns=\"http://schemas.microsoft.com/SMI/2016/WindowsSettings\">PerMonitorV2, PerMonitor</dpiAwareness></windowsSettings></application>" +
-                    "</assembly>", actualManifestData);
-            }
-        }
-
-        [Fact]
-        public void CanBuildX64Bundle()
-        {
-            var folder = TestData.Get(@"TestData\SimpleBundle");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var exePath = Path.Combine(baseFolder, @"bin\test.exe");
-                var pdbPath = Path.Combine(baseFolder, @"bin\test.wixpdb");
-                var baFolderPath = Path.Combine(baseFolder, "ba");
-                var extractFolderPath = Path.Combine(baseFolder, "extract");
-
-                var result = WixRunner.Execute(false, new[] // TODO: go back to elevating warnings as errors.
-                {
-                    "build",
-                    "-arch", "x64",
-                    Path.Combine(folder, "Bundle.wxs"),
-                    "-loc", Path.Combine(folder, "Bundle.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", exePath,
-                });
-
-                result.AssertSuccess();
-                var warning = Assert.Single(result.Messages.Where(m => m.Level == MessageLevel.Warning));
-                Assert.Equal((int)WarningMessages.Ids.ExperimentalBundlePlatform, warning.Id);
-
-                Assert.True(File.Exists(exePath));
-                Assert.True(File.Exists(pdbPath));
-
-                var manifestResource = new Resource(ResourceType.Manifest, "#1", 1033);
-                manifestResource.Load(exePath);
-                var actualManifestData = Encoding.UTF8.GetString(manifestResource.Data);
-                Assert.Equal("<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
-                    "<assembly manifestVersion=\"1.0\" xmlns=\"urn:schemas-microsoft-com:asm.v1\">" +
-                    "<assemblyIdentity name=\"test.exe\" version=\"1.0.0.0\" processorArchitecture=\"amd64\" type=\"win32\" />" +
-                    "<description>~TestBundle</description>" +
-                    "<dependency><dependentAssembly><assemblyIdentity name=\"Microsoft.Windows.Common-Controls\" version=\"6.0.0.0\" processorArchitecture=\"amd64\" publicKeyToken=\"6595b64144ccf1df\" language=\"*\" type=\"win32\" /></dependentAssembly></dependency>" +
-                    "<compatibility xmlns=\"urn:schemas-microsoft-com:compatibility.v1\"><application><supportedOS Id=\"{e2011457-1546-43c5-a5fe-008deee3d3f0}\" /><supportedOS Id=\"{35138b9a-5d96-4fbd-8e2d-a2440225f93a}\" /><supportedOS Id=\"{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}\" /><supportedOS Id=\"{1f676c76-80e1-4239-95bb-83d0f6d0da78}\" /><supportedOS Id=\"{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}\" /></application></compatibility>" +
-                    "<trustInfo xmlns=\"urn:schemas-microsoft-com:asm.v3\"><security><requestedPrivileges><requestedExecutionLevel level=\"asInvoker\" uiAccess=\"false\" /></requestedPrivileges></security></trustInfo>" +
-                    "<application xmlns=\"urn:schemas-microsoft-com:asm.v3\"><windowsSettings><dpiAware xmlns=\"http://schemas.microsoft.com/SMI/2005/WindowsSettings\">true/pm</dpiAware><dpiAwareness xmlns=\"http://schemas.microsoft.com/SMI/2016/WindowsSettings\">PerMonitorV2, PerMonitor</dpiAwareness></windowsSettings></application>" +
-                    "</assembly>", actualManifestData);
-            }
-        }
-
-        [Fact]
-        public void CanBuildSimpleBundleUsingExtensionBA()
-        {
-            var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath);
-            var folder = TestData.Get(@"TestData\SimpleBundle");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "MultiFileBundle.wxs"),
-                    "-loc", Path.Combine(folder, "Bundle.en-us.wxl"),
-                    "-ext", extensionPath,
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.exe")
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.exe")));
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb")));
-            }
-        }
-
-        [Fact]
-        public void CanBuildSingleExeBundle()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var exePath = Path.Combine(baseFolder, @"bin\test.exe");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "SingleExeBundle", "SingleExePackageGroup.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", Path.Combine(folder, ".Data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", exePath,
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(exePath));
-            }
-        }
-
-        [Fact]
-        public void CanBuildSingleExeRemotePayloadBundle()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var exePath = Path.Combine(baseFolder, @"bin\test.exe");
-                var pdbPath = Path.Combine(baseFolder, @"bin\test.wixpdb");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "SingleExeBundle", "SingleExeRemotePayload.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", exePath,
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(exePath));
-                Assert.True(File.Exists(pdbPath));
-
-                using (var wixOutput = WixOutput.Read(pdbPath))
-                {
-                    var intermediate = Intermediate.Load(wixOutput);
-                    var section = intermediate.Sections.Single();
-
-                    var payloadSymbol = section.Symbols.OfType<WixBundlePayloadSymbol>().Where(x => x.Id.Id == "NetFx462Web").Single();
-                    Assert.Equal(Int64.MaxValue, payloadSymbol.FileSize);
-                }
-            }
-        }
-
-        [Fact]
-        public void CantBuildWithDuplicateCacheIds()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var exePath = Path.Combine(baseFolder, @"bin\test.exe");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "BadInput", "DuplicateCacheIds.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", Path.Combine(folder, ".Data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", exePath,
-                });
-
-                Assert.Equal(8001, result.ExitCode);
-            }
-        }
-
-        [Fact]
-        public void CantBuildWithDuplicatePayloadNames()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var exePath = Path.Combine(baseFolder, @"bin\test.exe");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "BadInput", "DuplicatePayloadNames.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", Path.Combine(folder, ".Data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", exePath,
-                });
-
-                var attachedContainerWarnings = result.Messages.Where(m => m.Id == (int)BurnBackendWarnings.Ids.AttachedContainerPayloadCollision)
-                                                               .Select(m => m.ToString())
-                                                               .ToArray();
-                WixAssert.CompareLineByLine(new string[]
-                {
-                    "The Payload 'Auto2' has a duplicate Name 'burn.exe' in the attached container. When extracting the bundle with dark.exe, the file will get overwritten.",
-                }, attachedContainerWarnings);
-
-                var baContainerErrors = result.Messages.Where(m => m.Id == (int)BurnBackendErrors.Ids.BAContainerPayloadCollision)
-                                                       .Select(m => m.ToString())
-                                                       .ToArray();
-                WixAssert.CompareLineByLine(new string[]
-                {
-                    "The Payload 'DuplicatePayloadNames.wxs' has a duplicate Name 'fakeba.dll' in the BA container. When extracting the container at runtime, the file will get overwritten.",
-                    "The Payload 'uxTxMXPVMXwQrPTMIGa5WGt93w0Ns' has a duplicate Name 'BootstrapperApplicationData.xml' in the BA container. When extracting the container at runtime, the file will get overwritten.",
-                    "The Payload 'uxYRbgitOs0K878jn5L_z7LdJ21KI' has a duplicate Name 'BundleExtensionData.xml' in the BA container. When extracting the container at runtime, the file will get overwritten.",
-                }, baContainerErrors);
-
-                var externalErrors = result.Messages.Where(m => m.Id == (int)BurnBackendErrors.Ids.ExternalPayloadCollision)
-                                                    .Select(m => m.ToString())
-                                                    .ToArray();
-                WixAssert.CompareLineByLine(new string[]
-                {
-                    "The external Payload 'HiddenPersistedBundleVariable.wxs' has a duplicate Name 'PayloadCollision'. When building the bundle or laying out the bundle, the file will get overwritten.",
-                    "The external Container 'MsiPackagesContainer' has a duplicate Name 'ContainerCollision'. When building the bundle or laying out the bundle, the file will get overwritten.",
-                }, externalErrors);
-
-                var packageCacheErrors = result.Messages.Where(m => m.Id == (int)BurnBackendErrors.Ids.PackageCachePayloadCollision)
-                                                        .Select(m => m.ToString())
-                                                        .ToArray();
-                WixAssert.CompareLineByLine(new string[]
-                {
-                    "The Payload 'test.msi' has a duplicate Name 'test.msi' in package 'test.msi'. When caching the package, the file will get overwritten.",
-                }, packageCacheErrors);
-
-                Assert.Equal(14, result.Messages.Length);
-            }
-        }
-
-        [Fact]
-        public void CantBuildWithOrphanPayload()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var exePath = Path.Combine(baseFolder, @"bin\test.exe");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "BadInput", "OrphanPayload.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "MinimalPackageGroup.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", Path.Combine(folder, ".Data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", exePath,
-                });
-
-                Assert.Equal((int)LinkerErrors.Ids.OrphanedPayload, result.ExitCode);
-            }
-        }
-
-        [Fact]
-        public void CantBuildWithPackageInMultipleContainers()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var exePath = Path.Combine(baseFolder, @"bin\test.exe");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "BadInput", "PackageInMultipleContainers.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "MinimalPackageGroup.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", Path.Combine(folder, ".Data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", exePath,
-                });
-
-                Assert.Equal((int)LinkerErrors.Ids.PackageInMultipleContainers, result.ExitCode);
-            }
-        }
-
-        [Fact]
-        public void CantBuildWithUnscheduledPackage()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var exePath = Path.Combine(baseFolder, @"bin\test.exe");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "BadInput", "UnscheduledPackage.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", Path.Combine(folder, ".Data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", exePath,
-                });
-
-                Assert.Equal((int)LinkerErrors.Ids.UnscheduledChainPackage, result.ExitCode);
-            }
-        }
-
-        [Fact]
-        public void CantBuildWithUnscheduledRollbackBoundary()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var exePath = Path.Combine(baseFolder, @"bin\test.exe");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "BadInput", "UnscheduledRollbackBoundary.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", Path.Combine(folder, ".Data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", exePath,
-                });
-
-                Assert.Equal((int)LinkerErrors.Ids.UnscheduledRollbackBoundary, result.ExitCode);
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs
deleted file mode 100644
index 6d769bd6..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs
+++ /dev/null
@@ -1,365 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using Example.Extension;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using Xunit;
-
-    public class BundleManifestFixture
-    {
-        [Fact]
-        public void PopulatesBAManifestWithBootstrapperApplicationBundleCustomData()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var bundlePath = Path.Combine(baseFolder, @"bin\test.exe");
-                var baFolderPath = Path.Combine(baseFolder, "ba");
-                var extractFolderPath = Path.Combine(baseFolder, "extract");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "BundleCustomTable", "BundleCustomTable.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "MinimalPackageGroup.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundlePath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(bundlePath));
-
-                var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
-                extractResult.AssertSuccess();
-
-                var customElements = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:BundleCustomTableBA");
-                Assert.Equal(3, customElements.Count);
-                Assert.Equal("<BundleCustomTableBA Id='one' Column2='two' />", customElements[0].GetTestXml());
-                Assert.Equal("<BundleCustomTableBA Id='&gt;' Column2='&lt;' />", customElements[1].GetTestXml());
-                Assert.Equal("<BundleCustomTableBA Id='1' Column2='2' />", customElements[2].GetTestXml());
-            }
-        }
-
-        [Fact]
-        public void PopulatesBAManifestWithPackageInformation()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var bundlePath = Path.Combine(baseFolder, @"bin\test.exe");
-                var baFolderPath = Path.Combine(baseFolder, "ba");
-                var extractFolderPath = Path.Combine(baseFolder, "extract");
-
-                var result = WixRunner.Execute(false, new[]
-                {
-                    "build",
-                    Path.Combine(folder, "CustomPackageDescription", "CustomPackageDescription.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, ".Data"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundlePath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(bundlePath));
-
-                var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
-                extractResult.AssertSuccess();
-
-                var packageElements = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixPackageProperties");
-                var ignoreAttributesByElementName = new Dictionary<string, List<string>>
-                {
-                    { "WixPackageProperties", new List<string> { "DownloadSize", "PackageSize", "InstalledSize", "Version" } },
-                };
-                Assert.Equal(3, packageElements.Count);
-                Assert.Equal("<WixPackageProperties Package='burn.exe' Vital='yes' DisplayName='Windows Installer XML Toolset' Description='WiX Toolset Bootstrapper' DownloadSize='*' PackageSize='*' InstalledSize='*' PackageType='Exe' Permanent='yes' LogPathVariable='WixBundleLog_burn.exe' RollbackLogPathVariable='WixBundleRollbackLog_burn.exe' Compressed='yes' Version='*' Cache='keep' />", packageElements[0].GetTestXml(ignoreAttributesByElementName));
-                Assert.Equal("<WixPackageProperties Package='RemotePayloadExe' Vital='yes' DisplayName='Override RemotePayload display name' Description='Override RemotePayload description' DownloadSize='1' PackageSize='1' InstalledSize='1' PackageType='Exe' Permanent='yes' LogPathVariable='WixBundleLog_RemotePayloadExe' RollbackLogPathVariable='WixBundleRollbackLog_RemotePayloadExe' Compressed='no' Version='1.0.0.0' Cache='keep' />", packageElements[1].GetTestXml());
-                Assert.Equal("<WixPackageProperties Package='calc.exe' Vital='yes' DisplayName='Override harvested display name' Description='Override harvested description' DownloadSize='*' PackageSize='*' InstalledSize='*' PackageType='Exe' Permanent='yes' LogPathVariable='WixBundleLog_calc.exe' RollbackLogPathVariable='WixBundleRollbackLog_calc.exe' Compressed='yes' Version='*' Cache='keep' />", packageElements[2].GetTestXml(ignoreAttributesByElementName));
-            }
-        }
-
-        [Fact]
-        public void PopulatesBAManifestWithPayloadInformation()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var bundlePath = Path.Combine(baseFolder, @"bin\test.exe");
-                var baFolderPath = Path.Combine(baseFolder, "ba");
-                var extractFolderPath = Path.Combine(baseFolder, "extract");
-
-                var result = WixRunner.Execute(false, new[]
-                {
-                    "build",
-                    Path.Combine(folder, "SharedPayloadsBetweenPackages", "SharedPayloadsBetweenPackages.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, ".Data"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundlePath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(bundlePath));
-
-                var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
-                extractResult.AssertSuccess();
-
-                var payloadElements = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixPayloadProperties");
-                var ignoreAttributesByElementName = new Dictionary<string, List<string>>
-                {
-                    { "WixPayloadProperties", new List<string> { "Size" } },
-                };
-                Assert.Equal(4, payloadElements.Count);
-                Assert.Equal("<WixPayloadProperties Package='credwiz.exe' Payload='SourceFilePayload' Container='WixAttachedContainer' Name='SharedPayloadsBetweenPackages.wxs' Size='*' />", payloadElements[0].GetTestXml(ignoreAttributesByElementName));
-                Assert.Equal("<WixPayloadProperties Package='credwiz.exe' Payload='credwiz.exe' Container='WixAttachedContainer' Name='credwiz.exe' Size='*' />", payloadElements[1].GetTestXml(ignoreAttributesByElementName));
-                Assert.Equal("<WixPayloadProperties Package='cscript.exe' Payload='SourceFilePayload' Container='WixAttachedContainer' Name='SharedPayloadsBetweenPackages.wxs' Size='*' />", payloadElements[2].GetTestXml(ignoreAttributesByElementName));
-                Assert.Equal("<WixPayloadProperties Package='cscript.exe' Payload='cscript.exe' Container='WixAttachedContainer' Name='cscript.exe' Size='*' />", payloadElements[3].GetTestXml(ignoreAttributesByElementName));
-            }
-        }
-
-        [Fact]
-        public void PopulatesBEManifestWithBundleExtensionBundleCustomData()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var bundlePath = Path.Combine(baseFolder, @"bin\test.exe");
-                var baFolderPath = Path.Combine(baseFolder, "ba");
-                var extractFolderPath = Path.Combine(baseFolder, "extract");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "BundleCustomTable", "BundleCustomTable.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "MinimalPackageGroup.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundlePath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(bundlePath));
-
-                var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
-                extractResult.AssertSuccess();
-
-                var customElements = extractResult.SelectBundleExtensionDataNodes("/be:BundleExtensionData/be:BundleExtension[@Id='CustomTableExtension']/be:BundleCustomTableBE");
-                Assert.Equal(3, customElements.Count);
-                Assert.Equal("<BundleCustomTableBE Id='one' Column2='two' />", customElements[0].GetTestXml());
-                Assert.Equal("<BundleCustomTableBE Id='&gt;' Column2='&lt;' />", customElements[1].GetTestXml());
-                Assert.Equal("<BundleCustomTableBE Id='1' Column2='2' />", customElements[2].GetTestXml());
-            }
-        }
-
-        [Fact]
-        public void PopulatesManifestWithBundleExtension()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var bundlePath = Path.Combine(baseFolder, @"bin\test.exe");
-                var baFolderPath = Path.Combine(baseFolder, "ba");
-                var extractFolderPath = Path.Combine(baseFolder, "extract");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "BundleExtension", "BundleExtension.wxs"),
-                    Path.Combine(folder, "BundleExtension", "SimpleBundleExtension.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "MinimalPackageGroup.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundlePath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(bundlePath));
-
-                var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
-                extractResult.AssertSuccess();
-
-                var bundleExtensions = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:BundleExtension");
-                Assert.Equal(1, bundleExtensions.Count);
-                Assert.Equal("<BundleExtension Id='ExampleBext' EntryPayloadId='ExampleBext' />", bundleExtensions[0].GetTestXml());
-
-                var bundleExtensionPayloads = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:UX/burn:Payload[@Id='ExampleBext']");
-                Assert.Equal(1, bundleExtensionPayloads.Count);
-                var ignored = new Dictionary<string, List<string>>
-                {
-                    { "Payload", new List<string> { "FileSize", "Hash", "SourcePath" } },
-                };
-                Assert.Equal("<Payload Id='ExampleBext' FilePath='fakebext.dll' FileSize='*' Hash='*' Packaging='embedded' SourcePath='*' />", bundleExtensionPayloads[0].GetTestXml(ignored));
-            }
-        }
-
-        [Fact]
-        public void PopulatesManifestWithBundleExtensionSearches()
-        {
-            var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath);
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var bundlePath = Path.Combine(baseFolder, @"bin\test.exe");
-                var baFolderPath = Path.Combine(baseFolder, "ba");
-                var extractFolderPath = Path.Combine(baseFolder, "extract");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "BundleExtension", "BundleExtensionSearches.wxs"),
-                    Path.Combine(folder, "BundleExtension", "BundleWithSearches.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "MinimalPackageGroup.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-ext", extensionPath,
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundlePath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(bundlePath));
-
-                var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
-                extractResult.AssertSuccess();
-
-                var bundleExtensions = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:BundleExtension");
-                Assert.Equal(1, bundleExtensions.Count);
-                Assert.Equal("<BundleExtension Id='ExampleBundleExtension' EntryPayloadId='ExampleBundleExtension' />", bundleExtensions[0].GetTestXml());
-
-                var extensionSearches = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:ExtensionSearch");
-                Assert.Equal(2, extensionSearches.Count);
-                Assert.Equal("<ExtensionSearch Id='ExampleSearchBar' Variable='SearchBar' Condition='WixBundleInstalled' ExtensionId='ExampleBundleExtension' />", extensionSearches[0].GetTestXml());
-                Assert.Equal("<ExtensionSearch Id='ExampleSearchFoo' Variable='SearchFoo' ExtensionId='ExampleBundleExtension' />", extensionSearches[1].GetTestXml());
-
-                var bundleExtensionDatas = extractResult.SelectBundleExtensionDataNodes("/be:BundleExtensionData/be:BundleExtension[@Id='ExampleBundleExtension']");
-                Assert.Equal(1, bundleExtensionDatas.Count);
-                Assert.Equal("<BundleExtension Id='ExampleBundleExtension'>" +
-                    "<ExampleSearch Id='ExampleSearchBar' SearchFor='Bar' />" +
-                    "<ExampleSearch Id='ExampleSearchFoo' SearchFor='Foo' />" +
-                    "</BundleExtension>", bundleExtensionDatas[0].GetTestXml());
-
-                var exampleSearches = extractResult.SelectBundleExtensionDataNodes("/be:BundleExtensionData/be:BundleExtension[@Id='ExampleBundleExtension']/be:ExampleSearch");
-                Assert.Equal(2, exampleSearches.Count);
-            }
-        }
-
-        [Fact]
-        public void PopulatesManifestWithExePackages()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var bundlePath = Path.Combine(baseFolder, @"bin\test.exe");
-                var baFolderPath = Path.Combine(baseFolder, "ba");
-                var extractFolderPath = Path.Combine(baseFolder, "extract");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "SharedPayloadsBetweenPackages", "SharedPayloadsBetweenPackages.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, ".Data"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundlePath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(bundlePath));
-
-                var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
-                extractResult.AssertSuccess();
-
-                var exePackageElements = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Chain/burn:ExePackage");
-                var ignoreAttributesByElementName = new Dictionary<string, List<string>>
-                {
-                    { "ExePackage", new List<string> { "CacheId", "InstallSize", "Size" } },
-                };
-                Assert.Equal(2, exePackageElements.Count);
-                Assert.Equal("<ExePackage Id='credwiz.exe' Cache='keep' CacheId='*' InstallSize='*' Size='*' PerMachine='yes' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' LogPathVariable='WixBundleLog_credwiz.exe' RollbackLogPathVariable='WixBundleRollbackLog_credwiz.exe' DetectCondition='none' InstallArguments='' UninstallArguments='' RepairArguments='' Repairable='no'><PayloadRef Id='credwiz.exe' /><PayloadRef Id='SourceFilePayload' /></ExePackage>", exePackageElements[0].GetTestXml(ignoreAttributesByElementName));
-                Assert.Equal("<ExePackage Id='cscript.exe' Cache='keep' CacheId='*' InstallSize='*' Size='*' PerMachine='yes' Permanent='yes' Vital='yes' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_cscript.exe' RollbackLogPathVariable='WixBundleRollbackLog_cscript.exe' DetectCondition='none' InstallArguments='' UninstallArguments='' RepairArguments='' Repairable='no'><PayloadRef Id='cscript.exe' /><PayloadRef Id='SourceFilePayload' /></ExePackage>", exePackageElements[1].GetTestXml(ignoreAttributesByElementName));
-            }
-        }
-
-        [Fact]
-        public void PopulatesManifestWithSetVariables()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var bundlePath = Path.Combine(baseFolder, @"bin\test.exe");
-                var baFolderPath = Path.Combine(baseFolder, "ba");
-                var extractFolderPath = Path.Combine(baseFolder, "extract");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "SetVariable", "Simple.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "MinimalPackageGroup.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundlePath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(bundlePath));
-
-                var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
-                extractResult.AssertSuccess();
-
-                var setVariables = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:SetVariable");
-                Assert.Equal(6, setVariables.Count);
-                Assert.Equal("<SetVariable Id='SetCoercedNumber' Variable='CoercedNumber' Value='2' Type='numeric' />", setVariables[0].GetTestXml());
-                Assert.Equal("<SetVariable Id='SetCoercedString' Variable='CoercedString' Value='Bar' Type='string' />", setVariables[1].GetTestXml());
-                Assert.Equal("<SetVariable Id='SetCoercedVersion' Variable='CoercedVersion' Value='v2.0' Type='version' />", setVariables[2].GetTestXml());
-                Assert.Equal("<SetVariable Id='SetNeedsFormatting' Variable='NeedsFormatting' Value='[One] [Two] [Three]' Type='string' />", setVariables[3].GetTestXml());
-                Assert.Equal("<SetVariable Id='SetVersionString' Variable='VersionString' Value='v1.0' Type='string' />", setVariables[4].GetTestXml());
-                Assert.Equal("<SetVariable Id='SetUnset' Variable='Unset' Condition='VersionString = v2.0' />", setVariables[5].GetTestXml());
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/CabFixture.cs b/src/test/WixToolsetTest.CoreIntegration/CabFixture.cs
deleted file mode 100644
index ad62dea6..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/CabFixture.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System;
-    using System.IO;
-    using System.Linq;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using Xunit;
-
-    public class CabFixture
-    {
-        [Fact]
-        public void CabinetFilesSequencedCorrectly()
-        {
-            var folder = TestData.Get(@"TestData\MultiFileCompressed");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-                var cabPath = Path.Combine(baseFolder, @"bin\cab1.cab");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-d", "MediaTemplateCompressionLevel",
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-                Assert.True(File.Exists(cabPath));
-
-                var fileTable = Query.QueryDatabase(msiPath, new[] { "File" });
-                var fileRows = fileTable.Select(r => new FileRow(r)).OrderBy(f => f.Sequence).ToList();
-
-                Assert.Equal(new[] { 1, 2 }, fileRows.Select(f => f.Sequence).ToArray());
-                Assert.Equal(new[] { "Notepad.exe", "test.txt" }, fileRows.Select(f => f.Name).ToArray());
-
-                var files = Query.GetCabinetFiles(cabPath);
-                Assert.Equal(fileRows.Select(f => f.Id).ToArray(), files.Select(f => f.Name).ToArray());
-            }
-        }
-
-        [Fact(Skip = "Sequence number of file from merge module is 0 but should be 1.")]
-        public void CabinetFilesSequencedCorrectlyUsingMergeModule()
-        {
-            var folder = TestData.Get(@"TestData\SimpleMerge");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-                var cabPath = Path.Combine(baseFolder, @"bin\cab1.cab");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, ".data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-                Assert.True(File.Exists(cabPath));
-
-                var fileTable = Query.QueryDatabase(msiPath, new[] { "File" });
-                var fileRows = fileTable.Select(r => new FileRow(r)).OrderBy(f => f.Sequence).ToList();
-
-                Assert.Equal(new[] { 1 }, fileRows.Select(f => f.Sequence).ToArray());
-                Assert.Equal(new[] { "test.txt" }, fileRows.Select(f => f.Name).ToArray());
-
-                var files = Query.GetCabinetFiles(cabPath);
-                Assert.Equal(fileRows.Select(f => f.Id).ToArray(), files.Select(f => f.Name).ToArray());
-            }
-        }
-
-        private class FileRow
-        {
-            public FileRow(string row)
-            {
-                row = row.Substring("File:".Length);
-
-                var split = row.Split('\t');
-                this.Id = split[0];
-                this.Name = split[2];
-                this.Sequence = Convert.ToInt32(split[7]);
-            }
-
-            public string Id { get; set; }
-
-            public string Name { get; set; }
-
-            public int Sequence { get; set; }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/ComponentFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ComponentFixture.cs
deleted file mode 100644
index d24ba08c..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/ComponentFixture.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System;
-    using System.IO;
-    using System.Linq;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using WixToolset.Data;
-    using Xunit;
-
-    public class ComponentFixture
-    {
-        [Fact]
-        public void CanDetectDuplicateComponentGuids()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Component", "GuidCollision.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                var errors = result.Messages.Where(m => m.Level == MessageLevel.Error);
-                Array.Equals(new[]
-                {
-                    369,
-                    369
-                }, errors.Select(e => e.Id).ToArray());
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs
deleted file mode 100644
index dd381dfe..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs
+++ /dev/null
@@ -1,385 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Xml;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core;
-    using WixToolset.Core.Burn;
-    using WixToolset.Core.TestPackage;
-    using Xunit;
-
-    public class ContainerFixture
-    {
-        [Fact(Skip = "Test demonstrates failure")]
-        public void CanBuildWithCustomAttachedContainer()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var binFolder = Path.Combine(baseFolder, "bin");
-                var bundlePath = Path.Combine(binFolder, "test.exe");
-                var baFolderPath = Path.Combine(baseFolder, "ba");
-                var extractFolderPath = Path.Combine(baseFolder, "extract");
-
-                this.BuildMsis(folder, intermediateFolder, binFolder, buildToSubfolder: true);
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Container", "HarvestIntoAttachedContainer.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", binFolder,
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundlePath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(bundlePath));
-
-                var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
-                extractResult.AssertSuccess();
-
-                var payloads = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Payload");
-                Assert.Equal(4, payloads.Count);
-                var ignoreAttributes = new Dictionary<string, List<string>> { { "Payload", new List<string> { "FileSize", "Hash" } } };
-                Assert.Equal(@"<Payload Id='FirstX64' FilePath='FirstX64\FirstX64.msi' FileSize='*' Hash='*' DownloadUrl='http://example.com//FirstX64/FirstX64/FirstX64.msi' Packaging='embedded' SourcePath='a0' Container='BundlePackages' />", payloads[0].GetTestXml(ignoreAttributes));
-                Assert.Equal(@"<Payload Id='FirstX86.msi' FilePath='FirstX86\FirstX86.msi' FileSize='*' Hash='*' DownloadUrl='http://example.com//FirstX86.msi/FirstX86/FirstX86.msi' Packaging='embedded' SourcePath='a1' Container='BundlePackages' />", payloads[1].GetTestXml(ignoreAttributes));
-                Assert.Equal(@"<Payload Id='fk1m38Cf9RZ2Bx_ipinRY6BftelU' FilePath='FirstX86\PFiles\MsiPackage\test.txt' FileSize='*' Hash='*' DownloadUrl='http://example.com/FirstX86/fk1m38Cf9RZ2Bx_ipinRY6BftelU/FirstX86/PFiles/MsiPackage/test.txt' Packaging='embedded' SourcePath='a2' Container='BundlePackages' />", payloads[2].GetTestXml(ignoreAttributes));
-                Assert.Equal(@"<Payload Id='ff2L_N_DLQ.nSUi.l8LxG14gd2V4' FilePath='FirstX64\PFiles\MsiPackage\test.txt' FileSize='*' Hash='*' DownloadUrl='http://example.com/FirstX64/ff2L_N_DLQ.nSUi.l8LxG14gd2V4/FirstX64/PFiles/MsiPackage/test.txt' Packaging='embedded' SourcePath='a3' Container='BundlePackages' />", payloads[3].GetTestXml(ignoreAttributes));
-            }
-        }
-
-        [Fact]
-        public void HarvestedPayloadsArePutInCorrectContainer()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var binFolder = Path.Combine(baseFolder, "bin");
-                var bundlePath = Path.Combine(binFolder, "test.exe");
-                var baFolderPath = Path.Combine(baseFolder, "ba");
-                var extractFolderPath = Path.Combine(baseFolder, "extract");
-
-                this.BuildMsis(folder, intermediateFolder, binFolder);
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Container", "HarvestIntoDetachedContainer.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", binFolder,
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundlePath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(bundlePath));
-
-                var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
-                extractResult.AssertSuccess();
-
-                var payloads = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Payload");
-                Assert.Equal(4, payloads.Count);
-                var ignoreAttributes = new Dictionary<string, List<string>> { { "Payload", new List<string> { "FileSize", "Hash" } } };
-                Assert.Equal(@"<Payload Id='FirstX86.msi' FilePath='FirstX86.msi' FileSize='*' Hash='*' Packaging='embedded' SourcePath='a0' Container='WixAttachedContainer' />", payloads[0].GetTestXml(ignoreAttributes));
-                Assert.Equal(@"<Payload Id='FirstX64.msi' FilePath='FirstX64.msi' FileSize='*' Hash='*' Packaging='embedded' SourcePath='a1' Container='FirstX64' />", payloads[1].GetTestXml(ignoreAttributes));
-                Assert.Equal(@"<Payload Id='fk1m38Cf9RZ2Bx_ipinRY6BftelU' FilePath='PFiles\MsiPackage\test.txt' FileSize='*' Hash='*' Packaging='embedded' SourcePath='a2' Container='WixAttachedContainer' />", payloads[2].GetTestXml(ignoreAttributes));
-                Assert.Equal(@"<Payload Id='fC0n41rZK8oW3JK8LzHu6AT3CjdQ' FilePath='PFiles\MsiPackage\test.txt' FileSize='*' Hash='*' Packaging='embedded' SourcePath='a3' Container='FirstX64' />", payloads[3].GetTestXml(ignoreAttributes));
-            }
-        }
-
-        [Fact]
-        public void HarvestedPayloadsArePutInCorrectPackage()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var binFolder = Path.Combine(baseFolder, "bin");
-                var bundlePath = Path.Combine(binFolder, "test.exe");
-                var baFolderPath = Path.Combine(baseFolder, "ba");
-                var extractFolderPath = Path.Combine(baseFolder, "extract");
-
-                this.BuildMsis(folder, intermediateFolder, binFolder);
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Container", "HarvestIntoDetachedContainer.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", binFolder,
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundlePath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(bundlePath));
-
-                var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
-                extractResult.AssertSuccess();
-
-                var ignoreAttributes = new Dictionary<string, List<string>>
-                {
-                    { "MsiPackage", new List<string> { "CacheId", "InstallSize", "Size", "ProductCode" } },
-                    { "Provides", new List<string> { "Key" } },
-                };
-                var msiPackages = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Chain/burn:MsiPackage")
-                                            .Cast<XmlElement>()
-                                            .Select(e => e.GetTestXml(ignoreAttributes))
-                                            .ToArray();
-                WixAssert.CompareLineByLine(new string[]
-                {
-                    "<MsiPackage Id='FirstX86.msi' Cache='keep' CacheId='*' InstallSize='*' Size='*' PerMachine='yes' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' LogPathVariable='WixBundleLog_FirstX86.msi' RollbackLogPathVariable='WixBundleRollbackLog_FirstX86.msi' ProductCode='*' Language='1033' Version='1.0.0.0' UpgradeCode='{12E4699F-E774-4D05-8A01-5BDD41BBA127}'>" +
-                      "<MsiProperty Id='ARPSYSTEMCOMPONENT' Value='1' />" +
-                      "<Provides Key='*' Version='1.0.0.0' DisplayName='MsiPackage' />" +
-                      "<RelatedPackage Id='{12E4699F-E774-4D05-8A01-5BDD41BBA127}' MaxVersion='1.0.0.0' MaxInclusive='no' OnlyDetect='no' LangInclusive='no'><Language Id='1033' /></RelatedPackage>" +
-                      "<RelatedPackage Id='{12E4699F-E774-4D05-8A01-5BDD41BBA127}' MinVersion='1.0.0.0' MinInclusive='no' OnlyDetect='yes' LangInclusive='no'><Language Id='1033' /></RelatedPackage>" +
-                      "<PayloadRef Id='FirstX86.msi' />" +
-                      "<PayloadRef Id='fk1m38Cf9RZ2Bx_ipinRY6BftelU' />" +
-                    "</MsiPackage>",
-                    "<MsiPackage Id='FirstX64.msi' Cache='keep' CacheId='*' InstallSize='*' Size='*' PerMachine='yes' Permanent='no' Vital='yes' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_FirstX64.msi' RollbackLogPathVariable='WixBundleRollbackLog_FirstX64.msi' ProductCode='*' Language='1033' Version='1.0.0.0' UpgradeCode='{12E4699F-E774-4D05-8A01-5BDD41BBA127}'>" +
-                      "<MsiProperty Id='ARPSYSTEMCOMPONENT' Value='1' />" +
-                      "<Provides Key='*' Version='1.0.0.0' DisplayName='MsiPackage' />" +
-                      "<RelatedPackage Id='{12E4699F-E774-4D05-8A01-5BDD41BBA127}' MaxVersion='1.0.0.0' MaxInclusive='no' OnlyDetect='no' LangInclusive='no'><Language Id='1033' /></RelatedPackage>" +
-                      "<RelatedPackage Id='{12E4699F-E774-4D05-8A01-5BDD41BBA127}' MinVersion='1.0.0.0' MinInclusive='no' OnlyDetect='yes' LangInclusive='no'><Language Id='1033' /></RelatedPackage>" +
-                      "<PayloadRef Id='FirstX64.msi' />" +
-                      "<PayloadRef Id='fC0n41rZK8oW3JK8LzHu6AT3CjdQ' />" +
-                    "</MsiPackage>",
-                }, msiPackages);
-            }
-        }
-
-        [Fact]
-        public void LayoutPayloadIsPutInContainer()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var binFolder = Path.Combine(baseFolder, "bin");
-                var bundlePath = Path.Combine(binFolder, "test.exe");
-                var baFolderPath = Path.Combine(baseFolder, "ba");
-                var extractFolderPath = Path.Combine(baseFolder, "extract");
-
-                this.BuildMsis(folder, intermediateFolder, binFolder);
-
-                var result = WixRunner.Execute(false, new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Container", "LayoutPayloadInContainer.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", binFolder,
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundlePath
-                });
-
-                WixAssert.CompareLineByLine(new string[]
-                {
-                    "The layout-only Payload 'SharedPayload' is being added to Container 'FirstX64'. It will not be extracted during layout.",
-                }, result.Messages.Select(m => m.ToString()).ToArray());
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(bundlePath));
-
-                var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
-                extractResult.AssertSuccess();
-
-                var ignoreAttributes = new Dictionary<string, List<string>> { { "Payload", new List<string> { "FileSize", "Hash" } } };
-                var payloads = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Payload[@Id='SharedPayload']")
-                                            .Cast<XmlElement>()
-                                            .Select(e => e.GetTestXml(ignoreAttributes))
-                                            .ToArray();
-                WixAssert.CompareLineByLine(new string[]
-                {
-                    "<Payload Id='SharedPayload' FilePath='LayoutPayloadInContainer.wxs' FileSize='*' Hash='*' LayoutOnly='yes' Packaging='embedded' SourcePath='a1' Container='FirstX64' />",
-                }, payloads);
-            }
-        }
-
-        [Fact]
-        public void MultipleAttachedContainersAreNotCurrentlySupported()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var binFolder = Path.Combine(baseFolder, "bin");
-                var bundlePath = Path.Combine(binFolder, "test.exe");
-                var baFolderPath = Path.Combine(baseFolder, "ba");
-                var extractFolderPath = Path.Combine(baseFolder, "extract");
-
-                this.BuildMsis(folder, intermediateFolder, binFolder);
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Container", "MultipleAttachedContainers.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", binFolder,
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundlePath
-                });
-
-                Assert.Equal((int)BurnBackendErrors.Ids.MultipleAttachedContainersUnsupported, result.ExitCode);
-            }
-        }
-
-        [Fact]
-        public void PayloadIsNotPutInMultipleContainers()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var binFolder = Path.Combine(baseFolder, "bin");
-                var bundlePath = Path.Combine(binFolder, "test.exe");
-                var baFolderPath = Path.Combine(baseFolder, "ba");
-                var extractFolderPath = Path.Combine(baseFolder, "extract");
-
-                this.BuildMsis(folder, intermediateFolder, binFolder);
-
-                var result = WixRunner.Execute(false, new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Container", "PayloadInMultipleContainers.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", binFolder,
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundlePath
-                });
-
-                WixAssert.CompareLineByLine(new string[]
-                {
-                    "The Payload 'SharedPayload' can't be added to Container 'FirstX64' because it was already added to Container 'FirstX86'.",
-                }, result.Messages.Select(m => m.ToString()).ToArray());
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(bundlePath));
-
-                var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
-                extractResult.AssertSuccess();
-
-                var ignoreAttributes = new Dictionary<string, List<string>> { { "Payload", new List<string> { "FileSize", "Hash" } } };
-                var payloads = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Payload[@Id='SharedPayload']")
-                                            .Cast<XmlElement>()
-                                            .Select(e => e.GetTestXml(ignoreAttributes))
-                                            .ToArray();
-                WixAssert.CompareLineByLine(new string[]
-                {
-                    "<Payload Id='SharedPayload' FilePath='PayloadInMultipleContainers.wxs' FileSize='*' Hash='*' Packaging='embedded' SourcePath='a2' Container='FirstX86' />",
-                }, payloads);
-            }
-        }
-
-        [Fact]
-        public void PopulatesBAManifestWithLayoutOnlyPayloads()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var binFolder = Path.Combine(baseFolder, "bin");
-                var bundlePath = Path.Combine(binFolder, "test.exe");
-                var baFolderPath = Path.Combine(baseFolder, "ba");
-                var extractFolderPath = Path.Combine(baseFolder, "extract");
-
-                this.BuildMsis(folder, intermediateFolder, binFolder);
-
-                var result = WixRunner.Execute(false, new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Container", "LayoutPayloadInContainer.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", binFolder,
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundlePath
-                });
-
-                WixAssert.CompareLineByLine(new string[]
-                {
-                    "The layout-only Payload 'SharedPayload' is being added to Container 'FirstX64'. It will not be extracted during layout.",
-                }, result.Messages.Select(m => m.ToString()).ToArray());
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(bundlePath));
-
-                var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
-                extractResult.AssertSuccess();
-
-                var ignoreAttributesByElementName = new Dictionary<string, List<string>>
-                {
-                    { "WixPayloadProperties", new List<string> { "Size" } },
-                };
-                var payloads = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixPayloadProperties")
-                                            .Cast<XmlElement>()
-                                            .Select(e => e.GetTestXml(ignoreAttributesByElementName))
-                                            .ToArray();
-                WixAssert.CompareLineByLine(new string[]
-                {
-                    "<WixPayloadProperties Package='FirstX64.msi' Payload='FirstX64.msi' Container='FirstX64' Name='FirstX64.msi' Size='*' />",
-                    "<WixPayloadProperties Package='FirstX64.msi' Payload='SharedPayload' Container='FirstX64' Name='LayoutPayloadInContainer.wxs' Size='*' />",
-                    "<WixPayloadProperties Package='FirstX64.msi' Payload='fC0n41rZK8oW3JK8LzHu6AT3CjdQ' Container='FirstX64' Name='PFiles\\MsiPackage\\test.txt' Size='*' />",
-                    "<WixPayloadProperties Payload='SharedPayload' Container='FirstX64' Name='LayoutPayloadInContainer.wxs' Size='*' />",
-                }, payloads);
-            }
-        }
-
-        private void BuildMsis(string folder, string intermediateFolder, string binFolder, bool buildToSubfolder = false)
-        {
-            var result = WixRunner.Execute(new[]
-            {
-                "build",
-                Path.Combine(folder, "MsiTransaction", "FirstX86.wxs"),
-                Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                "-intermediateFolder", intermediateFolder,
-                "-o", Path.Combine(binFolder, buildToSubfolder ? "FirstX86" : ".", "FirstX86.msi"),
-            });
-
-            result.AssertSuccess();
-
-            result = WixRunner.Execute(new[]
-            {
-                "build",
-                Path.Combine(folder, "MsiTransaction", "FirstX64.wxs"),
-                Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                "-intermediateFolder", intermediateFolder,
-                "-o", Path.Combine(binFolder, buildToSubfolder ? "FirstX64" : ".", "FirstX64.msi"),
-            });
-
-            result.AssertSuccess();
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/CopyFileFixture.cs b/src/test/WixToolsetTest.CoreIntegration/CopyFileFixture.cs
deleted file mode 100644
index c6fa602b..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/CopyFileFixture.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System.IO;
-    using System.Linq;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using WixToolset.Data;
-    using WixToolset.Data.Symbols;
-    using Xunit;
-
-    public class CopyFileFixture
-    {
-        [Fact]
-        public void CanBuildCopyFile()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "CopyFile", "CopyFile.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-                var copyFileSymbol = section.Symbols.OfType<MoveFileSymbol>().Single();
-                Assert.Equal("MoveText", copyFileSymbol.Id.Id);
-                Assert.True(copyFileSymbol.Delete);
-                Assert.Equal("OtherFolder", copyFileSymbol.DestFolder);
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/CustomActionFixture.cs b/src/test/WixToolsetTest.CoreIntegration/CustomActionFixture.cs
deleted file mode 100644
index 636b86a6..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/CustomActionFixture.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System.IO;
-    using System.Linq;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using Xunit;
-
-    public class CustomActionFixture
-    {
-        [Fact]
-        public void CanDetectCustomActionCycle()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                    {
-                    "build",
-                    Path.Combine(folder, "CustomAction", "CustomActionCycle.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                Assert.Equal(176, result.ExitCode);
-                Assert.Equal("The InstallExecuteSequence table contains an action 'Action1' that is scheduled to come before or after action 'Action3', which is also scheduled to come before or after action 'Action1'.  Please remove this circular dependency by changing the Before or After attribute for one of the actions.", result.Messages[0].ToString());
-            }
-        }
-
-        [Fact]
-        public void CanDetectCustomActionCycleWithTail()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "CustomAction", "CustomActionCycleWithTail.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                Assert.Equal(176, result.ExitCode);
-                Assert.Equal("The InstallExecuteSequence table contains an action 'Action2' that is scheduled to come before or after action 'Action4', which is also scheduled to come before or after action 'Action2'.  Please remove this circular dependency by changing the Before or After attribute for one of the actions.", result.Messages[0].ToString());
-            }
-        }
-
-        [Fact]
-        public void PopulatesCustomActionTable()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "CustomAction", "UnscheduledCustomAction.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] {
-                    "ActionText",
-                    "AdminExecuteSequence",
-                    "AdminUISequence",
-                    "AdvtExecuteSequence",
-                    "Binary",
-                    "CustomAction",
-                    "InstallExecuteSequence",
-                    "InstallUISequence",
-                    "Property",
-                }).Where(x => !x.StartsWith("Property:") || x.StartsWith("Property:MsiHiddenProperties\t")).ToArray();
-                Assert.Equal(new[]
-                {
-                    "ActionText:CustomAction2\tProgess2Text\t",
-                    "AdminExecuteSequence:CostFinalize\t\t1000",
-                    "AdminExecuteSequence:CostInitialize\t\t800",
-                    "AdminExecuteSequence:CustomAction2\t\t801",
-                    "AdminExecuteSequence:FileCost\t\t900",
-                    "AdminExecuteSequence:InstallAdminPackage\t\t3900",
-                    "AdminExecuteSequence:InstallFiles\t\t4000",
-                    "AdminExecuteSequence:InstallFinalize\t\t6600",
-                    "AdminExecuteSequence:InstallInitialize\t\t1500",
-                    "AdminExecuteSequence:InstallValidate\t\t1400",
-                    "AdminUISequence:CostFinalize\t\t1000",
-                    "AdminUISequence:CostInitialize\t\t800",
-                    "AdminUISequence:CustomAction2\t\t801",
-                    "AdminUISequence:ExecuteAction\t\t1300",
-                    "AdminUISequence:FileCost\t\t900",
-                    "AdvtExecuteSequence:CostFinalize\t\t1000",
-                    "AdvtExecuteSequence:CostInitialize\t\t800",
-                    "AdvtExecuteSequence:CustomAction2\t\t801",
-                    "AdvtExecuteSequence:InstallFinalize\t\t6600",
-                    "AdvtExecuteSequence:InstallInitialize\t\t1500",
-                    "AdvtExecuteSequence:InstallValidate\t\t1400",
-                    "AdvtExecuteSequence:PublishFeatures\t\t6300",
-                    "AdvtExecuteSequence:PublishProduct\t\t6400",
-                    "Binary:Binary1\t[Binary data]",
-                    "CustomAction:CustomAction1\t1\tBinary1\tInvalidEntryPoint\t",
-                    "CustomAction:CustomAction2\t51\tTestAdvtExecuteSequenceProperty\t1\t",
-                    "CustomAction:CustomActionWithHiddenTarget\t9217\tBinary1\tInvalidEntryPoint\t",
-                    "CustomAction:DiscardOptimismAllBeingsWhoProceed\t19\t\tAbandon hope all ye who enter here.\t",
-                    "InstallExecuteSequence:CostFinalize\t\t1000",
-                    "InstallExecuteSequence:CostInitialize\t\t800",
-                    "InstallExecuteSequence:CreateFolders\t\t3700",
-                    "InstallExecuteSequence:CustomAction2\t\t801",
-                    "InstallExecuteSequence:FileCost\t\t900",
-                    "InstallExecuteSequence:FindRelatedProducts\t\t25",
-                    "InstallExecuteSequence:InstallFiles\t\t4000",
-                    "InstallExecuteSequence:InstallFinalize\t\t6600",
-                    "InstallExecuteSequence:InstallInitialize\t\t1500",
-                    "InstallExecuteSequence:InstallValidate\t\t1400",
-                    "InstallExecuteSequence:LaunchConditions\t\t100",
-                    "InstallExecuteSequence:MigrateFeatureStates\t\t1200",
-                    "InstallExecuteSequence:ProcessComponents\t\t1600",
-                    "InstallExecuteSequence:PublishFeatures\t\t6300",
-                    "InstallExecuteSequence:PublishProduct\t\t6400",
-                    "InstallExecuteSequence:RegisterProduct\t\t6100",
-                    "InstallExecuteSequence:RegisterUser\t\t6000",
-                    "InstallExecuteSequence:RemoveExistingProducts\t\t1401",
-                    "InstallExecuteSequence:RemoveFiles\t\t3500",
-                    "InstallExecuteSequence:RemoveFolders\t\t3600",
-                    "InstallExecuteSequence:UnpublishFeatures\t\t1800",
-                    "InstallExecuteSequence:ValidateProductID\t\t700",
-                    "InstallUISequence:CostFinalize\t\t1000",
-                    "InstallUISequence:CostInitialize\t\t800",
-                    "InstallUISequence:CustomAction2\t\t801",
-                    "InstallUISequence:ExecuteAction\t\t1300",
-                    "InstallUISequence:FileCost\t\t900",
-                    "InstallUISequence:FindRelatedProducts\t\t25",
-                    "InstallUISequence:LaunchConditions\t\t100",
-                    "InstallUISequence:MigrateFeatureStates\t\t1200",
-                    "InstallUISequence:ValidateProductID\t\t700",
-                    "Property:MsiHiddenProperties\tCustomActionWithHiddenTarget",
-                }, results);
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs b/src/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs
deleted file mode 100644
index ee93b03a..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs
+++ /dev/null
@@ -1,234 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System.IO;
-    using System.Xml.Linq;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using Xunit;
-
-    public class CustomTableFixture
-    {
-        [Fact]
-        public void PopulatesCustomTable1()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "CustomTable", "CustomTable.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "CustomTable1" });
-                Assert.Equal(new[]
-                {
-                    "CustomTable1:Row1\ttest.txt",
-                    "CustomTable1:Row2\ttest.txt",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesCustomTableWithLocalization()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "CustomTable", "LocalizedCustomTable.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-loc", Path.Combine(folder, "CustomTable", "LocalizedCustomTable.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "CustomTableLocalized" });
-                Assert.Equal(new[]
-                {
-                    "CustomTableLocalized:Row1\tThis is row one",
-                    "CustomTableLocalized:Row2\tThis is row two",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesCustomTableWithFilePath()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "CustomTable", "CustomTableWithFile.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "CustomTable", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "CustomTableWithFile" });
-                Assert.Equal(new[]
-                {
-                    "CustomTableWithFile:Row1\t[Binary data]",
-                    "CustomTableWithFile:Row2\t[Binary data]",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesCustomTableWithFilePathSerialized()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var wixlibPath = Path.Combine(baseFolder, @"bin\test.wixlib");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "CustomTable", "CustomTableWithFile.wxs"),
-                    "-bindpath", Path.Combine(folder, "CustomTable", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", wixlibPath
-                });
-
-                result.AssertSuccess();
-
-                result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-lib", wixlibPath,
-                    "-bindpath", Path.Combine(folder, "CustomTable", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "CustomTableWithFile" });
-                Assert.Equal(new[]
-                {
-                    "CustomTableWithFile:Row1\t[Binary data]",
-                    "CustomTableWithFile:Row2\t[Binary data]",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void UnrealCustomTableIsNotPresentInMsi()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "CustomTable", "CustomTable.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "CustomTable2" });
-                Assert.Empty(results);
-            }
-        }
-
-        [Fact]
-        public void CanCompileAndDecompile()
-        {
-            var folder = TestData.Get(@"TestData");
-            var expectedFile = Path.Combine(folder, "CustomTable", "CustomTable-Expected.wxs");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-                var decompiledWxsPath = Path.Combine(baseFolder, @"decompiled.wxs");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    "-d", "ProductCode=83f9c623-26fe-42ab-951e-170022117f54",
-                    Path.Combine(folder, "CustomTable", "CustomTable.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-                Assert.True(File.Exists(msiPath));
-
-                result = WixRunner.Execute(new[]
-                {
-                    "decompile", msiPath,
-                    "-sw1060",
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", decompiledWxsPath
-                });
-
-                result.AssertSuccess();
-
-                WixAssert.CompareXml(expectedFile, decompiledWxsPath);
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs b/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
deleted file mode 100644
index ab04da15..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System.IO;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using Xunit;
-
-    public class DecompileFixture
-    {
-        private static void DecompileAndCompare(string sourceFolder, string msiName, string expectedWxsName)
-        {
-            var folder = TestData.Get(sourceFolder);
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var intermediateFolder = fs.GetFolder();
-                var outputPath = Path.Combine(intermediateFolder, @"Actual.wxs");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "decompile",
-                    Path.Combine(folder, msiName),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", outputPath
-                });
-
-                result.AssertSuccess();
-
-                WixAssert.CompareXml(Path.Combine(folder, expectedWxsName), outputPath);
-            }
-        }
-
-        [Fact]
-        public void CanDecompileSingleFileCompressed()
-        {
-            DecompileAndCompare(@"TestData\DecompileSingleFileCompressed", "example.msi", "Expected.wxs");
-        }
-
-        [Fact]
-        public void CanDecompile64BitSingleFileCompressed()
-        {
-            DecompileAndCompare(@"TestData\DecompileSingleFileCompressed64", "example.msi", "Expected.wxs");
-        }
-
-        [Fact]
-        public void CanDecompileNestedDirSearchUnderRegSearch()
-        {
-            DecompileAndCompare(@"TestData\AppSearch", "NestedDirSearchUnderRegSearch.msi", "DecompiledNestedDirSearchUnderRegSearch.wxs");
-        }
-
-        [Fact]
-        public void CanDecompileOldClassTableDefinition()
-        {
-            // The input MSI was not created using standard methods, it is an example of a real world database that needs to be decompiled.
-            // The Class/@Feature_ column has length of 32, the File/@Attributes has length of 2,
-            // and numerous foreign key relationships are missing.
-            DecompileAndCompare(@"TestData\Class", "OldClassTableDef.msi", "DecompiledOldClassTableDef.wxs");
-        }
-
-        [Fact]
-        public void CanDecompileSequenceTables()
-        {
-            DecompileAndCompare(@"TestData\SequenceTables", "SequenceTables.msi", "DecompiledSequenceTables.wxs");
-        }
-
-        [Fact]
-        public void CanDecompileShortcuts()
-        {
-            DecompileAndCompare(@"TestData\Shortcut", "shortcuts.msi", "DecompiledShortcuts.wxs");
-        }
-
-        [Fact]
-        public void CanDecompileNullComponent()
-        {
-            DecompileAndCompare(@"TestData\DecompileNullComponent", "example.msi", "Expected.wxs");
-        }
-
-        [Fact]
-        public void CanDecompileMergeModuleWithTargetDirComponent()
-        {
-            DecompileAndCompare(@"TestData\DecompileTargetDirMergeModule", "MergeModule1.msm", "Expected.wxs");
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/DependencyExtensionFixture.cs b/src/test/WixToolsetTest.CoreIntegration/DependencyExtensionFixture.cs
deleted file mode 100644
index 840b411e..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/DependencyExtensionFixture.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Xml;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using Xunit;
-
-    public class DependencyExtensionFixture
-    {
-        [Fact]
-        public void CanBuildBundleUsingExePackageWithProvides()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var binFolder = Path.Combine(baseFolder, "bin");
-                var bundlePath = Path.Combine(binFolder, "test.exe");
-                var baFolderPath = Path.Combine(baseFolder, "ba");
-                var extractFolderPath = Path.Combine(baseFolder, "extract");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Dependency", "ExePackageProvidesBundle.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, ".Data"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundlePath,
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(bundlePath));
-
-                var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
-                extractResult.AssertSuccess();
-
-                var provides = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Chain/burn:ExePackage/burn:Provides")
-                                            .Cast<XmlElement>()
-                                            .Select(e => e.GetTestXml())
-                                            .ToArray();
-                WixAssert.CompareLineByLine(new string[]
-                {
-                    "<Provides Key='DependencyTests_ExeA,v1.0' Version='1.0.0.0' DisplayName='Windows Installer XML Toolset' />",
-                }, provides);
-            }
-        }
-
-        [Fact]
-        public void CanBuildBundleUsingMsiWithProvides()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var binFolder = Path.Combine(baseFolder, "bin");
-                var bundlePath = Path.Combine(binFolder, "test.exe");
-                var baFolderPath = Path.Combine(baseFolder, "ba");
-                var extractFolderPath = Path.Combine(baseFolder, "extract");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "UsingProvides", "Package.wxs"),
-                    Path.Combine(folder, "UsingProvides", "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "UsingProvides", "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "UsingProvides"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(binFolder, "UsingProvides.msi"),
-                });
-
-                result.AssertSuccess();
-
-                result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Dependency", "UsingProvidesBundle.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", binFolder,
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundlePath,
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(bundlePath));
-
-                var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
-                extractResult.AssertSuccess();
-
-                var provides = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Chain/burn:MsiPackage/burn:Provides")
-                                            .Cast<XmlElement>()
-                                            .Select(e => e.GetTestXml())
-                                            .ToArray();
-                WixAssert.CompareLineByLine(new string[]
-                {
-                    "<Provides Key='UsingProvides' Version='1.0.0.0' DisplayName='MsiPackage' Imported='yes' />",
-                    "<Provides Key='{A81D50F9-B696-4F3D-ABE0-E64D61590E5F}' Version='1.0.0.0' DisplayName='MsiPackage' />",
-                }, provides);
-            }
-        }
-
-        [Fact]
-        public void CanBuildBundleWithCustomProviderKey()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var binFolder = Path.Combine(baseFolder, "bin");
-                var bundlePath = Path.Combine(binFolder, "test.exe");
-                var baFolderPath = Path.Combine(baseFolder, "ba");
-                var extractFolderPath = Path.Combine(baseFolder, "extract");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Dependency", "CustomProviderKeyBundle.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "MinimalPackageGroup.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundlePath,
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(bundlePath));
-
-                var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
-                extractResult.AssertSuccess();
-
-                var ignoreAttributesByElementName = new Dictionary<string, List<string>>
-                {
-                    { "Registration", new List<string> { "Id" } },
-                };
-                var registration = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Registration")
-                                                .Cast<XmlElement>()
-                                                .Select(e => e.GetTestXml(ignoreAttributesByElementName))
-                                                .ToArray();
-                WixAssert.CompareLineByLine(new string[]
-                {
-                    "<Registration Id='*' ExecutableName='test.exe' PerMachine='yes' Tag='' Version='1.0.0.0' ProviderKey='MyProviderKey,v1.0'><Arp Register='yes' DisplayName='BurnBundle' DisplayVersion='1.0.0.0' Publisher='Example Corporation' /></Registration>",
-                }, registration);
-            }
-        }
-
-        [Fact]
-        public void CanBuildPackageUsingProvides()
-        {
-            var folder = TestData.Get(@"TestData\UsingProvides");
-            var build = new Builder(folder, null, new[] { folder });
-
-            var results = build.BuildAndQuery(Build, "WixDependencyProvider");
-            Assert.Equal(new[]
-            {
-                "WixDependencyProvider:dep74OfIcniaqxA7EprRGBw4Oyy3r8\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tUsingProvides\t\t\t",
-            }, results);
-        }
-
-        private static void Build(string[] args)
-        {
-            var result = WixRunner.Execute(args)
-                                  .AssertSuccess();
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs
deleted file mode 100644
index a61bdff3..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs
+++ /dev/null
@@ -1,271 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System;
-    using System.IO;
-    using System.Linq;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using WixToolset.Data;
-    using WixToolset.Data.WindowsInstaller;
-    using Xunit;
-
-    public class DirectoryFixture
-    {
-        [Fact]
-        public void CanGet32bitProgramFiles6432Folder()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Directory", "Empty.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                var dirSymbols = section.Symbols.OfType<WixToolset.Data.Symbols.DirectorySymbol>().ToList();
-                Assert.Equal(new[]
-                {
-                    "INSTALLFOLDER:ProgramFiles6432Folder:MsiPackage",
-                    "ProgramFiles6432Folder:ProgramFilesFolder:.",
-                    "ProgramFilesFolder:TARGETDIR:PFiles",
-                    "TARGETDIR::SourceDir"
-                }, dirSymbols.OrderBy(d => d.Id.Id).Select(d => d.Id.Id + ":" + d.ParentDirectoryRef + ":" + d.Name).ToArray());
-            }
-        }
-
-        [Fact]
-        public void CanGet64bitProgramFiles6432Folder()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    "-arch", "x64",
-                    Path.Combine(folder, "Directory", "Empty.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                var dirSymbols = section.Symbols.OfType<WixToolset.Data.Symbols.DirectorySymbol>().ToList();
-                Assert.Equal(new[]
-                {
-                    "INSTALLFOLDER:ProgramFiles6432Folder:MsiPackage",
-                    "ProgramFiles6432Folder:ProgramFiles64Folder:.",
-                    "ProgramFiles64Folder:TARGETDIR:PFiles64",
-                    "TARGETDIR::SourceDir"
-                }, dirSymbols.OrderBy(d => d.Id.Id).Select(d => d.Id.Id + ":" + d.ParentDirectoryRef + ":" + d.Name).ToArray());
-            }
-        }
-
-        [Fact]
-        public void CanGetDefaultName()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Directory", "DefaultName.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                var dirSymbols = section.Symbols.OfType<WixToolset.Data.Symbols.DirectorySymbol>().ToList();
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "BinFolder\tCompanyFolder\t.",
-                    "CompanyFolder\tProgramFilesFolder\tExample Corporation",
-                    "ProgramFilesFolder\tTARGETDIR\tPFiles",
-                    "TARGETDIR\t\tSourceDir"
-                }, dirSymbols.OrderBy(d => d.Id.Id).Select(d => String.Join('\t', d.Id.Id, d.ParentDirectoryRef, d.Name)).ToArray());
-
-                var data = WindowsInstallerData.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var directoryRows = data.Tables["Directory"].Rows;
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "BinFolder\tCompanyFolder\t.",
-                    "CompanyFolder\tProgramFilesFolder\tu7-b4gch|Example Corporation",
-                    "ProgramFilesFolder\tTARGETDIR\tPFiles",
-                    "TARGETDIR\t\tSourceDir"
-                }, directoryRows.Select(r => String.Join('\t', r.FieldAsString(0), r.FieldAsString(1), r.FieldAsString(2))).ToArray());
-            }
-        }
-
-        [Fact]
-        public void CanGetDuplicateDir()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    "-arch", "x64",
-                    Path.Combine(folder, "DuplicateDir", "DuplicateDir.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                var dirSymbols = section.Symbols.OfType<WixToolset.Data.Symbols.DirectorySymbol>().ToList();
-                Assert.Equal(new[]
-                {
-                    "dZsSsu81KcG46xXTwc4mTSZO5Zx4:INSTALLFOLDER:dupe",
-                    "INSTALLFOLDER:ProgramFiles6432Folder:MsiPackage",
-                    "ProgramFiles6432Folder:ProgramFiles64Folder:.",
-                    "ProgramFiles64Folder:TARGETDIR:PFiles64",
-                    "TARGETDIR::SourceDir"
-                }, dirSymbols.OrderBy(d => d.Id.Id).Select(d => d.Id.Id + ":" + d.ParentDirectoryRef + ":" + d.Name).ToArray());
-            }
-        }
-
-        [Fact]
-        public void CanGetWithMultiNestedSubdirectory()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    "-arch", "x64",
-                    Path.Combine(folder, "Directory", "Nested.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                var dirSymbols = section.Symbols.OfType<WixToolset.Data.Symbols.DirectorySymbol>().ToList();
-                Assert.Equal(new[]
-                {
-                    "BinFolder:ProgramFilesFolder:Example Corporation\\Test Product\\bin",
-                    "ProgramFilesFolder:TARGETDIR:PFiles",
-                    "TARGETDIR::SourceDir"
-                }, dirSymbols.OrderBy(d => d.Id.Id).Select(d => d.Id.Id + ":" + d.ParentDirectoryRef + ":" + d.Name).ToArray());
-
-                var data = WindowsInstallerData.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var directoryRows = data.Tables["Directory"].Rows;
-                Assert.Equal(new[]
-                {
-                    "d4EceYatXTyy8HXPt5B6DT9Rj.wE:ProgramFilesFolder:u7-b4gch|Example Corporation",
-                    "dSJ1pgiASlW7kJTu0wqsGBklJsS0:d4EceYatXTyy8HXPt5B6DT9Rj.wE:vjj-gxay|Test Product",
-                    "BinFolder:dSJ1pgiASlW7kJTu0wqsGBklJsS0:bin",
-                    "ProgramFilesFolder:TARGETDIR:PFiles",
-                    "TARGETDIR::SourceDir"
-                }, directoryRows.Select(r => r.FieldAsString(0) + ":" + r.FieldAsString(1) + ":" + r.FieldAsString(2)).ToArray());
-            }
-        }
-
-        [Fact]
-        public void CanGetDuplicateTargetSourceName()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    "-arch", "x64",
-                    Path.Combine(folder, "Directory", "DuplicateTargetSourceName.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                var dirSymbols = section.Symbols.OfType<WixToolset.Data.Symbols.DirectorySymbol>().ToList();
-                Assert.Equal(new[]
-                {
-                    "BinFolder\tProgramFilesFolder\tbin",
-                    "ProgramFilesFolder\tTARGETDIR\tPFiles",
-                    "TARGETDIR\t\tSourceDir"
-                }, dirSymbols.OrderBy(d => d.Id.Id).Select(d => String.Join('\t', d.Id.Id, d.ParentDirectoryRef, d.Name)).ToArray());
-
-                var data = WindowsInstallerData.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var directoryRows = data.Tables["Directory"].Rows;
-                Assert.Equal(new[]
-                {
-                    "BinFolder\tProgramFilesFolder\tbin",
-                    "ProgramFilesFolder\tTARGETDIR\tPFiles",
-                    "TARGETDIR\t\tSourceDir"
-                }, directoryRows.Select(r => String.Join('\t', r.FieldAsString(0), r.FieldAsString(1), r.FieldAsString(2))).ToArray());
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/ExePackageFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ExePackageFixture.cs
deleted file mode 100644
index e2306dcd..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/ExePackageFixture.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System.IO;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using Xunit;
-
-    public class ExePackageFixture
-    {
-        [Fact]
-        public void ErrorWhenMissingDetectCondition()
-        {
-            var folder = TestData.Get(@"TestData", "ExePackage");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "MissingDetectCondition.wxs"),
-                    "-o", Path.Combine(baseFolder, "test.wixlib")
-                });
-
-                Assert.Equal(1153, result.ExitCode);
-            }
-        }
-
-        [Fact]
-        public void ErrorWhenRequireDetectCondition()
-        {
-            var folder = TestData.Get(@"TestData", "ExePackage");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "RequireDetectCondition.wxs"),
-                    "-o", Path.Combine(baseFolder, "test.wixlib")
-                });
-
-                Assert.Equal(401, result.ExitCode);
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
deleted file mode 100644
index 089658e6..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System;
-    using System.IO;
-    using System.Linq;
-    using Example.Extension;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using WixToolset.Data;
-    using WixToolset.Data.Symbols;
-    using Xunit;
-
-    public class ExtensionFixture
-    {
-        [Fact]
-        public void CanBuildAndQuery()
-        {
-            var folder = TestData.Get(@"TestData\ExampleExtension");
-            var build = new Builder(folder, typeof(ExampleExtensionFactory), new[] { Path.Combine(folder, "data") });
-
-            var results = build.BuildAndQuery(Build, "Wix4Example");
-            Assert.Equal(new[]
-            {
-                "Wix4Example:Foo\tBar"
-            }, results);
-        }
-
-        [Fact]
-        public void CanBuildWithExampleExtension()
-        {
-            var folder = TestData.Get(@"TestData\ExampleExtension");
-            var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath);
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var intermediateFolder = fs.GetFolder();
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-ext", extensionPath,
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(intermediateFolder, @"bin\extest.msi")
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\extest.msi")));
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\extest.wixpdb")));
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\PFiles\MsiPackage\example.txt")));
-
-                var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\extest.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
-                Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
-                Assert.Equal(@"example.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
-
-                var example = section.Symbols.Where(t => t.Definition.Type == SymbolDefinitionType.MustBeFromAnExtension).Single();
-                Assert.Equal("Foo", example.Id?.Id);
-                Assert.Equal("Bar", example[0].AsString());
-            }
-        }
-
-        [Fact]
-        public void CanParseCommandLineWithExtension()
-        {
-            var folder = TestData.Get(@"TestData\ExampleExtension");
-            var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath);
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var intermediateFolder = fs.GetFolder();
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-ext", extensionPath,
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-example", "test",
-                    "-o", Path.Combine(intermediateFolder, @"bin\extest.msi")
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\extest.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                var property = section.Symbols.OfType<PropertySymbol>().Where(p => p.Id.Id == "ExampleProperty").Single();
-                Assert.Equal("ExampleProperty", property.Id.Id);
-                Assert.Equal("test", property.Value);
-            }
-        }
-
-        [Fact]
-        public void CannotBuildWithMissingExtension()
-        {
-            var folder = TestData.Get(@"TestData\ExampleExtension");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var intermediateFolder = fs.GetFolder();
-
-                var exception = Assert.Throws<WixException>(() =>
-                    WixRunner.Execute(new[]
-                    {
-                        "build",
-                        Path.Combine(folder, "Package.wxs"),
-                        "-ext", "ExampleExtension.DoesNotExist"
-                    }));
-
-                Assert.StartsWith("The extension 'ExampleExtension.DoesNotExist' could not be found. Checked paths: ", exception.Message);
-            }
-        }
-
-        [Fact]
-        public void CannotBuildWithMissingVersionedExtension()
-        {
-            var folder = TestData.Get(@"TestData\ExampleExtension");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var intermediateFolder = fs.GetFolder();
-
-                var exception = Assert.Throws<WixException>(() =>
-                    WixRunner.Execute(new[]
-                    {
-                        "build",
-                        Path.Combine(folder, "Package.wxs"),
-                        "-ext", "ExampleExtension.DoesNotExist/1.0.0"
-                    }));
-
-                Assert.StartsWith("The extension 'ExampleExtension.DoesNotExist/1.0.0' could not be found. Checked paths: ", exception.Message);
-            }
-        }
-
-        private static void Build(string[] args)
-        {
-            var result = WixRunner.Execute(args)
-                                  .AssertSuccess();
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/LanguageFixture.cs b/src/test/WixToolsetTest.CoreIntegration/LanguageFixture.cs
deleted file mode 100644
index db9708a7..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/LanguageFixture.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System.IO;
-    using System.Linq;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using WixToolset.Data;
-    using WixToolset.Data.Symbols;
-    using WixToolset.Data.WindowsInstaller;
-    using Xunit;
-
-    public class LanguageFixture
-    {
-        [Fact]
-        public void CanBuildWithDefaultProductLanguage()
-        {
-            var folder = TestData.Get(@"TestData", "Language");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    "-loc", Path.Combine(folder, "Package.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", Path.Combine(baseFolder, "obj"),
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                var directorySymbols = section.Symbols.OfType<DirectorySymbol>();
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "INSTALLFOLDER:Example Corporation\\MsiPackage",
-                    "ProgramFilesFolder:PFiles",
-                    "TARGETDIR:SourceDir"
-                }, directorySymbols.OrderBy(s => s.Id.Id).Select(s => s.Id.Id + ":" + s.Name).ToArray());
-
-                var propertySymbol = section.Symbols.OfType<PropertySymbol>().Single(p => p.Id.Id == "ProductLanguage");
-                Assert.Equal("0", propertySymbol.Value);
-
-                var summaryPlatform = section.Symbols.OfType<SummaryInformationSymbol>().Single(s => s.PropertyId == SummaryInformationType.PlatformAndLanguage);
-                Assert.Equal("Intel;0", summaryPlatform.Value);
-
-                var summaryCodepage = section.Symbols.OfType<SummaryInformationSymbol>().Single(s => s.PropertyId == SummaryInformationType.Codepage);
-                Assert.Equal("1252", summaryCodepage.Value);
-
-                var data = WindowsInstallerData.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var directoryRows = data.Tables["Directory"].Rows;
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "d4EceYatXTyy8HXPt5B6DT9Rj.wE:u7-b4gch|Example Corporation",
-                    "INSTALLFOLDER:oekcr5lq|MsiPackage",
-                    "ProgramFilesFolder:PFiles",
-                    "TARGETDIR:SourceDir"
-                }, directoryRows.Select(r => r.FieldAsString(0) + ":" + r.FieldAsString(2)).ToArray());
-            }
-        }
-
-        [Fact]
-        public void CanBuildEnuWxl()
-        {
-            var folder = TestData.Get(@"TestData", "Language");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", Path.Combine(baseFolder, "obj"),
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                var propertySymbol = section.Symbols.OfType<PropertySymbol>().Single(p => p.Id.Id == "ProductLanguage");
-                Assert.Equal("1033", propertySymbol.Value);
-
-                var summaryPlatform = section.Symbols.OfType<SummaryInformationSymbol>().Single(s => s.PropertyId == SummaryInformationType.PlatformAndLanguage);
-                Assert.Equal("Intel;1033", summaryPlatform.Value);
-
-                var summaryCodepage = section.Symbols.OfType<SummaryInformationSymbol>().Single(s => s.PropertyId == SummaryInformationType.Codepage);
-                Assert.Equal("1252", summaryCodepage.Value);
-            }
-        }
-
-        [Fact]
-        public void CanBuildJpnWxl()
-        {
-            var folder = TestData.Get(@"TestData", "Language");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    "-loc", Path.Combine(folder, "Package.ja-jp.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", Path.Combine(baseFolder, "obj"),
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                var propertySymbol = section.Symbols.OfType<PropertySymbol>().Single(p => p.Id.Id == "ProductLanguage");
-                Assert.Equal("1041", propertySymbol.Value);
-
-                var summaryPlatform = section.Symbols.OfType<SummaryInformationSymbol>().Single(s => s.PropertyId == SummaryInformationType.PlatformAndLanguage);
-                Assert.Equal("Intel;1041", summaryPlatform.Value);
-
-                var summaryCodepage = section.Symbols.OfType<SummaryInformationSymbol>().Single(s => s.PropertyId == SummaryInformationType.Codepage);
-                Assert.Equal("932", summaryCodepage.Value);
-            }
-        }
-
-        [Fact]
-        public void CanBuildJpnWxlWithEnuSummaryInfo()
-        {
-            var folder = TestData.Get(@"TestData", "Language");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    "-loc", Path.Combine(folder, "PackageWithEnSummaryInfo.ja-jp.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", Path.Combine(baseFolder, "obj"),
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                var propertySymbol = section.Symbols.OfType<PropertySymbol>().Single(p => p.Id.Id == "ProductLanguage");
-                Assert.Equal("1041", propertySymbol.Value);
-
-                var summaryPlatform = section.Symbols.OfType<SummaryInformationSymbol>().Single(s => s.PropertyId == SummaryInformationType.PlatformAndLanguage);
-                Assert.Equal("Intel;1041", summaryPlatform.Value);
-
-                var summaryCodepage = section.Symbols.OfType<SummaryInformationSymbol>().Single(s => s.PropertyId == SummaryInformationType.Codepage);
-                Assert.Equal("1252", summaryCodepage.Value);
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs b/src/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs
deleted file mode 100644
index cfe4d3f1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System;
-    using System.IO;
-    using System.Linq;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core;
-    using WixToolset.Core.TestPackage;
-    using WixToolset.Data;
-    using WixToolset.Data.Symbols;
-    using WixToolset.Extensibility.Data;
-    using WixToolset.Extensibility.Services;
-    using Xunit;
-
-    public class LinkerFixture
-    {
-        [Fact]
-        public void MustCompileBeforeLinking()
-        {
-            var intermediate1 = new Intermediate("TestIntermediate1", new[] { new IntermediateSection("test1", SectionType.Product) }, null);
-            var intermediate2 = new Intermediate("TestIntermediate2", new[] { new IntermediateSection("test2", SectionType.Fragment) }, null);
-            var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider();
-
-            var listener = new TestMessageListener();
-            var messaging = serviceProvider.GetService<IMessaging>();
-            messaging.SetListener(listener);
-
-            var creator = serviceProvider.GetService<ISymbolDefinitionCreator>();
-            var context = serviceProvider.GetService<ILinkContext>();
-            context.Extensions = Array.Empty<WixToolset.Extensibility.ILinkerExtension>();
-            context.ExtensionData = Array.Empty<WixToolset.Extensibility.IExtensionData>();
-            context.Intermediates = new[] { intermediate1, intermediate2 };
-            context.SymbolDefinitionCreator = creator;
-
-            var linker = serviceProvider.GetService<ILinker>();
-            linker.Link(context);
-
-            Assert.Equal((int)ErrorMessages.Ids.IntermediatesMustBeCompiled, messaging.LastErrorNumber);
-            Assert.Single(listener.Messages);
-            Assert.EndsWith("TestIntermediate1, TestIntermediate2", listener.Messages[0].ToString());
-        }
-
-        [Fact]
-        public void CanBuildWithOverridableActions()
-        {
-            var folder = TestData.Get(@"TestData\OverridableActions");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    "-sw1008", // this is expected for this test
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.msi")));
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb")));
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\PFiles\MsiPackage\test.txt")));
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                var actions = section.Symbols.OfType<WixActionSymbol>().Where(wat => wat.Action.StartsWith("Set")).ToList();
-                Assert.Equal(2, actions.Count);
-                //Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileSymbolFields.Source].AsPath().Path);
-                //Assert.Equal(@"test.txt", wixFile[WixFileSymbolFields.Source].PreviousValue.AsPath().Path);
-            }
-        }
-
-        [Fact]
-        public void MissingEntrySectionDetectedProduct()
-        {
-            var folder = TestData.Get(@"TestData\OverridableActions");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                try
-                {
-                    WixRunner.Execute(new[]
-                    {
-                        "build",
-                        Path.Combine(folder, "PackageComponents.wxs"),
-                        "-intermediateFolder", intermediateFolder,
-                        "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                    });
-                }
-                catch (WixException we)
-                {
-                    Assert.Equal("Could not find entry section in provided list of intermediates. Expected section of type 'Product'.", we.Message);
-                    return;
-                }
-
-                Assert.True(false, "Expected WixException for missing entry section but expectations were not met.");
-            }
-        }
-
-        [Fact]
-        public void MissingEntrySectionDetectedWixipl()
-        {
-            var folder = TestData.Get(@"TestData\OverridableActions");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                try
-                {
-                    WixRunner.Execute(new[]
-                    {
-                        "build",
-                        Path.Combine(folder, "PackageComponents.wxs"),
-                        "-intermediateFolder", intermediateFolder,
-                        "-o", Path.Combine(baseFolder, @"bin\test.wixipl")
-                    });
-                }
-                catch (WixException we)
-                {
-                    Assert.Equal("Could not find entry section in provided list of intermediates. Supported entry section types are: Product, Bundle, Patch, PatchCreation, Module.", we.Message);
-                    return;
-                }
-
-                Assert.True(false, "Expected WixException for missing entry section but expectations were not met.");
-            }
-        }
-
-        [Fact]
-        public void MissingEntrySectionDetectedUnknown()
-        {
-            var folder = TestData.Get(@"TestData\OverridableActions");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                try
-                {
-                    WixRunner.Execute(new[]
-                    {
-                        "build",
-                        Path.Combine(folder, "PackageComponents.wxs"),
-                        "-intermediateFolder", intermediateFolder,
-                        "-o", Path.Combine(baseFolder, @"bin\test.bob")
-                    });
-                }
-                catch (WixException we)
-                {
-                    Assert.Equal("Could not find entry section in provided list of intermediates. Supported entry section types are: Product, Bundle, Patch, PatchCreation, Module.", we.Message);
-                    return;
-                }
-
-                Assert.True(false, "Expected WixException for missing entry section but expectations were not met.");
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/MediaFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MediaFixture.cs
deleted file mode 100644
index de18e30c..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/MediaFixture.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System.IO;
-    using System.Linq;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using WixToolset.Data;
-    using Xunit;
-
-    public class MediaFixture
-    {
-        [Fact]
-        public void CanBuildMultiMedia()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Media", "MultiMedia.wxs"),
-                    "-bindpath", Path.Combine(folder, "Media", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                var mediaSymbols = section.Symbols.OfType<WixToolset.Data.Symbols.MediaSymbol>().OrderBy(m => m.DiskId).ToList();
-                var fileSymbols = section.Symbols.OfType<WixToolset.Data.Symbols.FileSymbol>().OrderBy(f => f.Sequence).ToList();
-                Assert.Equal(1, mediaSymbols[0].DiskId);
-                Assert.Equal(2, mediaSymbols[0].LastSequence);
-                Assert.Equal(2, mediaSymbols[1].DiskId);
-                Assert.Equal(4, mediaSymbols[1].LastSequence);
-                Assert.Equal(new[]
-                {
-                    "a1.txt",
-                    "a2.txt",
-                    "b1.txt",
-                    "b2.txt",
-                }, fileSymbols.Select(f => f.Name).ToArray());
-                Assert.Equal(new[]
-                {
-                    1,
-                    2,
-                    3,
-                    4,
-                }, fileSymbols.Select(f => f.Sequence).ToArray());
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/ModuleFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ModuleFixture.cs
deleted file mode 100644
index 17e91692..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/ModuleFixture.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System;
-    using System.IO;
-    using System.Linq;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using WixToolset.Data;
-    using WixToolset.Data.Symbols;
-    using WixToolset.Data.WindowsInstaller;
-    using Xunit;
-
-    public class ModuleFixture
-    {
-        [Fact]
-        public void CanBuildSimpleModule()
-        {
-            var folder = TestData.Get(@"TestData\SimpleModule");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var intermediateFolder = fs.GetFolder();
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Module.wxs"),
-                    "-loc", Path.Combine(folder, "Module.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(intermediateFolder, @"bin\test.msm")
-                });
-
-                result.AssertSuccess();
-
-                var msmPath = Path.Combine(intermediateFolder, @"bin\test.msm");
-                Assert.True(File.Exists(msmPath));
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb")));
-
-                var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                var dirSymbols = section.Symbols.OfType<DirectorySymbol>().OrderBy(d => d.Id.Id).ToList();
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "MergeRedirectFolder\tTARGETDIR\t.",
-                    "NotTheMergeRedirectFolder\tTARGETDIR\t.",
-                    "TARGETDIR\t\tSourceDir"
-                }, dirSymbols.Select(d => String.Join("\t", d.Id.Id, d.ParentDirectoryRef, d.Name)).ToArray());
-
-                var fileSymbols = section.Symbols.OfType<FileSymbol>().OrderBy(d => d.Id.Id).ToList();
-                WixAssert.CompareLineByLine(new[]
-                {
-                    $"File1\t{Path.Combine(folder, @"data\test.txt")}\ttest.txt",
-                    $"File2\t{Path.Combine(folder, @"data\test.txt")}\ttest.txt",
-                }, fileSymbols.Select(fileSymbol => String.Join("\t", fileSymbol.Id.Id, fileSymbol[FileSymbolFields.Source].AsPath().Path, fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path)).ToArray());
-
-                var data = WindowsInstallerData.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));
-                var fileRows = data.Tables["File"].Rows;
-                Assert.Equal(new[]
-                {
-                    "File1.243FB739_4D05_472F_9CFB_EF6B1017B6DE",
-                    "File2.243FB739_4D05_472F_9CFB_EF6B1017B6DE",
-                }, fileRows.Select(r => r.FieldAsString(0)).ToArray());
-
-                var cabPath = Path.Combine(intermediateFolder, "msm-test.cab");
-                Query.ExtractStream(msmPath, "MergeModule.CABinet", cabPath);
-                var files = Query.GetCabinetFiles(cabPath);
-                Assert.Equal(new[]
-                {
-                    "File1.243FB739_4D05_472F_9CFB_EF6B1017B6DE",
-                    "File2.243FB739_4D05_472F_9CFB_EF6B1017B6DE",
-                }, files.Select(f => Path.Combine(f.Path, f.Name)).ToArray());
-            }
-        }
-
-        [Fact]
-        public void CanSuppressModularization()
-        {
-            var folder = TestData.Get(@"TestData\SuppressModularization");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var intermediateFolder = fs.GetFolder();
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Module.wxs"),
-                    "-loc", Path.Combine(folder, "Module.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-sw1079",
-                    "-sw1086",
-                    "-o", Path.Combine(intermediateFolder, @"bin\test.msm")
-                });
-
-                result.AssertSuccess();
-
-                var msmPath = Path.Combine(intermediateFolder, @"bin\test.msm");
-
-                var rows = Query.QueryDatabase(msmPath, new[] { "CustomAction", "Property" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "CustomAction:Test\t11265\tFakeCA.243FB739_4D05_472F_9CFB_EF6B1017B6DE\tTestEntry\t",
-                    "Property:MsiHiddenProperties\tTest"
-                }, rows);
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
deleted file mode 100644
index 3bdfa0ef..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
+++ /dev/null
@@ -1,838 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System;
-    using System.IO;
-    using System.Linq;
-    using Example.Extension;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using WixToolset.Data;
-    using WixToolset.Data.Symbols;
-    using WixToolset.Data.WindowsInstaller;
-    using Xunit;
-
-    public class MsiFixture
-    {
-        [Fact]
-        public void CanBuildSingleFile()
-        {
-            var folder = TestData.Get(@"TestData\SingleFile");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.msi")));
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb")));
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\PFiles\MsiPackage\test.txt")));
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-
-                Assert.False(intermediate.HasLevel(WixToolset.Data.IntermediateLevels.Compiled));
-                Assert.True(intermediate.HasLevel(WixToolset.Data.IntermediateLevels.Linked));
-                Assert.True(intermediate.HasLevel(WixToolset.Data.IntermediateLevels.Resolved));
-                Assert.True(intermediate.HasLevel(WixToolset.Data.WindowsInstaller.IntermediateLevels.FullyBound));
-
-                var section = intermediate.Sections.Single();
-
-                var fileSymbol = section.Symbols.OfType<FileSymbol>().First();
-                Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
-                Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
-            }
-        }
-
-        [Fact]
-        public void CanBuildSingleFileCompressed()
-        {
-            var folder = TestData.Get(@"TestData\SingleFileCompressed");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var intermediateFolder = fs.GetFolder();
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msi")));
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\example.cab")));
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb")));
-
-                var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
-                Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
-                Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
-            }
-        }
-
-        [Fact]
-        public void CanBuildSingleFileCompressedWithMediaTemplate()
-        {
-            var folder = TestData.Get(@"TestData\SingleFileCompressed");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var intermediateFolder = fs.GetFolder();
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-d", "MediaTemplateCompressionLevel",
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msi")));
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\cab1.cab")));
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb")));
-            }
-        }
-
-        [Fact]
-        public void CanBuildSingleFileCompressedWithMediaTemplateWithLowCompression()
-        {
-            var folder = TestData.Get(@"TestData\SingleFileCompressed");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var intermediateFolder = fs.GetFolder();
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-d", "MediaTemplateCompressionLevel=low",
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msi")));
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\low1.cab")));
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb")));
-            }
-        }
-
-        [Fact]
-        public void CanBuildMultipleFilesCompressed()
-        {
-            var folder = TestData.Get(@"TestData\MultiFileCompressed");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var intermediateFolder = fs.GetFolder();
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    "-sw1079", // TODO: why does this test need to create a second cab which is empty?
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msi")));
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\example1.cab")));
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\example2.cab")));
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb")));
-            }
-        }
-
-        [Fact]
-        public void CanFailBuildMissingFile()
-        {
-            var folder = TestData.Get(@"TestData\SingleFile");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "does-not-exist"),
-                    "-bindpath", Path.Combine(folder, "also-does-not-exist"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                }, out var messages);
-                Assert.Equal(103, result);
-
-                var error = messages.Single(m => m.Level == MessageLevel.Error);
-                var errorMessage = error.ToString();
-                var checkedPaths = errorMessage.Substring(errorMessage.IndexOf(':') + 1).Split(new[] { ',' }).Select(s => s.Trim()).ToArray();
-                Assert.Equal(new[]
-                {
-                    "test.txt",
-                    Path.Combine(folder, "does-not-exist", "test.txt"),
-                    Path.Combine(folder, "also-does-not-exist", "test.txt"),
-                }, checkedPaths);
-            }
-        }
-
-        [Fact]
-        public void CanBuildWithErrorTable()
-        {
-            var folder = TestData.Get(@"TestData\ErrorsInUI");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.msi")));
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb")));
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\PFiles\MsiPackage\test.txt")));
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                var errors = section.Symbols.OfType<ErrorSymbol>().ToDictionary(t => t.Id.Id);
-                Assert.Equal("Category 55 Emergency Doomsday Crisis", errors["1234"].Message.Trim());
-                Assert.Equal(" ", errors["5678"].Message);
-
-                var customAction1 = section.Symbols.OfType<CustomActionSymbol>().Where(t => t.Id.Id == "CanWeReferenceAnError_YesWeCan").Single();
-                Assert.Equal("1234", customAction1.Target);
-
-                var customAction2 = section.Symbols.OfType<CustomActionSymbol>().Where(t => t.Id.Id == "TextErrorsWorkOKToo").Single();
-                Assert.Equal("If you see this, something went wrong.", customAction2.Target);
-            }
-        }
-
-        [Fact]
-        public void CanLoadPdbGeneratedByBuild()
-        {
-            var folder = TestData.Get(@"TestData\MultiFileCompressed");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var intermediateFolder = fs.GetFolder();
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-d", "MediaTemplateCompressionLevel",
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msi")));
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\cab1.cab")));
-
-                var pdbPath = Path.Combine(intermediateFolder, @"bin\test.wixpdb");
-                Assert.True(File.Exists(pdbPath));
-
-                var output = WindowsInstallerData.Load(pdbPath, suppressVersionCheck: true);
-                Assert.NotNull(output);
-            }
-        }
-
-        [Fact]
-        public void CanLoadPdbGeneratedByBuildViaWixOutput()
-        {
-            var folder = TestData.Get(@"TestData\MultiFileCompressed");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var intermediateFolder = fs.GetFolder();
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-d", "MediaTemplateCompressionLevel",
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msi")));
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\cab1.cab")));
-
-                var pdbPath = Path.Combine(intermediateFolder, @"bin\test.wixpdb");
-                Assert.True(File.Exists(pdbPath));
-
-                var wixOutput = WixOutput.Read(pdbPath);
-                var output = WindowsInstallerData.Load(wixOutput, suppressVersionCheck: true);
-                Assert.NotNull(output);
-            }
-        }
-
-        [Fact]
-        public void CanBuildManualUpgrade()
-        {
-            var folder = TestData.Get(@"TestData\ManualUpgrade");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var intermediateFolder = fs.GetFolder();
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
-                }, out var messages);
-
-                Assert.Equal(0, result);
-
-                var pdbPath = Path.Combine(intermediateFolder, @"bin\test.wixpdb");
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msi")));
-                Assert.True(File.Exists(pdbPath));
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\PFiles\MsiPackage\test.txt")));
-
-                var intermediate = Intermediate.Load(pdbPath);
-                var section = intermediate.Sections.Single();
-
-                var upgradeSymbol = section.Symbols.OfType<UpgradeSymbol>().Single();
-                Assert.False(upgradeSymbol.ExcludeLanguages);
-                Assert.True(upgradeSymbol.IgnoreRemoveFailures);
-                Assert.False(upgradeSymbol.VersionMaxInclusive);
-                Assert.True(upgradeSymbol.VersionMinInclusive);
-                Assert.Equal("13.0.0", upgradeSymbol.VersionMax);
-                Assert.Equal("12.0.0", upgradeSymbol.VersionMin);
-                Assert.False(upgradeSymbol.OnlyDetect);
-                Assert.Equal("BLAHBLAHBLAH", upgradeSymbol.ActionProperty);
-
-                var pdb = WindowsInstallerData.Load(pdbPath, suppressVersionCheck: false);
-                var secureProperties = pdb.Tables["Property"].Rows.Where(row => row.GetKey() == "SecureCustomProperties").Single();
-                Assert.Contains("BLAHBLAHBLAH", secureProperties.FieldAsString(1));
-            }
-        }
-
-        [Fact]
-        public void CanBuildWixipl()
-        {
-            var folder = TestData.Get(@"TestData\SingleFile");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.wixipl")
-                }, out var messages);
-
-                Assert.Equal(0, result);
-
-                var builtFiles = Directory.GetFiles(Path.Combine(baseFolder, @"bin"));
-
-                Assert.Equal(new[]{
-                    "test.wixipl"
-                }, builtFiles.Select(Path.GetFileName).ToArray());
-            }
-        }
-
-        [Fact]
-        public void CanBuildWixlib()
-        {
-            var folder = TestData.Get(@"TestData\SingleFile");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.wixlib")
-                }, out var messages);
-
-                Assert.Equal(0, result);
-
-                var builtFiles = Directory.GetFiles(Path.Combine(baseFolder, @"bin"));
-
-                Assert.Equal(new[]{
-                    "test.wixlib"
-                }, builtFiles.Select(Path.GetFileName).ToArray());
-            }
-        }
-
-        [Fact]
-        public void CanBuildBinaryWixlib()
-        {
-            var folder = TestData.Get(@"TestData\SingleFile");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-bindfiles",
-                    "-o", Path.Combine(baseFolder, @"bin\test.wixlib"));
-
-                result.AssertSuccess();
-
-                using (var wixout = WixOutput.Read(Path.Combine(baseFolder, @"bin\test.wixlib")))
-                {
-                    Assert.NotNull(wixout.GetDataStream("wix-ir.json"));
-
-                    var text = wixout.GetData("wix-ir/test.txt");
-                    Assert.Equal("This is test.txt.", text);
-                }
-            }
-        }
-
-        [Fact]
-        public void CanBuildBinaryWixlibWithCollidingFilenames()
-        {
-            var folder = TestData.Get(@"TestData\SameFileFolders");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(
-                    "build",
-                    Path.Combine(folder, "TestComponents.wxs"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-bindfiles",
-                    "-o", Path.Combine(baseFolder, @"bin\test.wixlib"));
-
-                result.AssertSuccess();
-
-                using (var wixout = WixOutput.Read(Path.Combine(baseFolder, @"bin\test.wixlib")))
-                {
-                    Assert.NotNull(wixout.GetDataStream("wix-ir.json"));
-
-                    var text = wixout.GetData("wix-ir/test.txt");
-                    Assert.Equal(@"This is a\test.txt.", text);
-
-                    var text2 = wixout.GetData("wix-ir/test.txt-1");
-                    Assert.Equal(@"This is b\test.txt.", text2);
-
-                    var text3 = wixout.GetData("wix-ir/test.txt-2");
-                    Assert.Equal(@"This is c\test.txt.", text3);
-                }
-            }
-        }
-
-        [Fact]
-        public void CanBuildWithIncludePath()
-        {
-            var folder = TestData.Get(@"TestData\IncludePath");
-            var bindpath = Path.Combine(folder, "data");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", bindpath,
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi"),
-                    "-i", bindpath);
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.msi")));
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb")));
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\PFiles\MsiPackage\test.txt")));
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
-                Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
-                Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
-            }
-        }
-
-        [Fact]
-        public void CanBuildWithAssembly()
-        {
-            var folder = TestData.Get(@"TestData\Assembly");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.msi")));
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb")));
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\PFiles\AssemblyMsiPackage\candle.exe")));
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
-                Assert.Equal(Path.Combine(folder, @"data\candle.exe"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
-                Assert.Equal(@"candle.exe", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
-
-                var msiAssemblyNameSymbols = section.Symbols.OfType<MsiAssemblyNameSymbol>();
-                Assert.Equal(new[]
-                {
-                    "culture",
-                    "fileVersion",
-                    "name",
-                    "processorArchitecture",
-                    "publicKeyToken",
-                    "version"
-                }, msiAssemblyNameSymbols.OrderBy(a => a.Name).Select(a => a.Name).ToArray());
-
-                Assert.Equal(new[]
-                {
-                    "neutral",
-                    "3.11.11810.0",
-                    "candle",
-                    "x86",
-                    "256B3414DFA97718",
-                    "3.0.0.0"
-                }, msiAssemblyNameSymbols.OrderBy(a => a.Name).Select(a => a.Value).ToArray());
-            }
-        }
-
-        [Fact]
-        public void CanBuild64bit()
-        {
-            var folder = TestData.Get(@"TestData\SingleFile");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-arch", "x64",
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                var platformSummary = section.Symbols.OfType<SummaryInformationSymbol>().Single(s => s.PropertyId == SummaryInformationType.PlatformAndLanguage);
-                Assert.Equal("x64;1033", platformSummary.Value);
-            }
-        }
-
-        [Fact]
-        public void CanBuildSharedComponent()
-        {
-            var folder = TestData.Get(@"TestData\SingleFile");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-arch", "x64",
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                // Only one component is shared.
-                var sharedComponentSymbols = section.Symbols.OfType<ComponentSymbol>();
-                Assert.Equal(1, sharedComponentSymbols.Sum(t => t.Shared ? 1 : 0));
-
-                // And it is this one.
-                var sharedComponentSymbol = sharedComponentSymbols.Single(t => t.Id.Id == "Shared.dll");
-                Assert.True(sharedComponentSymbol.Shared);
-            }
-        }
-
-        [Fact]
-        public void CanBuildSetProperty()
-        {
-            var folder = TestData.Get(@"TestData\SetProperty");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                var output = WindowsInstallerData.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"), false);
-                var caRows = output.Tables["CustomAction"].Rows.Single();
-                Assert.Equal("SetINSTALLLOCATION", caRows.FieldAsString(0));
-                Assert.Equal("51", caRows.FieldAsString(1));
-                Assert.Equal("INSTALLLOCATION", caRows.FieldAsString(2));
-                Assert.Equal("[INSTALLFOLDER]", caRows.FieldAsString(3));
-            }
-        }
-
-        [Fact]
-        public void CanBuildVersionIndependentProgId()
-        {
-            var folder = TestData.Get(@"TestData\ProgId");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.msi")));
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb")));
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\PFiles\MsiPackage\Foo.exe")));
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                var progids = section.Symbols.OfType<ProgIdSymbol>().OrderBy(symbol => symbol.ProgId).ToList();
-                Assert.Equal(new[]
-                {
-                    "Foo.File.hol",
-                    "Foo.File.hol.15"
-                }, progids.Select(p => p.ProgId).ToArray());
-
-                Assert.Equal(new[]
-                {
-                    "Foo.File.hol.15",
-                    null
-                }, progids.Select(p => p.ParentProgIdRef).ToArray());
-            }
-        }
-
-        [Fact]
-        public void CanBuildInstanceTransform()
-        {
-            var folder = TestData.Get(@"TestData\InstanceTransform");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var intermediateFolder = fs.GetFolder();
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                var output = WindowsInstallerData.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"), false);
-                var substorage = output.SubStorages.Single();
-                Assert.Equal("I1", substorage.Name);
-
-                var data = substorage.Data;
-                Assert.Equal(new[]
-                {
-                    "_SummaryInformation",
-                    "Property",
-                    "Upgrade"
-                }, data.Tables.Select(t => t.Name).ToArray());
-
-                Assert.Equal(new[]
-                {
-                    "INSTANCEPROPERTY\tI1",
-                    "ProductName\tMsiPackage (Instance 1)",
-                }, JoinRows(data.Tables["Property"]));
-
-                Assert.Equal(new[]
-                {
-                    "{047730A5-30FE-4A62-A520-DA9381B8226A}\t\t1.0.0.0\t1033\t1\t\tWIX_UPGRADE_DETECTED",
-                    "{047730A5-30FE-4A62-A520-DA9381B8226A}\t\t1.0.0.0\t1033\t1\t0\t0",
-                    "{047730A5-30FE-4A62-A520-DA9381B8226A}\t1.0.0.0\t\t1033\t2\t\tWIX_DOWNGRADE_DETECTED",
-                    "{047730A5-30FE-4A62-A520-DA9381B8226A}\t1.0.0.0\t\t1033\t2\t0\t0"
-                }, JoinRows(data.Tables["Upgrade"]));
-            }
-        }
-
-        [Fact(Skip = "Test demonstrates failure")]
-        public void FailsBuildAtLinkTimeForMissingEnsureTable()
-        {
-            var folder = TestData.Get(@"TestData");
-            var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath);
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "BadEnsureTable", "BadEnsureTable.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-ext", extensionPath,
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-                Assert.Collection(result.Messages,
-                    first =>
-                    {
-                        Assert.Equal(MessageLevel.Error, first.Level);
-                        Assert.Equal("The identifier 'WixCustomTable:TableDefinitionNotExposedByExtension' could not be found. Ensure you have typed the reference correctly and that all the necessary inputs are provided to the linker.", first.ToString());
-                    });
-
-                Assert.False(File.Exists(msiPath));
-            }
-        }
-
-        private static string[] JoinRows(Table table)
-        {
-            return table.Rows.Select(r => JoinFields(r.Fields)).ToArray();
-
-            string JoinFields(Field[] fields)
-            {
-                return String.Join('\t', fields.Select(f => f.ToString()));
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
deleted file mode 100644
index 71edddc6..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+++ /dev/null
@@ -1,1040 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System;
-    using System.IO;
-    using System.Linq;
-    using Example.Extension;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using WixToolset.Data;
-    using WixToolset.Data.Symbols;
-    using WixToolset.Data.WindowsInstaller;
-    using Xunit;
-
-    public class MsiQueryFixture
-    {
-        [Fact]
-        public void PopulatesAppIdTableWhenAdvertised()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "AppId", "Advertised.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "AppId" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "AppId:{D6040299-B15C-4C94-AE26-0C9B60D14C35}\t\t\t\t\t\t",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesAppSearchTablesFromComponentSearch()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "AppSearch", "ComponentSearch.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "AppSearch", "CompLocator" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "AppSearch:SAMPLECOMPFOUND\tSampleCompSearch",
-                    "CompLocator:SampleCompSearch\t{4D9A0D20-D0CC-40DE-B580-EAD38B985217}\t1",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesAppSearchTablesFromDirectorySearch()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "AppSearch", "DirectorySearch.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "AppSearch", "DrLocator" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "AppSearch:SAMPLEDIRFOUND\tSampleDirSearch",
-                    "DrLocator:SampleDirSearch\t\tC:\\SampleDir\t",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesAppSearchTablesFromFileSearch()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "AppSearch", "FileSearch.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "AppSearch", "DrLocator", "IniLocator" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "AppSearch:SAMPLEFILEFOUND\tSampleFileSearch",
-                    "DrLocator:SampleFileSearch\tSampleIniFileSearch\t\t",
-                    "IniLocator:SampleFileSearch\tsample.fil\tMySection\tMyKey\t\t1",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesAppSearchTablesFromRegistrySearch()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "AppSearch", "RegistrySearch.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "AppSearch", "RegLocator" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "AppSearch:SAMPLEREGFOUND\tSampleRegSearch",
-                    "RegLocator:SampleRegSearch\t2\tSampleReg\t\t2",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesAppSearchTablesFromRegistrySearch64()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "AppSearch", "RegistrySearch64.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "AppSearch", "RegLocator" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "AppSearch:SAMPLEREGFOUND\tSampleRegSearch",
-                    "RegLocator:SampleRegSearch\t2\tSampleReg\t\t18",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesClassTablesWhenIconIndexIsZero()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Class", "IconIndex0.wxs"),
-                    Path.Combine(folder, "Icon", "SampleIcon.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, ".Data"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "Class" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Class:{3FAED4CC-C473-4B8A-BE8B-303871377A4A}\tLocalServer32\tClassComp\t\tFakeClass3FAE\t\t\tSampleIcon\t0\t\t\tProductFeature\t",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesClassTablesWhenProgIdIsNestedUnderAdvertisedClass()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "ProgId", "NestedUnderClass.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "Class", "ProgId", "Registry" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Class:{F12A6F69-117F-471F-AE73-F8E74218F498}\tLocalServer32\tProgIdComp\t73E7DF7E-EFAC-4E11-90E2-6EBAEB8DE58D\tFakeClassF12A\t\t\t\t\t\t\tProductFeature\t",
-                    "ProgId:73E7DF7E-EFAC-4E11-90E2-6EBAEB8DE58D\t\t{F12A6F69-117F-471F-AE73-F8E74218F498}\tFakeClassF12A\t\t",
-                    "Registry:regUIIK326nDZpkWHuexeF58EikQvA\t0\t73E7DF7E-EFAC-4E11-90E2-6EBAEB8DE58D\tNoOpen\tNoOpen73E7\tProgIdComp",
-                    "Registry:regvrhMurMp98anbQJkpgA8yJCefdM\t0\tCLSID\\{F12A6F69-117F-471F-AE73-F8E74218F498}\\Version\t\t0.0.0.1\tProgIdComp",
-                    "Registry:regY1F4E2lvu_Up6gV6c3jeN5ukn8s\t0\tCLSID\\{F12A6F69-117F-471F-AE73-F8E74218F498}\\LocalServer32\tThreadingModel\tApartment\tProgIdComp",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesControlTables()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "DialogsInInstallUISequence", "PackageComponents.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath,
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-
-                var results = Query.QueryDatabase(msiPath, new[] { "CheckBox", "Control", "ControlCondition", "InstallUISequence" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "CheckBox:WIXUI_EXITDIALOGOPTIONALCHECKBOX\t1",
-                    "Control:FirstDialog\tHeader\tText\t0\t13\t90\t13\t3\t\tFirstDialogHeader\tTitle\t",
-                    "Control:FirstDialog\tTitle\tText\t0\t0\t90\t13\t3\t\tFirstDialogTitle\tHeader\t",
-                    "Control:SecondDialog\tOptionalCheckBox\tCheckBox\t0\t13\t100\t40\t2\tWIXUI_EXITDIALOGOPTIONALCHECKBOX\t[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]\tTitle\tOptional checkbox|Check this box for fun",
-                    "Control:SecondDialog\tTitle\tText\t0\t0\t90\t13\t3\t\tSecondDialogTitle\tOptionalCheckBox\t",
-                    "ControlCondition:FirstDialog\tHeader\tDisable\tInstalled",
-                    "ControlCondition:FirstDialog\tHeader\tHide\tInstalled",
-                    "ControlCondition:SecondDialog\tOptionalCheckBox\tShow\tWIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT Installed",
-                    "InstallUISequence:CostFinalize\t\t1000",
-                    "InstallUISequence:CostInitialize\t\t800",
-                    "InstallUISequence:ExecuteAction\t\t1300",
-                    "InstallUISequence:FileCost\t\t900",
-                    "InstallUISequence:FindRelatedProducts\t\t25",
-                    "InstallUISequence:FirstDialog\tInstalled AND PATCH\t1298",
-                    "InstallUISequence:LaunchConditions\t\t100",
-                    "InstallUISequence:MigrateFeatureStates\t\t1200",
-                    "InstallUISequence:SecondDialog\tNOT Installed\t1299",
-                    "InstallUISequence:ValidateProductID\t\t700",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesCreateFolderTableForNullKeypathComponents()
-        {
-            var folder = TestData.Get(@"TestData\Components");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "CreateFolder" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "CreateFolder:INSTALLFOLDER\tNullKeypathComponent",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesDirectoryTableWithValidDefaultDir()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    "-sw1031", // this is expected for this test
-                    Path.Combine(folder, "DefaultDir", "DefaultDir.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "Directory" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Directory:DUPLICATENAMEANDSHORTNAME\tINSTALLFOLDER\tduplicat",
-                    "Directory:Folder1\tINSTALLFOLDER\tFolder.1",
-                    "Directory:Folder12\tINSTALLFOLDER\tFolder.12",
-                    "Directory:Folder123\tINSTALLFOLDER\tFolder.123",
-                    "Directory:Folder1234\tINSTALLFOLDER\tyakwclwy|Folder.1234",
-                    "Directory:INSTALLFOLDER\tProgramFiles6432Folder\t1egc1laj|MsiPackage",
-                    "Directory:NAMEANDSHORTNAME\tINSTALLFOLDER\tSHORTNAM|NameAndShortName",
-                    "Directory:NAMEANDSHORTSOURCENAME\tINSTALLFOLDER\tNAMEASSN|NameAndShortSourceName",
-                    "Directory:NAMEWITHSHORTVALUE\tINSTALLFOLDER\tSHORTVAL",
-                    "Directory:ProgramFiles6432Folder\tProgramFilesFolder\t.",
-                    "Directory:ProgramFilesFolder\tTARGETDIR\tPFiles",
-                    "Directory:SHORTNAMEANDLONGSOURCENAME\tINSTALLFOLDER\tSHNALSNM:6ukthv5q|ShortNameAndLongSourceName",
-                    "Directory:SHORTNAMEONLY\tINSTALLFOLDER\tSHORTONL",
-                    "Directory:SOURCENAME\tINSTALLFOLDER\ts2s5bq-i|NameAndSourceName:dhnqygng|SourceNameWithName",
-                    "Directory:SOURCENAMESONLY\tINSTALLFOLDER\t.:SRCNAMON|SourceNameOnly",
-                    "Directory:SOURCENAMEWITHSHORTVALUE\tINSTALLFOLDER\t.:SRTSRCVL",
-                    "Directory:TARGETDIR\t\tSourceDir",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesEnvironmentTable()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Environment", "Environment.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "Environment" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Environment:PATH\t=-*PATH\t[INSTALLFOLDER]; ;[~]\tWixEnvironmentTest",
-                    "Environment:WixEnvironmentTest1\t=-WixEnvTest1\t\tWixEnvironmentTest",
-                    "Environment:WixEnvironmentTest2\t+-WixEnvTest1\t\tWixEnvironmentTest",
-                    "Environment:WixEnvironmentTest3\t!-WixEnvTest1\t\tWixEnvironmentTest",
-                    "Environment:WixEnvironmentTest4\t=-*WIX\t[INSTALLFOLDER]\tWixEnvironmentTest",
-                }, results);
-            }
-        }
-
-        [Fact(Skip = "Test demonstrates failure")]
-        public void PopulatesExampleTableBecauseOfEnsureTable()
-        {
-            var folder = TestData.Get(@"TestData");
-            var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath);
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "EnsureTable", "EnsureTable.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-ext", extensionPath,
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabaseByTable(msiPath, new[] { "Wix4Example" });
-                Assert.Empty(results["Wix4Example"]);
-            }
-        }
-
-        [Fact]
-        public void PopulatesFeatureTableWithParent()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "FeatureGroup", "FeatureGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "Feature" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Feature:ChildFeature\tParentFeature\tChildFeatureTitle\t\t2\t1\t\t0",
-                    "Feature:ParentFeature\t\tParentFeatureTitle\t\t2\t1\t\t0",
-                    "Feature:ProductFeature\t\tMsiPackageTitle\t\t2\t1\t\t0",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesFontTableFromFontTitle()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Font", "FontTitle.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "Font" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Font:test.txt\tFakeFont",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesFontTableFromTrueType()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Font", "TrueType.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "Font" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Font:TrueTypeFontFile\t",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesInstallExecuteSequenceTable()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Upgrade", "DetectOnly.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "InstallExecuteSequence" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "InstallExecuteSequence:CostFinalize\t\t1000",
-                    "InstallExecuteSequence:CostInitialize\t\t800",
-                    "InstallExecuteSequence:CreateFolders\t\t3700",
-                    "InstallExecuteSequence:FileCost\t\t900",
-                    "InstallExecuteSequence:FindRelatedProducts\t\t25",
-                    "InstallExecuteSequence:InstallFiles\t\t4000",
-                    "InstallExecuteSequence:InstallFinalize\t\t6600",
-                    "InstallExecuteSequence:InstallInitialize\t\t1500",
-                    "InstallExecuteSequence:InstallValidate\t\t1400",
-                    "InstallExecuteSequence:LaunchConditions\t\t100",
-                    "InstallExecuteSequence:MigrateFeatureStates\t\t1200",
-                    "InstallExecuteSequence:ProcessComponents\t\t1600",
-                    "InstallExecuteSequence:PublishFeatures\t\t6300",
-                    "InstallExecuteSequence:PublishProduct\t\t6400",
-                    "InstallExecuteSequence:RegisterProduct\t\t6100",
-                    "InstallExecuteSequence:RegisterUser\t\t6000",
-                    "InstallExecuteSequence:RemoveExistingProducts\t\t1401",
-                    "InstallExecuteSequence:RemoveFiles\t\t3500",
-                    "InstallExecuteSequence:RemoveFolders\t\t3600",
-                    "InstallExecuteSequence:UnpublishFeatures\t\t1800",
-                    "InstallExecuteSequence:ValidateProductID\t\t700",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesLockPermissionsTableWithEmptyPermissions()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "LockPermissions", "EmptyPermissions.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "LockPermissions" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "LockPermissions:INSTALLFOLDER\tCreateFolder\t\tAdministrator\t0",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesMsiAssemblyTables()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Assembly", "Win32Assembly.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "Assembly", "data"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "MsiAssembly", "MsiAssemblyName" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "MsiAssembly:test.txt\tProductFeature\ttest.dll.manifest\t\t1",
-                    "MsiAssemblyName:test.txt\tname\tMyApplication.app",
-                    "MsiAssemblyName:test.txt\tversion\t1.0.0.0",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesReserveCostTable()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "ReserveCost", "ReserveCost.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "ReserveCost" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "ReserveCost:TestCost\tReserveCostComp\tINSTALLFOLDER\t100\t200",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesServiceTables()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "ServiceInstall", "OwnProcess.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "ServiceInstall", "ServiceControl" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "ServiceControl:SampleService\tSampleService\t161\t\t1\ttest.txt",
-                    "ServiceInstall:SampleService\tSampleService\t\t16\t4\t0\t\t\t\t\t\ttest.txt\t",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesTextStyleTableWhenColorIsNull()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "TextStyle", "ColorNull.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "TextStyle" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "TextStyle:FirstTextStyle\tArial\t2\t\t",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesTextStyleTableWhenSizeIsLocalized()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "TextStyle", "SizeLocalized.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-loc", Path.Combine(folder, "TextStyle", "SizeLocalized.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath,
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "TextStyle" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "TextStyle:CustomFont\tTahoma\t8\t\t",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesTypeLibTableWhenLanguageIsZero()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "TypeLib", "Language0.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "TypeLib" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "TypeLib:{765BE8EE-BD7F-491E-90D2-C5A972462B50}\t0\tTypeLibComp\t\t\t\tProductFeature\t",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesUpgradeTableFromManualUpgrade()
-        {
-            var folder = TestData.Get(@"TestData\ManualUpgrade");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var intermediateFolder = fs.GetFolder();
-                var msiPath = Path.Combine(intermediateFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                }, out var messages);
-
-                Assert.Equal(0, result);
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "Upgrade" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Upgrade:{01120000-00E0-0000-0000-0000000FF1CE}\t12.0.0\t13.0.0\t\t260\t\tBLAHBLAHBLAH",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesUpgradeTableFromDetectOnlyUpgrade()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Upgrade", "DetectOnly.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "Upgrade" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Upgrade:{12E4699F-E774-4D05-8A01-5BDD41BBA127}\t\t1.0.0.0\t1033\t1\t\tWIX_UPGRADE_DETECTED",
-                    "Upgrade:{12E4699F-E774-4D05-8A01-5BDD41BBA127}\t1.0.0.0\t\t1033\t2\t\tWIX_DOWNGRADE_DETECTED",
-                    "Upgrade:{B05772EA-82B8-4DE0-B7EB-45B5F0CCFE6D}\t1.0.0\t\t\t256\t\tRELPRODFOUND",
-                }, results);
-
-                var prefix = "Property:SecureCustomProperties\t";
-                var secureProperties = Query.QueryDatabase(msiPath, new[] { "Property" }).Where(p => p.StartsWith(prefix)).Single();
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "RELPRODFOUND",
-                    "WIX_DOWNGRADE_DETECTED",
-                    "WIX_UPGRADE_DETECTED",
-                }, secureProperties.Substring(prefix.Length).Split(';').OrderBy(p => p).ToArray());
-            }
-        }
-
-        [Fact]
-        public void CanMergeModule()
-        {
-            var folder = TestData.Get(@"TestData\SimpleMerge");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var intermediateFolder = fs.GetFolder();
-                var msiPath = Path.Combine(intermediateFolder, @"bin\test.msi");
-                var cabPath = Path.Combine(intermediateFolder, @"bin\cab1.cab");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, ".data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb")));
-
-                var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-                Assert.Empty(section.Symbols.OfType<FileSymbol>());
-
-                var data = WindowsInstallerData.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));
-                Assert.Empty(data.Tables["File"].Rows);
-
-                var results = Query.QueryDatabase(msiPath, new[] { "File" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "File:filyIq8rqcxxf903Hsn5K9L0SWV73g.243FB739_4D05_472F_9CFB_EF6B1017B6DE\tModuleComponent.243FB739_4D05_472F_9CFB_EF6B1017B6DE\ttest.txt\t17\t\t\t512\t0"
-                }, results);
-
-                var files = Query.GetCabinetFiles(cabPath);
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "filyIq8rqcxxf903Hsn5K9L0SWV73g.243FB739_4D05_472F_9CFB_EF6B1017B6DE"
-                }, files.Select(f => f.Name).ToArray());
-            }
-        }
-
-        [Fact]
-        public void CanPublishComponentWithMultipleFeatureComponents()
-        {
-            var folder = TestData.Get(@"TestData\PublishComponent");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "PublishComponent" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "PublishComponent:{0A82C8F6-9CE9-4336-B8BE-91A39B5F7081}    Qualifier2      Component2      AppData2        ProductFeature2",
-                    "PublishComponent:{BD245B5A-EC33-46ED-98FF-E9D3D416AD04}    Qualifier1      Component1      AppData1        ProductFeature1",
-                }, results);
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiTransactionFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiTransactionFixture.cs
deleted file mode 100644
index a566b490..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/MsiTransactionFixture.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System.IO;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using Xunit;
-
-    public class MsiTransactionFixture
-    {
-        [Fact]
-        public void CantBuildX64AfterX86Bundle()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var binFolder = Path.Combine(baseFolder, "bin");
-                var exePath = Path.Combine(binFolder, "test.exe");
-
-                BuildMsiPackages(folder, intermediateFolder, binFolder);
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    "-sw1151", // this is expected for this test
-                    Path.Combine(folder, "MsiTransaction", "X64AfterX86Bundle.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", binFolder,
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", exePath,
-                });
-
-                Assert.Equal(390, result.ExitCode);
-            }
-        }
-
-        [Fact]
-        public void CanBuildX86AfterX64Bundle()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var binFolder = Path.Combine(baseFolder, "bin");
-                var exePath = Path.Combine(binFolder, "test.exe");
-
-                BuildMsiPackages(folder, intermediateFolder, binFolder);
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    "-sw1151", // this is expected for this test
-                    Path.Combine(folder, "MsiTransaction", "X86AfterX64Bundle.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", binFolder,
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", exePath,
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(exePath));
-            }
-        }
-
-        private static void BuildMsiPackages(string folder, string intermediateFolder, string binFolder)
-        {
-            var result = WixRunner.Execute(new[]
-            {
-                "build",
-                Path.Combine(folder, "MsiTransaction", "FirstX86.wxs"),
-                Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                "-intermediateFolder", intermediateFolder,
-                "-o", Path.Combine(binFolder, "FirstX86", "FirstX86.msi"),
-            });
-
-            result.AssertSuccess();
-
-            result = WixRunner.Execute(new[]
-            {
-                "build",
-                Path.Combine(folder, "MsiTransaction", "SecondX86.wxs"),
-                Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                "-intermediateFolder", intermediateFolder,
-                "-o", Path.Combine(binFolder, "SecondX86", "SecondX86.msi"),
-            });
-
-            result.AssertSuccess();
-
-            result = WixRunner.Execute(new[]
-            {
-                "build",
-                Path.Combine(folder, "MsiTransaction", "FirstX64.wxs"),
-                Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                "-intermediateFolder", intermediateFolder,
-                "-arch", "x64",
-                "-o", Path.Combine(binFolder, "FirstX64", "FirstX64.msi"),
-            });
-
-            result.AssertSuccess();
-
-            result = WixRunner.Execute(new[]
-            {
-                "build",
-                Path.Combine(folder, "MsiTransaction", "SecondX64.wxs"),
-                Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                "-intermediateFolder", intermediateFolder,
-                "-arch", "x64",
-                "-o", Path.Combine(binFolder, "SecondX64", "SecondX64.msi"),
-            });
-
-            result.AssertSuccess();
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsuPackageFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsuPackageFixture.cs
deleted file mode 100644
index 475afcf0..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/MsuPackageFixture.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System.IO;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using Xunit;
-
-    public class MsuPackageFixture
-    {
-        [Fact]
-        public void CanBuildBundleWithMsuPackage()
-        {
-            var folder = TestData.Get(@"TestData", "MsuPackage");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, "bin", "test.exe")
-                });
-
-                result.AssertSuccess();
-                Assert.True(File.Exists(Path.Combine(baseFolder, "bin", "test.exe")));
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/PackagePayloadFixture.cs b/src/test/WixToolsetTest.CoreIntegration/PackagePayloadFixture.cs
deleted file mode 100644
index 6b2d8bfa..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/PackagePayloadFixture.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using Xunit;
-
-    public class PackagePayloadFixture
-    {
-        [Fact]
-        public void CanSpecifyPackagePayloadInPayloadGroup()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var bundlePath = Path.Combine(baseFolder, @"bin\test.exe");
-                var baFolderPath = Path.Combine(baseFolder, "ba");
-                var extractFolderPath = Path.Combine(baseFolder, "extract");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "PackagePayload", "PackagePayloadInPayloadGroup.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", Path.Combine(folder, ".Data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundlePath,
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(bundlePath));
-
-                var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
-                extractResult.AssertSuccess();
-
-                var exePackageElements = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Chain/burn:ExePackage");
-                var ignoreAttributesByElementName = new Dictionary<string, List<string>>
-                {
-                    { "ExePackage", new List<string> { "CacheId", "InstallSize", "Size" } },
-                };
-                Assert.Equal(1, exePackageElements.Count);
-                Assert.Equal("<ExePackage Id='PackagePayloadInPayloadGroup' Cache='keep' CacheId='*' InstallSize='*' Size='*' PerMachine='yes' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_PackagePayloadInPayloadGroup' RollbackLogPathVariable='WixBundleRollbackLog_PackagePayloadInPayloadGroup' DetectCondition='none' InstallArguments='' UninstallArguments='' RepairArguments='' Repairable='no'><PayloadRef Id='burn.exe' /></ExePackage>", exePackageElements[0].GetTestXml(ignoreAttributesByElementName));
-
-                var payloadElements = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Payload[@Id='burn.exe']");
-                Assert.Equal(1, payloadElements.Count);
-                Assert.Equal("<Payload Id='burn.exe' FilePath='burn.exe' FileSize='463360' Hash='F6E722518AC3AB7E31C70099368D5770788C179AA23226110DCF07319B1E1964E246A1E8AE72E2CF23E0138AFC281BAFDE45969204405E114EB20C8195DA7E5E' Packaging='embedded' SourcePath='a0' Container='WixAttachedContainer' />", payloadElements[0].GetTestXml());
-            }
-        }
-
-        [Fact]
-        public void ErrorWhenMissingSourceFileAndHash()
-        {
-            var folder = TestData.Get(@"TestData", "PackagePayload");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-
-                var result = WixRunner.Execute(false, new[]
-                {
-                    "build",
-                    Path.Combine(folder, "MissingSourceFileAndHash.wxs"),
-                    "-o", Path.Combine(baseFolder, "test.wixlib")
-                });
-
-                Assert.Equal(44, result.ExitCode);
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "The MsuPackagePayload element's SourceFile or Hash attribute was not found; one of these is required.",
-                }, result.Messages.Select(m => m.ToString()).ToArray());
-            }
-        }
-
-        [Fact]
-        public void ErrorWhenMissingSourceFileAndName()
-        {
-            var folder = TestData.Get(@"TestData", "PackagePayload");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-
-                var result = WixRunner.Execute(false, new[]
-                {
-                    "build",
-                    Path.Combine(folder, "MissingSourceFileAndName.wxs"),
-                    "-o", Path.Combine(baseFolder, "test.wixlib")
-                });
-
-                Assert.Equal(44, result.ExitCode);
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "The MsiPackagePayload element's Name or SourceFile attribute was not found; one of these is required.",
-                }, result.Messages.Select(m => m.ToString()).ToArray());
-            }
-        }
-
-        [Fact]
-        public void ErrorWhenSpecifiedHash()
-        {
-            var folder = TestData.Get(@"TestData", "PackagePayload");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "SpecifiedHash.wxs"),
-                    "-o", Path.Combine(baseFolder, "test.wixlib")
-                });
-
-                Assert.Equal(4, result.ExitCode);
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "The MspPackagePayload element contains an unexpected attribute 'Hash'.",
-                }, result.Messages.Select(m => m.ToString()).ToArray());
-            }
-        }
-
-        [Fact]
-        public void ErrorWhenSpecifiedHashAndMissingDownloadUrl()
-        {
-            var folder = TestData.Get(@"TestData", "PackagePayload");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "SpecifiedHashAndMissingDownloadUrl.wxs"),
-                    "-o", Path.Combine(baseFolder, "test.wixlib")
-                });
-
-                Assert.Equal(10, result.ExitCode);
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "The MsuPackagePayload/@DownloadUrl attribute was not found; it is required when attribute Hash is specified.",
-                }, result.Messages.Select(m => m.ToString()).ToArray());
-            }
-        }
-
-        [Fact]
-        public void ErrorWhenSpecifiedSourceFileAndHash()
-        {
-            var folder = TestData.Get(@"TestData", "PackagePayload");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "SpecifiedSourceFileAndHash.wxs"),
-                    "-o", Path.Combine(baseFolder, "test.wixlib")
-                });
-
-                Assert.Equal(35, result.ExitCode);
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "The ExePackagePayload/@Hash attribute cannot be specified when attribute SourceFile is present.",
-                }, result.Messages.Select(m => m.ToString()).ToArray());
-            }
-        }
-
-        [Fact]
-        public void ErrorWhenWrongPackagePayloadInPayloadGroup()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var bundlePath = Path.Combine(baseFolder, @"bin\test.exe");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "PackagePayload", "WrongPackagePayloadInPayloadGroup.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", Path.Combine(folder, ".Data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundlePath,
-                });
-
-                Assert.Equal(407, result.ExitCode);
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "The ExePackagePayload element can only be used for ExePackages.",
-                    "The location of the package related to previous error.",
-                    "There is no payload defined for package 'WrongPackagePayloadInPayloadGroup'. This is specified on the MsiPackage element or a child MsiPackagePayload element.",
-                }, result.Messages.Select(m => m.ToString()).ToArray());
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs
deleted file mode 100644
index cdba85de..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System.Linq;
-    using WixToolset.Core;
-    using WixToolset.Data;
-    using WixToolset.Data.Symbols;
-    using WixToolset.Extensibility.Data;
-    using WixToolset.Extensibility.Services;
-    using Xunit;
-
-    public class ParseFixture
-    {
-        [Fact]
-        public void GeneratesCorrectCustomActionIdentifiers()
-        {
-            var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider();
-            var section = new IntermediateSection("section", SectionType.Fragment);
-            var parseHelper = serviceProvider.GetService<IParseHelper>();
-
-            parseHelper.CreateCustomActionReference(null, section, "CustomAction32", Platform.X86, CustomActionPlatforms.X86);
-            parseHelper.CreateCustomActionReference(null, section, "CustomArmAction", Platform.ARM64, CustomActionPlatforms.X86);
-            parseHelper.CreateCustomActionReference(null, section, "CustomArmAction", Platform.ARM64, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
-            parseHelper.CreateCustomActionReference(null, section, "CustomAction", Platform.X64, CustomActionPlatforms.X86);
-            parseHelper.CreateCustomActionReference(null, section, "CustomAction", Platform.X64, CustomActionPlatforms.X86 | CustomActionPlatforms.X64);
-
-            var simpleReferences = section.Symbols.OfType<WixSimpleReferenceSymbol>();
-            Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:CustomAction32_X86").FirstOrDefault());
-            Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:CustomArmAction_X86").FirstOrDefault());
-            Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:CustomArmAction_A64").FirstOrDefault());
-            Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:CustomAction_X86").FirstOrDefault());
-            Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:CustomAction_X64").FirstOrDefault());
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/PatchFixture.cs b/src/test/WixToolsetTest.CoreIntegration/PatchFixture.cs
deleted file mode 100644
index 483e3fd5..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/PatchFixture.cs
+++ /dev/null
@@ -1,279 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System;
-    using System.Collections.Generic;
-    using System.ComponentModel;
-    using System.IO;
-    using System.Linq;
-    using System.Runtime.InteropServices;
-    using System.Text;
-    using System.Xml;
-    using System.Xml.Linq;
-    using Example.Extension;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using WixToolset.Data;
-    using WixToolset.Data.Burn;
-    using Xunit;
-
-    public class PatchFixture
-    {
-        private static readonly XNamespace PatchNamespace = "http://www.microsoft.com/msi/patch_applicability.xsd";
-
-        [Fact]
-        public void CanBuildSimplePatch()
-        {
-            var folder = TestData.Get(@"TestData\PatchSingle");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var tempFolder = fs.GetFolder();
-
-                var baselinePdb = BuildMsi("Baseline.msi", folder, tempFolder, "1.0.0", "1.0.0", "1.0.0");
-                var update1Pdb = BuildMsi("Update.msi", folder, tempFolder, "1.0.1", "1.0.1", "1.0.1");
-                var patchPdb = BuildMsp("Patch1.msp", folder, tempFolder, "1.0.1");
-                var patchPath = Path.ChangeExtension(patchPdb, ".msp");
-
-                Assert.True(File.Exists(baselinePdb));
-                Assert.True(File.Exists(update1Pdb));
-
-                var doc = GetExtractPatchXml(patchPath);
-                Assert.Equal("{7D326855-E790-4A94-8611-5351F8321FCA}", doc.Root.Element(PatchNamespace + "TargetProductCode").Value);
-
-                var names = Query.GetSubStorageNames(patchPath);
-                Assert.Equal(new[] { "#RTM.1", "RTM.1" }, names);
-
-                var cab = Path.Combine(tempFolder, "foo.cab");
-                Query.ExtractStream(patchPath, "foo.cab", cab);
-                Assert.True(File.Exists(cab));
-
-                var files = Query.GetCabinetFiles(cab);
-                Assert.Equal(new[] { "a.txt", "b.txt" }, files.Select(f => f.Name).ToArray());
-            }
-        }
-
-        [Fact]
-        public void CanBuildSimplePatchWithNoFileChanges()
-        {
-            var folder = TestData.Get(@"TestData\PatchNoFileChanges");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var tempFolder = fs.GetFolder();
-
-                var baselinePdb = BuildMsi("Baseline.msi", folder, tempFolder, "1.0.0", "1.0.0", "1.0.0");
-                var update1Pdb = BuildMsi("Update.msi", folder, tempFolder, "1.0.1", "1.0.1", "1.0.1");
-                var patchPdb = BuildMsp("Patch1.msp", folder, tempFolder, "1.0.1", hasNoFiles: true);
-                var patchPath = Path.ChangeExtension(patchPdb, ".msp");
-
-                Assert.True(File.Exists(baselinePdb));
-                Assert.True(File.Exists(update1Pdb));
-
-                var doc = GetExtractPatchXml(patchPath);
-                Assert.Equal("{7D326855-E790-4A94-8611-5351F8321FCA}", doc.Root.Element(PatchNamespace + "TargetProductCode").Value);
-
-                var names = Query.GetSubStorageNames(patchPath);
-                Assert.Equal(new[] { "#RTM.1", "RTM.1" }, names);
-
-                var cab = Path.Combine(tempFolder, "foo.cab");
-                Query.ExtractStream(patchPath, "foo.cab", cab);
-                Assert.True(File.Exists(cab));
-
-                var files = Query.GetCabinetFiles(cab);
-                Assert.Empty(files);
-            }
-        }
-
-        [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6387")]
-        public void CanBuildPatchFromProductWithFilesFromWixlib()
-        {
-            var folder = TestData.Get(@"TestData\PatchFromWixlib");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var tempFolderBaseline = fs.GetFolder();
-                var tempFolderUpdate = fs.GetFolder();
-                var tempFolderPatch = fs.GetFolder();
-
-                var baselinePdb = BuildMsi("Baseline.msi", folder, tempFolderBaseline, "1.0.0", "1.0.0", "1.0.0");
-                var update1Pdb = BuildMsi("Update.msi", folder, tempFolderUpdate, "1.0.1", "1.0.1", "1.0.1");
-                var patchPdb = BuildMsp("Patch1.msp", folder, tempFolderPatch, "1.0.1", bindpaths: new[] { Path.GetDirectoryName(baselinePdb), Path.GetDirectoryName(update1Pdb) }, hasNoFiles: true);
-                var patchPath = Path.ChangeExtension(patchPdb, ".msp");
-
-                Assert.True(File.Exists(baselinePdb));
-                Assert.True(File.Exists(update1Pdb));
-            }
-        }
-
-        [Fact]
-        public void CanBuildBundleWithNonSpecificPatches()
-        {
-            var folder = TestData.Get(@"TestData\PatchNonSpecific");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var tempFolder = fs.GetFolder();
-
-                var baselinePdb = BuildMsi("Baseline.msi", Path.Combine(folder, "PackageA"), tempFolder, "1.0.0", "A", "B");
-                var updatePdb = BuildMsi("Update.msi", Path.Combine(folder, "PackageA"), tempFolder, "1.0.1", "A", "B");
-                var patchAPdb = BuildMsp("PatchA.msp", Path.Combine(folder, "PatchA"), tempFolder, "1.0.1", hasNoFiles: true);
-                var patchBPdb = BuildMsp("PatchB.msp", Path.Combine(folder, "PatchB"), tempFolder, "1.0.1", hasNoFiles: true);
-                var patchCPdb = BuildMsp("PatchC.msp", Path.Combine(folder, "PatchC"), tempFolder, "1.0.1", hasNoFiles: true);
-                var bundleAPdb = BuildBundle("BundleA.exe", Path.Combine(folder, "BundleA"), tempFolder);
-                var bundleBPdb = BuildBundle("BundleB.exe", Path.Combine(folder, "BundleB"), tempFolder);
-                var bundleCPdb = BuildBundle("BundleC.exe", Path.Combine(folder, "BundleC"), tempFolder);
-
-                VerifyPatchTargetCodes(bundleAPdb, new[]
-                {
-                    "<PatchTargetCode TargetCode='{26309973-0A5E-4979-B142-98A6E064EDC0}' Product='yes' />",
-                });
-                VerifyPatchTargetCodes(bundleBPdb, new[]
-                {
-                    "<PatchTargetCode TargetCode='{26309973-0A5E-4979-B142-98A6E064EDC0}' Product='yes' />",
-                    "<PatchTargetCode TargetCode='{32B0396A-CE36-4570-B16E-F88FA42DC409}' Product='no' />",
-                });
-                VerifyPatchTargetCodes(bundleCPdb, new string[0]);
-            }
-        }
-
-        [Fact]
-        public void CanBuildBundleWithSlipstreamPatch()
-        {
-            var folder = TestData.Get(@"TestData\PatchSingle");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var tempFolder = fs.GetFolder();
-
-                var baselinePdb = BuildMsi("Baseline.msi", folder, tempFolder, "1.0.0", "1.0.0", "1.0.0");
-                var update1Pdb = BuildMsi("Update.msi", folder, tempFolder, "1.0.1", "1.0.1", "1.0.1");
-                var patchPdb = BuildMsp("Patch1.msp", folder, tempFolder, "1.0.1");
-                var bundleAPdb = BuildBundle("BundleA.exe", Path.Combine(folder, "BundleA"), tempFolder);
-
-                using (var wixOutput = WixOutput.Read(bundleAPdb))
-                {
-                    var manifestData = wixOutput.GetData(BurnConstants.BurnManifestWixOutputStreamName);
-                    var doc = new XmlDocument();
-                    doc.LoadXml(manifestData);
-                    var nsmgr = BundleExtractor.GetBurnNamespaceManager(doc, "w");
-                    var slipstreamMspNodes = doc.SelectNodes("/w:BurnManifest/w:Chain/w:MsiPackage/w:SlipstreamMsp", nsmgr);
-                    Assert.Equal(1, slipstreamMspNodes.Count);
-                    Assert.Equal("<SlipstreamMsp Id='PatchA' />", slipstreamMspNodes[0].GetTestXml());
-                }
-            }
-        }
-
-        private static void VerifyPatchTargetCodes(string pdbPath, string[] expected)
-        {
-            using (var wixOutput = WixOutput.Read(pdbPath))
-            {
-                var manifestData = wixOutput.GetData(BurnConstants.BurnManifestWixOutputStreamName);
-                var doc = new XmlDocument();
-                doc.LoadXml(manifestData);
-                var nsmgr = BundleExtractor.GetBurnNamespaceManager(doc, "w");
-                var patchTargetCodes = doc.SelectNodes("/w:BurnManifest/w:PatchTargetCode", nsmgr);
-
-                var actual = new List<string>();
-                foreach (XmlNode patchTargetCodeNode in patchTargetCodes)
-                {
-                    actual.Add(patchTargetCodeNode.GetTestXml());
-                }
-
-                WixAssert.CompareLineByLine(expected, actual.ToArray());
-            }
-        }
-
-        private static string BuildMsi(string outputName, string sourceFolder, string baseFolder, string defineV, string defineA, string defineB)
-        {
-            var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath);
-            var outputPath = Path.Combine(baseFolder, Path.Combine("bin", outputName));
-
-            var result = WixRunner.Execute(new[]
-            {
-                "build",
-                Path.Combine(sourceFolder, @"Package.wxs"),
-                "-d", "V=" + defineV,
-                "-d", "A=" + defineA,
-                "-d", "B=" + defineB,
-                "-bindpath", Path.Combine(sourceFolder, ".data"),
-                "-intermediateFolder", Path.Combine(baseFolder, "obj"),
-                "-o", outputPath,
-                "-ext", extensionPath,
-            });
-
-            result.AssertSuccess();
-
-            return Path.ChangeExtension(outputPath, ".wixpdb");
-        }
-
-        private static string BuildMsp(string outputName, string sourceFolder, string baseFolder, string defineV, IEnumerable<string> bindpaths = null, bool hasNoFiles = false)
-        {
-            var outputPath = Path.Combine(baseFolder, Path.Combine("bin", outputName));
-
-            var args = new List<string>
-            {
-                "build",
-                hasNoFiles ? "-sw1079" : " ",
-                Path.Combine(sourceFolder, @"Patch.wxs"),
-                "-d", "V=" + defineV,
-                "-bindpath", Path.Combine(baseFolder, "bin"),
-                "-intermediateFolder", Path.Combine(baseFolder, "obj"),
-                "-o", outputPath
-            };
-
-            foreach (var additionaBindPath in bindpaths ?? Enumerable.Empty<string>())
-            {
-                args.Add("-bindpath");
-                args.Add(additionaBindPath);
-            }
-
-            var result = WixRunner.Execute(args.ToArray());
-
-            result.AssertSuccess();
-
-            return Path.ChangeExtension(outputPath, ".wixpdb");
-        }
-
-        private static string BuildBundle(string outputName, string sourceFolder, string baseFolder)
-        {
-            var outputPath = Path.Combine(baseFolder, Path.Combine("bin", outputName));
-
-            var result = WixRunner.Execute(new[]
-            {
-                "build",
-                Path.Combine(sourceFolder, @"Bundle.wxs"),
-                Path.Combine(sourceFolder, "..", "..", "BundleWithPackageGroupRef", "Bundle.wxs"),
-                "-bindpath", Path.Combine(sourceFolder, "..", "..", "SimpleBundle", "data"),
-                "-bindpath", Path.Combine(baseFolder, "bin"),
-                "-intermediateFolder", Path.Combine(baseFolder, "obj"),
-                "-o", outputPath
-            });
-
-            result.AssertSuccess();
-
-            return Path.ChangeExtension(outputPath, ".wixpdb");
-        }
-
-        private static XDocument GetExtractPatchXml(string path)
-        {
-            var buffer = new StringBuilder(65535);
-            var size = buffer.Capacity;
-
-            var er = MsiExtractPatchXMLData(path, 0, buffer, ref size);
-            if (er != 0)
-            {
-                throw new Win32Exception(er);
-            }
-
-            return XDocument.Parse(buffer.ToString());
-        }
-
-        [DllImport("msi.dll", EntryPoint = "MsiExtractPatchXMLDataW", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        private static extern int MsiExtractPatchXMLData(string szPatchPath, int dwReserved, StringBuilder szXMLData, ref int pcchXMLData);
-
-        [DllImport("msi.dll", EntryPoint = "MsiApplyPatchW", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        private static extern int MsiApplyPatch(string szPatchPackage, string szInstallPackage, int eInstallType, string szCommandLine);
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/PayloadFixture.cs b/src/test/WixToolsetTest.CoreIntegration/PayloadFixture.cs
deleted file mode 100644
index 23f6a9ba..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/PayloadFixture.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Xml;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core;
-    using WixToolset.Core.TestPackage;
-    using WixToolset.Data;
-    using WixToolset.Data.Symbols;
-    using Xunit;
-
-    public class PayloadFixture
-    {
-        [Fact]
-        public void CanParseValidName()
-        {
-            var folder = TestData.Get(@"TestData\Payload");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var wixlibPath = Path.Combine(intermediateFolder, @"test.wixlib");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "ValidName.wxs"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", wixlibPath,
-                });
-
-                result.AssertSuccess();
-
-                Assert.Empty(result.Messages);
-
-                var intermediate = Intermediate.Load(wixlibPath);
-                var allSymbols = intermediate.Sections.SelectMany(s => s.Symbols);
-                var payloadSymbol = allSymbols.OfType<WixBundlePayloadSymbol>()
-                                              .SingleOrDefault();
-                Assert.NotNull(payloadSymbol);
-
-                var fields = payloadSymbol.Fields.Select(field => field?.Type == IntermediateFieldType.Bool
-                                                        ? field.AsNullableNumber()?.ToString()
-                                                        : field?.AsString())
-                                                .ToList();
-                Assert.Equal(@"dir\file.ext", fields[(int)WixBundlePayloadSymbolFields.Name]);
-            }
-        }
-
-        [Fact]
-        public void CanCanonicalizeName()
-        {
-            var folder = TestData.Get(@"TestData\Payload");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var wixlibPath = Path.Combine(intermediateFolder, @"test.wixlib");
-
-                var result = WixRunner.Execute(warningsAsErrors: false, new[]
-                {
-                    "build",
-                    Path.Combine(folder, "CanonicalizeName.wxs"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", wixlibPath,
-                });
-
-                result.AssertSuccess();
-
-                Assert.Single(result.Messages, m => m.Id == (int)WarningMessages.Ids.PathCanonicalized);
-
-                var intermediate = Intermediate.Load(wixlibPath);
-                var allSymbols = intermediate.Sections.SelectMany(s => s.Symbols);
-                var payloadSymbol = allSymbols.OfType<WixBundlePayloadSymbol>()
-                                              .SingleOrDefault();
-                Assert.NotNull(payloadSymbol);
-
-                var fields = payloadSymbol.Fields.Select(field => field?.Type == IntermediateFieldType.Bool
-                                                        ? field.AsNullableNumber()?.ToString()
-                                                        : field?.AsString())
-                                                .ToList();
-                Assert.Equal(@"c\d.exe", fields[(int)WixBundlePayloadSymbolFields.Name]);
-            }
-        }
-
-        [Fact]
-        public void RejectsAbsoluteName()
-        {
-            var folder = TestData.Get(@"TestData\Payload");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var wixlibPath = Path.Combine(intermediateFolder, @"test.wixlib");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "AbsoluteName.wxs"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", wixlibPath,
-                });
-
-                Assert.InRange(result.ExitCode, 2, int.MaxValue);
-
-                var expectedIllegalRelativeLongFileName = 1;
-                var expectedPayloadMustBeRelativeToCache = 2;
-                Assert.Equal(expectedIllegalRelativeLongFileName, result.Messages.Where(m => m.Id == (int)ErrorMessages.Ids.IllegalRelativeLongFilename).Count());
-                Assert.Equal(expectedPayloadMustBeRelativeToCache, result.Messages.Where(m => m.Id == (int)ErrorMessages.Ids.PayloadMustBeRelativeToCache).Count());
-            }
-        }
-
-        [Fact]
-        public void RejectsPayloadSharedBetweenPackageAndBA()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var bundlePath = Path.Combine(baseFolder, @"bin\test.exe");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Payload", "SharedBAAndPackagePayloadBundle.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", Path.Combine(folder, ".Data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundlePath,
-                });
-
-                Assert.Equal((int)LinkerErrors.Ids.PayloadSharedWithBA, result.ExitCode);
-            }
-        }
-
-        [Fact]
-        public void ReplacesDownloadUrlPlaceholders()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var bundlePath = Path.Combine(baseFolder, @"bin\test.exe");
-                var baFolderPath = Path.Combine(baseFolder, "ba");
-                var extractFolderPath = Path.Combine(baseFolder, "extract");
-
-                var result = WixRunner.Execute(false, new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Payload", "DownloadUrlPlaceholdersBundle.wxs"),
-                    Path.Combine(folder, "SimpleBundle", "MultiFileBootstrapperApplication.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-bindpath", Path.Combine(folder, ".Data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundlePath,
-                });
-
-                result.AssertSuccess();
-
-                WixAssert.CompareLineByLine(new string[]
-                {
-                    "The Payload 'burn.exe' is being added to Container 'PackagesContainer', overriding its Compressed value of 'no'.",
-                }, result.Messages.Select(m => m.ToString()).ToArray());
-
-                Assert.True(File.Exists(bundlePath));
-
-                var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
-                extractResult.AssertSuccess();
-
-                var ignoreAttributesByElementName = new Dictionary<string, List<string>>
-                {
-                    { "Container", new List<string> { "FileSize", "Hash" } },
-                    { "Payload", new List<string> { "FileSize", "Hash" } },
-                };
-                var payloads = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Payload")
-                                            .Cast<XmlElement>()
-                                            .Select(e => e.GetTestXml(ignoreAttributesByElementName))
-                                            .ToArray();
-                WixAssert.CompareLineByLine(new string[]
-                {
-                    "<Payload Id='burn.exe' FilePath='burn.exe' FileSize='*' Hash='*' Packaging='embedded' SourcePath='a0' Container='PackagesContainer' />",
-                    "<Payload Id='test.msi' FilePath='test.msi' FileSize='*' Hash='*' DownloadUrl='http://example.com/id/test.msi/test.msi' Packaging='external' SourcePath='test.msi' />",
-                    "<Payload Id='LayoutOnlyPayload' FilePath='DownloadUrlPlaceholdersBundle.wxs' FileSize='*' Hash='*' LayoutOnly='yes' DownloadUrl='http://example.com/id/LayoutOnlyPayload/DownloadUrlPlaceholdersBundle.wxs' Packaging='external' SourcePath='DownloadUrlPlaceholdersBundle.wxs' />",
-                   @"<Payload Id='fhuZsOcBDTuIX8rF96kswqI6SnuI' FilePath='MsiPackage\test.txt' FileSize='*' Hash='*' Packaging='external' SourcePath='MsiPackage\test.txt' />",
-                   @"<Payload Id='faf_OZ741BG7SJ6ZkcIvivZ2Yzo8' FilePath='MsiPackage\Shared.dll' FileSize='*' Hash='*' Packaging='external' SourcePath='MsiPackage\Shared.dll' />",
-                }, payloads);
-
-                var containers = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Container")
-                                              .Cast<XmlElement>()
-                                              .Select(e => e.GetTestXml(ignoreAttributesByElementName))
-                                              .ToArray();
-                WixAssert.CompareLineByLine(new string[]
-                {
-                    "<Container Id='PackagesContainer' FileSize='*' Hash='*' DownloadUrl='http://example.com/id/PackagesContainer/packages.cab' FilePath='packages.cab' />",
-                }, containers);
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs b/src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs
deleted file mode 100644
index ae8a1bcc..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System.IO;
-    using System.Linq;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core;
-    using WixToolset.Core.TestPackage;
-    using WixToolset.Data;
-    using WixToolset.Data.Symbols;
-    using WixToolset.Extensibility.Data;
-    using WixToolset.Extensibility.Services;
-    using Xunit;
-
-    public class PreprocessorFixture
-    {
-        [Fact]
-        public void PreprocessDirectly()
-        {
-            var folder = TestData.Get(@"TestData\IncludePath");
-            var sourcePath = Path.Combine(folder, "Package.wxs");
-            var includeFolder = Path.Combine(folder, "data");
-            var includeFile = Path.Combine(includeFolder, "Package.wxi");
-
-            var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider();
-
-            var context = serviceProvider.GetService<IPreprocessContext>();
-            context.SourcePath = sourcePath;
-            context.IncludeSearchPaths = new[] { includeFolder };
-
-            var preprocessor = serviceProvider.GetService<IPreprocessor>();
-            var result = preprocessor.Preprocess(context);
-
-            var includedFile = result.IncludedFiles.Single();
-            Assert.NotNull(result.Document);
-            Assert.Equal(includeFile, includedFile.Path);
-            Assert.Equal(sourcePath, includedFile.SourceLineNumbers.FileName);
-            Assert.Equal(1, includedFile.SourceLineNumbers.LineNumber.Value);
-            Assert.Equal($"{sourcePath}*1", includedFile.SourceLineNumbers.QualifiedFileName);
-            Assert.Null(includedFile.SourceLineNumbers.Parent);
-        }
-
-        [Fact]
-        public void IncludeSourceLineNumbersPreserved()
-        {
-            var folder = TestData.Get(@"TestData\IncludePath");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(warningsAsErrors: false, new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-includepath", Path.Combine(folder, "data"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                using (var output = WixOutput.Read(Path.Combine(baseFolder, @"bin\test.wixpdb")))
-                {
-                    var intermediate = Intermediate.Load(output);
-                    var component = intermediate.Sections.Single().Symbols.OfType<ComponentSymbol>().Single();
-                    Assert.Equal(3, component.SourceLineNumbers.LineNumber);
-                    Assert.Equal(5, component.SourceLineNumbers.Parent.LineNumber);
-
-                    var encoded = component.SourceLineNumbers.GetEncoded();
-                    var decoded = SourceLineNumber.CreateFromEncoded(encoded);
-                    Assert.Equal(3, decoded.LineNumber);
-                    Assert.Equal(5, decoded.Parent.LineNumber);
-                }
-            }
-        }
-
-        [Fact]
-        /// <remarks>
-        /// This test will fail on 32-bit operating systems because it depends on "CommonProgramFiles(x86)"
-        /// which is only defined on 64-bit Windows.
-        /// </remarks>
-        public void SupportParensInEnvironmentVariables()
-        {
-            var folder = TestData.Get(@"TestData", "Preprocessor");
-
-            var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider();
-            var context = serviceProvider.GetService<IPreprocessContext>();
-            context.SourcePath = Path.Combine(folder, "EnvParens.wxs");
-
-            var preprocessor = serviceProvider.GetService<IPreprocessor>();
-            var result = preprocessor.Preprocess(context);
-            Assert.NotNull(result.Document);
-        }
-
-        [Fact]
-        public void VariableRedefinitionIsAWarning()
-        {
-            var folder = TestData.Get(@"TestData\Variables");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(warningsAsErrors: false, new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                var warning = result.Messages.Where(message => message.Id == (int)WarningMessages.Ids.VariableDeclarationCollision);
-                Assert.Single(warning);
-            }
-        }
-
-        [Fact]
-        public void ForEachLoopsWork()
-        {
-            var folder = TestData.Get(@"TestData\ForEach");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-            }
-        }
-
-        [Fact]
-        public void NonterminatedPreprocessorInstructionShowsSourceLineNumber()
-        {
-            var folder = TestData.Get(@"TestData\BadIf");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                });
-
-                Assert.Equal(147, result.ExitCode);
-                Assert.StartsWith("Found a <?if?>", result.Messages.Single().ToString());
-            }
-        }
-    }
-}
-
diff --git a/src/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs
deleted file mode 100644
index e4d95b5d..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Text;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using WixToolset.Data;
-    using Xunit;
-
-    public class RegistryFixture
-    {
-        [Fact]
-        public void PopulatesRegistryTableFromRegistryValue()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Registry", "RegistryValue.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "Registry" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Registry:reg04OIwIchl.9ZTjisTT6NzGSsQSM\t2\tPath\\To\\AnotherKey\tSecret\t#x\tMiscComponent",
-                    "Registry:regEblTuusqFNSUQNy88zaP_UA5kIY\t2\tPath\\To\\Key\t\t1.0.1234.123\tMiscComponent",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesRegistryTableFromRegistryValueMultiString()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Registry", "RegistryValueMultiString.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                var results = Query.QueryDatabase(msiPath, new[] { "Registry" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Registry:regitq_Wx9LfvJuNSc2un6gIHAzr4A\t2\tPath\\To\\AnotherKey\tSecret\t#x\tMultiStringComponent",
-                    "Registry:regmeTJMpOD41igfxhTcUVZ7kNG1Mo\t2\tPath\\To\\Key\t\ta[~]b[~][~]c[~]\tMultiStringComponent",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void DuplicateRegistryValueIdsAreDetectedSmoothly()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Registry", "DuplicateRegistryValueIds.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                }, out var messages);
-
-                Assert.Equal(2, messages.Where(m => m.Id == (int)ErrorMessages.Ids.DuplicateSymbol).Count());
-                Assert.Equal(2, messages.Where(m => m.Id == (int)ErrorMessages.Ids.DuplicateSymbol2).Count());
-            }
-        }
-
-        [Fact]
-        public void PopulatesRegistryTableFromRemoveRegistryKey()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Registry", "RemoveRegistryKey.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "Registry" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Registry:RemoveAKeyName\t2\tAKeyName\t-\t\tRemoveRegistryKeyComp",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesRegistryTableWithoutExtraBackslash()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Registry", "RegistryKeyEndingWithBackslash.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "Registry" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Registry:reg1\t2\tSoftware\\WBM\\WB\t*\t\tMiscComponent",
-                    "Registry:reg2\t2\tSoftware\\WBM\\WB\tInstallationPath\t[INSTALLFOLDER]\tMiscComponent",
-                }, results);
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/RollbackBoundaryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/RollbackBoundaryFixture.cs
deleted file mode 100644
index 9e19abb0..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/RollbackBoundaryFixture.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System.IO;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using Xunit;
-
-    public class RollbackBoundaryFixture
-    {
-        [Fact]
-        public void CanStartChainWithRollbackBoundary()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var exePath = Path.Combine(baseFolder, @"bin\test.exe");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "RollbackBoundary", "BeginningOfChain.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
-                    Path.Combine(folder, "BundleWithPackageGroupRef", "MinimalPackageGroup.wxs"),
-                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", exePath,
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(exePath));
-            }
-        }
-
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/ShortcutFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ShortcutFixture.cs
deleted file mode 100644
index 3b6c50c0..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/ShortcutFixture.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System.IO;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using Xunit;
-
-    public class ShortcutFixture
-    {
-        [Fact]
-        public void CanBuildShortcutNameWithShortname()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Shortcut", "ShortcutSameNameShortName.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                var results = Query.QueryDatabase(msiPath, new[] { "Shortcut" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Shortcut:sctzJpBYlrhdx4Mm9Xh41X0KPWYiX0\tINSTALLFOLDER\tDaName\tShortcutComp\t[#filcV1yrx0x8wJWj4qMzcH21jwkPko]\t\t\t\t\t\t\t\t\t\t\t",
-                }, results);
-            }
-        }
-
-        [Fact]
-        public void PopulatesMsiShortcutPropertyTable()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Shortcut", "ShortcutProperty.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "MsiShortcutProperty", "Shortcut" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "MsiShortcutProperty:scp4GOCIx4Eskci4nBG1MV_vSUOZt4\tTheShortcut\tCustomShortcutKey\tCustomShortcutValue",
-                    "Shortcut:TheShortcut\tINSTALLFOLDER\td\tShortcutComp\t[#filcV1yrx0x8wJWj4qMzcH21jwkPko]\t\t\t\t\t\t\t\t\t\t\t",
-                }, results);
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/SoftwareTagFixture.cs b/src/test/WixToolsetTest.CoreIntegration/SoftwareTagFixture.cs
deleted file mode 100644
index 15276b18..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/SoftwareTagFixture.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System.IO;
-    using System.Linq;
-    using System.Xml.Linq;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using WixToolset.Data;
-    using Xunit;
-
-    public class SoftwareTagFixture
-    {
-        private static readonly XNamespace BurnManifestNamespace = "http://wixtoolset.org/schemas/v4/2008/Burn";
-        private static readonly XNamespace SwidTagNamespace = "http://standards.iso.org/iso/19770/-2/2009/schema.xsd";
-
-        [Fact]
-        public void CanBuildPackageWithTag()
-        {
-            var folder = TestData.Get(@"TestData\ProductTag");
-            var build = new Builder(folder, null, new[] { folder });
-
-            var results = build.BuildAndQuery(Build, "File", "SoftwareIdentificationTag");
-
-            var replacePackageCodeStart = results[2].IndexOf("\tmsi:package/") + "\tmsi:package/".Length;
-            var replacePackageCodeEnd = results[2].IndexOf("\t", replacePackageCodeStart);
-            results[2] = results[2].Substring(0, replacePackageCodeStart) + "???" + results[2].Substring(replacePackageCodeEnd);
-            WixAssert.CompareLineByLine(new[]
-            {
-                "File:filF5_pLhBuF5b4N9XEo52g_hUM5Lo\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\texample.txt\t20\t\t\t512\t1",
-                "File:tagEYRYWwOt95punO7qPPAQ9p1GBpY\ttagEYRYWwOt95punO7qPPAQ9p1GBpY\trdcfonyt.swi|~TagTestPackage.swidtag\t449\t\t\t1\t2",
-                "SoftwareIdentificationTag:tagEYRYWwOt95punO7qPPAQ9p1GBpY\twixtoolset.org\tmsi:package/???\tmsi:upgrade/047730A5-30FE-4A62-A520-DA9381B8226A\t"
-            }, results.ToArray());
-        }
-
-        [Fact]
-        public void CanBuildBundleWithTag()
-        {
-            var testDataFolder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(testDataFolder, "ProductTag", "PackageWithTag.wxs"),
-                    Path.Combine(testDataFolder, "ProductTag", "PackageComponents.wxs"),
-                    "-loc", Path.Combine(testDataFolder, "ProductTag", "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(testDataFolder, "ProductTag"),
-                    "-intermediateFolder", Path.Combine(intermediateFolder, "package"),
-                    "-o", Path.Combine(baseFolder, "package", @"test.msi")
-                });
-
-                result.AssertSuccess();
-
-                result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(testDataFolder, "BundleTag", "BundleWithTag.wxs"),
-                    "-bindpath", Path.Combine(testDataFolder, "BundleTag"),
-                    "-bindpath", Path.Combine(baseFolder, "package"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.exe")
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.exe")));
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb")));
-
-                using (var ouput = WixOutput.Read(Path.Combine(baseFolder, @"bin\test.wixpdb")))
-                {
-                    var badata = ouput.GetDataStream("wix-burndata.xml");
-                    var doc = XDocument.Load(badata);
-
-                    var swidTag = doc.Root.Element(BurnManifestNamespace + "Registration").Element(BurnManifestNamespace + "SoftwareTag").Value;
-
-                    var swidTagPath = Path.Combine(baseFolder, "test.swidtag");
-                    File.WriteAllText(swidTagPath, swidTag);
-
-                    var docTag = XDocument.Load(swidTagPath);
-                    var title = docTag.Root.Attribute("name").Value;
-                    var version = docTag.Root.Attribute("version").Value;
-                    Assert.Equal("~TagTestBundle", title);
-                    Assert.Equal("4.3.2.1", version);
-                }
-            }
-        }
-
-        private static void Build(string[] args)
-        {
-            var result = WixRunner.Execute(args)
-                                  .AssertSuccess();
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/.Data/burn.exe b/src/test/WixToolsetTest.CoreIntegration/TestData/.Data/burn.exe
deleted file mode 100644
index 2a4f423f..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/.Data/burn.exe
+++ /dev/null
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/AppId/Advertised.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/AppId/Advertised.wxs
deleted file mode 100644
index b34c547d..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/AppId/Advertised.wxs
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <Component Id="AppIdComp" Directory="INSTALLFOLDER" Guid="171BEE79-43CC-4A28-892F-7EFAC696FA4B">
-                <File Id="AppIdComp.txt" Source="test.txt" Name="AppIdComp.txt"></File>
-                <AppId Id="D6040299-B15C-4C94-AE26-0C9B60D14C35" Advertise="yes" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/ComponentSearch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/ComponentSearch.wxs
deleted file mode 100644
index 4dd701f0..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/ComponentSearch.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup"></ComponentGroupRef>
-        </ComponentGroup>
-
-        <Property Id="SAMPLECOMPFOUND">
-            <ComponentSearch Id="SampleCompSearch" Guid="{4D9A0D20-D0CC-40DE-B580-EAD38B985217}"></ComponentSearch>
-        </Property>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs
deleted file mode 100644
index 6b9fe013..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs
+++ /dev/null
@@ -1,42 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Codepage="1252" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{12E4699F-E774-4D05-8A01-5BDD41BBA127}" Version="1.0.0.0" ProductCode="{33C58183-7333-4257-AEFD-6705DA66E617}">
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="ykd0udtb">
-        <Component Id="test.txt" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Bitness="always32">
-        <File Id="test.txt" Name="test.txt" KeyPath="yes" Source="MsiPackage\test.txt" />
-        </Component>
-      </Directory>
-    </StandardDirectory>
-    <Feature Id="ProductFeature" Level="1" Title="MsiPackageTitle">
-      <ComponentRef Id="test.txt" />
-    </Feature>
-    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-    <Media Id="1" />
-    <Property Id="SAMPLEREGFOUND">
-      <RegistrySearch Id="RegSearch" Root="HKLM" Key="Reg" Type="raw" Bitness="always32" />
-    </Property>
-    <Property Id="NESTEDDIRFOUND">
-      <RegistrySearch Id="ARegKeySearch" Root="HKLM" Key="ARegKey" Type="raw" Bitness="always32">
-        <DirectorySearch Id="TopDirSearch" Path="TopDir">
-          <DirectorySearch Id="SecondDirSearch" Path="SecondDir">
-            <DirectorySearch Id="ThirdDirSearch" Path="ThirdDir">
-              <DirectorySearch Id="FourthDirSearch" Path="FourthDir" />
-            </DirectorySearch>
-          </DirectorySearch>
-        </DirectorySearch>
-      </RegistrySearch>
-    </Property>
-    <Property Id="SAMPLENESTEDDIRFOUND">
-      <RegistrySearch Id="NestedRegSearch" Root="HKLM" Key="NestedReg" Type="raw" Bitness="always32">
-        <DirectorySearch Id="SampleNestedDirSearch" Path="NestedDir" />
-      </RegistrySearch>
-    </Property>
-    <Property Id="SAMPLEDIRFOUND">
-      <RegistrySearch Id="SubRegSearch" Root="HKLM" Key="SampleReg" Type="raw" Bitness="always32">
-        <DirectorySearch Id="SampleDirSearch" Path="SampleDir">
-          <DirectorySearch Id="SubDirSearch" Path="Subdir" />
-        </DirectorySearch>
-      </RegistrySearch>
-    </Property>
-  </Package>
-</Wix>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DirectorySearch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DirectorySearch.wxs
deleted file mode 100644
index e255c83d..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DirectorySearch.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup"></ComponentGroupRef>
-        </ComponentGroup>
-
-        <Property Id="SAMPLEDIRFOUND">
-            <DirectorySearch Id="SampleDirSearch" AssignToProperty="yes" Path="C:\SampleDir"></DirectorySearch>
-        </Property>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/FileSearch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/FileSearch.wxs
deleted file mode 100644
index c17d9848..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/FileSearch.wxs
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup"></ComponentGroupRef>
-        </ComponentGroup>
-
-        <Property Id="SAMPLEFILEFOUND">
-            <IniFileSearch Id="SampleIniFileSearch" Name="sample.fil" Section="MySection" Key="MyKey">
-                <FileSearch Id="SampleFileSearch" Name="sample.fil"></FileSearch>
-            </IniFileSearch>
-        </Property>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/NestedDirSearchUnderRegSearch.msi b/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/NestedDirSearchUnderRegSearch.msi
deleted file mode 100644
index ea1296c3..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/NestedDirSearchUnderRegSearch.msi
+++ /dev/null
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/RegistrySearch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/RegistrySearch.wxs
deleted file mode 100644
index f800264d..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/RegistrySearch.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup"></ComponentGroupRef>
-        </ComponentGroup>
-
-        <Property Id="SAMPLEREGFOUND">
-            <RegistrySearch Id="SampleRegSearch" Root="HKLM" Key="SampleReg" Type="raw"></RegistrySearch>
-        </Property>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/RegistrySearch64.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/RegistrySearch64.wxs
deleted file mode 100644
index 8be5abb2..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/RegistrySearch64.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup"></ComponentGroupRef>
-        </ComponentGroup>
-
-        <Property Id="SAMPLEREGFOUND">
-            <RegistrySearch Id="SampleRegSearch" Root="HKLM" Key="SampleReg" Type="raw" Bitness="always64"></RegistrySearch>
-        </Property>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs
deleted file mode 100644
index c345305d..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs
+++ /dev/null
@@ -1,17 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="AssemblyMsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
-    
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="AssemblyMsiPackage" />
-    </StandardDirectory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/PackageComponents.wxs
deleted file mode 100644
index e0c84c63..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/PackageComponents.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-       <Component>
-         <File Source="candle.exe" Assembly=".net" />
-       </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Win32Assembly.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Win32Assembly.wxs
deleted file mode 100644
index 45cc7114..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Win32Assembly.wxs
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <Component Directory="INSTALLFOLDER">
-                <File Id="test.txt" Source="test.txt" Assembly="win32" AssemblyManifest="test.dll.manifest" />
-            </Component>
-            <Component Id="test.dll.manifest" Directory="INSTALLFOLDER">
-                <File Id="test.dll.manifest" Source="test.manifest" Name="test.dll.manifest"></File>
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/data/candle.exe b/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/data/candle.exe
deleted file mode 100644
index 18129b73..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/data/candle.exe
+++ /dev/null
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/data/test.manifest b/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/data/test.manifest
deleted file mode 100644
index 0da1f6d0..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/data/test.manifest
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <!-- UAC Manifest Options
-             If you want to change the Windows User Account Control level replace the 
-             requestedExecutionLevel node with one of the following.
-
-        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
-        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
-        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
-
-            Specifying requestedExecutionLevel element will disable file and registry virtualization. 
-            Remove this element if your application requires this virtualization for backwards
-            compatibility.
-        -->
-        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- A list of the Windows versions that this application has been tested on
-           and is designed to work with. Uncomment the appropriate elements
-           and Windows will automatically select the most compatible environment. -->
-
-      <!-- Windows Vista -->
-      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
-
-      <!-- Windows 7 -->
-      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
-
-      <!-- Windows 8 -->
-      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
-
-      <!-- Windows 8.1 -->
-      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
-
-      <!-- Windows 10 -->
-      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
-
-    </application>
-  </compatibility>
-
-  <!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
-       DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need 
-       to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should 
-       also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
-  <!--
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
-    </windowsSettings>
-  </application>
-  -->
-
-  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
-  <!--
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity
-          type="win32"
-          name="Microsoft.Windows.Common-Controls"
-          version="6.0.0.0"
-          processorArchitecture="*"
-          publicKeyToken="6595b64144ccf1df"
-          language="*"
-        />
-    </dependentAssembly>
-  </dependency>
-  -->
-
-</assembly>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadEnsureTable/BadEnsureTable.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadEnsureTable/BadEnsureTable.wxs
deleted file mode 100644
index 3caa20ff..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadEnsureTable/BadEnsureTable.wxs
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:ex="http://www.example.com/scheams/v1/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup" />
-        </ComponentGroup>
-
-        <ex:ExampleEnsureTable />
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/Package.wxs
deleted file mode 100644
index 1d7ebb94..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/Package.wxs
+++ /dev/null
@@ -1,24 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="MsiPackage" Language="1033" Version="1.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
-    
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-        <ComponentGroupRef Id="ProductComponents.x86" />
-        <!-- <?if x64 == $(sys.BUILDARCH) ?> -->
-        <!-- <?if arm==$(sys.BUILDARCH) ?> -->
-        <?if $(sys.BUILDARCH) = "x64" ?>
-        <ComponentGroupRef Id="ProductComponents.x64" />
-        <ComponentGroupRef Id="ProductComponents.arm" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-      </Directory>
-    </Directory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/PackageComponents.wxs
deleted file mode 100644
index 2a75e3d7..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/PackageComponents.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?foreach ComponentPlatform in x86;x64;arm ?>
-    <Fragment>
-        <ComponentGroup Id="ProductComponents.$(var.ComponentPlatform)" Directory="INSTALLFOLDER">
-            <Component>
-                <File Name="$(var.ComponentPlatform).dll" Source="test.txt" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-    <?endforeach?>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/BundleVariable.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/BundleVariable.wxs
deleted file mode 100644
index a2d49b18..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/BundleVariable.wxs
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <Variable Name="BadType" Type="doesnotexist" Value="dne" />
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicateCacheIds.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicateCacheIds.wxs
deleted file mode 100644
index 0c350042..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicateCacheIds.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <ExePackage Id="Manual1" SourceFile="burn.exe" Name="manual1\burn.exe" DetectCondition="test" CacheId="!(wix.WixVariable1)" />
-            <ExePackage Id="Manual2" SourceFile="burn.exe" Name="manual2\burn.exe" DetectCondition="test" CacheId="!(wix.WixVariable2)" />
-        </PackageGroup>
-
-        <WixVariable Id="WixVariable1" Value="CollidingCacheId" />
-        <WixVariable Id="WixVariable2" Value="CollidingCacheId" />
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicatePayloadNames.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicatePayloadNames.wxs
deleted file mode 100644
index 4fe7e097..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicatePayloadNames.wxs
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <ExePackage Id="Auto1" SourceFile="burn.exe" CacheId="Auto1" DetectCondition="none" />
-            <ExePackage Id="Auto2" SourceFile="burn.exe" CacheId="Auto2" DetectCondition="none" />
-            <ExePackage Id="DuplicateCacheIds.wxs" SourceFile="$(sys.SOURCEFILEDIR)DuplicateCacheIds.wxs" Compressed="no" DetectCondition="none" Name="PayloadCollision">
-                <Payload SourceFile="$(sys.SOURCEFILEDIR)BundleVariable.wxs" Compressed="no" Name="ContainerCollision" />
-            </ExePackage>
-            <ExePackage Id="HiddenPersistedBundleVariable.wxs" SourceFile="$(sys.SOURCEFILEDIR)HiddenPersistedBundleVariable.wxs" Compressed="no" DetectCondition="none" Name="PayloadCollision" />
-            <PackageGroupRef Id="MsiPackages" />
-        </PackageGroup>
-
-        <PackageGroup Id="MsiPackages">
-            <MsiPackage SourceFile="test.msi">
-                <Payload SourceFile="$(sys.SOURCEFILEDIR)InvalidIds.wxs" Name="MsiPackage\test.txt" />
-                <Payload SourceFile="$(sys.SOURCEFILEDIR)RegistryKey.wxs" Name="test.msi" />
-            </MsiPackage>
-        </PackageGroup>
-
-        <Container Id="MsiPackagesContainer" Type="detached" Name="ContainerCollision">
-            <PackageGroupRef Id="MsiPackages" />
-        </Container>
-
-        <BootstrapperApplication>
-            <Payload Id="DuplicatePayloadNames.wxs" SourceFile="$(sys.SOURCEFILEPATH)" Name="fakeba.dll" />
-            <Payload Id="UnscheduledPackage.wxs" SourceFile="$(sys.SOURCEFILEDIR)UnscheduledPackage.wxs" Name="BootstrapperApplicationData.xml" />
-            <Payload Id="UnscheduledRollbackBoundary.wxs" SourceFile="$(sys.SOURCEFILEDIR)UnscheduledRollbackBoundary.wxs" Name="BundleExtensionData.xml" />
-        </BootstrapperApplication>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/HiddenPersistedBundleVariable.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/HiddenPersistedBundleVariable.wxs
deleted file mode 100644
index 5ebe5472..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/HiddenPersistedBundleVariable.wxs
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <Variable Name="BadType" Hidden="yes" Persisted="yes" Value="dne" />
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/InvalidIds.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/InvalidIds.wxs
deleted file mode 100644
index 78f3ebd3..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/InvalidIds.wxs
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <Component Id="@#$" Guid="{2F18F52A-9E24-4ebe-A5FC-974089AA03D2}" Directory="WixTestFolder">
-            <CreateFolder Directory="WixTestFolder" />
-        </Component>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/RegistryKey.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/RegistryKey.wxs
deleted file mode 100644
index c717680b..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/RegistryKey.wxs
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:ex="http://www.example.com/scheams/v1/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-            <Component Id="MiscComponent" Guid="7C40C257-AB36-4B8C-8FD1-C56E0AC4AAEF">
-                <RegistryKey>
-                  <ex:Example />
-                </RegistryKey>
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledPackage.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledPackage.wxs
deleted file mode 100644
index fc53c4a2..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledPackage.wxs
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <ExePackage Id="Auto1" SourceFile="burn.exe" CacheId="Auto1" DetectCondition="none" />
-            <ExePackage Id="Auto2" SourceFile="burn.exe" CacheId="Auto2" DetectCondition="none" />
-        </PackageGroup>
-        <SetVariableRef Id="Dummy" />
-    </Fragment>
-    <Fragment>
-        <SetVariable Id="Dummy" Variable="Dummy" />
-        <PackageGroup Id="Unscheduled">
-            <ExePackage Id="Unscheduled1" SourceFile="burn.exe" CacheId="Unscheduled1" DetectCondition="none" />
-        </PackageGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledRollbackBoundary.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledRollbackBoundary.wxs
deleted file mode 100644
index 6cf8528e..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledRollbackBoundary.wxs
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <ExePackage Id="Auto1" SourceFile="burn.exe" CacheId="Auto1" DetectCondition="none" />
-            <ExePackage Id="Auto2" SourceFile="burn.exe" CacheId="Auto2" DetectCondition="none" />
-        </PackageGroup>
-        <SetVariableRef Id="Dummy" />
-    </Fragment>
-    <Fragment>
-        <SetVariable Id="Dummy" Variable="Dummy" />
-        <PackageGroup Id="Unscheduled">
-            <RollbackBoundary Id="Unscheduled1" />
-        </PackageGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BindVariables/DefaultedVariable.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BindVariables/DefaultedVariable.wxs
deleted file mode 100644
index c3528a67..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BindVariables/DefaultedVariable.wxs
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <Binary Id="Bound" SourceFile="!(wix.Test=data\test.txt)" />
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BindVariables/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/BindVariables/data/test.txt
deleted file mode 100644
index 3b862323..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BindVariables/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BootstrapperApplication/DpiAwareness.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BootstrapperApplication/DpiAwareness.wxs
deleted file mode 100644
index 5b41e807..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BootstrapperApplication/DpiAwareness.wxs
+++ /dev/null
@@ -1,7 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <BootstrapperApplication Id="fakeba">
-      <BootstrapperApplicationDll SourceFile="$(sys.SOURCEFILEPATH)" DpiAwareness="gdiScaled" />
-    </BootstrapperApplication>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleBindVariables/CacheIdFromPackageDescription.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleBindVariables/CacheIdFromPackageDescription.wxs
deleted file mode 100644
index 7f5ea456..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleBindVariables/CacheIdFromPackageDescription.wxs
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <MsiPackage SourceFile="test.msi" CacheId="!(bind.packageDescription.test.msi)" />
-        </PackageGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs
deleted file mode 100644
index e52302d4..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <PackageGroupRef Id="MinimalPackageGroup" />
-        </PackageGroup>
-
-        <BundleCustomData Id="BundleCustomTableBA">
-            <BundleAttributeDefinition Id="Id" />
-            <BundleAttributeDefinition Id="Column2" />
-
-            <BundleElement>
-                <BundleAttribute Id="Id" Value="one" />
-                <BundleAttribute Id="Column2" Value="two" />
-            </BundleElement>
-            <BundleElement>
-                <BundleAttribute Id="Column2" Value="&lt;" />
-                <BundleAttribute Id="Id" Value="&gt;" />
-            </BundleElement>
-        </BundleCustomData>
-
-        <BundleCustomData Id="BundleCustomTableBE" ExtensionId="CustomTableExtension">
-            <BundleAttributeDefinition Id="Id" />
-            <BundleAttributeDefinition Id="Column2" />
-        </BundleCustomData>
-    </Fragment>
-
-    <Fragment>
-        <BundleCustomDataRef Id="BundleCustomTableBA">
-            <BundleElement>
-                <BundleAttribute Id="Id" Value="1" />
-                <BundleAttribute Id="Column2" Value="2" />
-            </BundleElement>
-        </BundleCustomDataRef>
-
-        <BundleCustomDataRef Id="BundleCustomTableBE">
-            <BundleElement>
-                <BundleAttribute Id="Id" Value="one" />
-                <BundleAttribute Id="Column2" Value="two" />
-            </BundleElement>
-            <BundleElement>
-                <BundleAttribute Id="Column2" Value="&lt;" />
-                <BundleAttribute Id="Id" Value="&gt;" />
-            </BundleElement>
-            <BundleElement>
-                <BundleAttribute Id="Id" Value="1" />
-                <BundleAttribute Id="Column2" Value="2" />
-            </BundleElement>
-        </BundleCustomDataRef>
-
-        <BundleExtension Id="CustomTableExtension" SourceFile="fakeba.dll" Name="fakebext.dll" />
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleExtension/BundleExtension.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleExtension/BundleExtension.wxs
deleted file mode 100644
index eefae822..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleExtension/BundleExtension.wxs
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <BundleExtension Id="ExampleBext" SourceFile="fakeba.dll" Name="fakebext.dll" />
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleExtension/BundleExtensionSearches.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleExtension/BundleExtensionSearches.wxs
deleted file mode 100644
index fd8d3698..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleExtension/BundleExtensionSearches.wxs
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:ex="http://www.example.com/scheams/v1/wxs">
-    <Fragment>
-        <ex:ExampleSearch Id="ExampleSearchBar" Variable="SearchBar" Condition="WixBundleInstalled" SearchFor="Bar" />
-        <ex:ExampleSearch Id="ExampleSearchFoo" Variable="SearchFoo" SearchFor="Foo" />
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleExtension/BundleWithSearches.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleExtension/BundleWithSearches.wxs
deleted file mode 100644
index c5a93eb3..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleExtension/BundleWithSearches.wxs
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:ex="http://www.example.com/scheams/v1/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <PackageGroupRef Id="MinimalPackageGroup" />
-        </PackageGroup>
-
-        <ex:ExampleSearchRef Id="ExampleSearchFoo" />
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleExtension/SimpleBundleExtension.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleExtension/SimpleBundleExtension.wxs
deleted file mode 100644
index 7303a05a..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleExtension/SimpleBundleExtension.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <PackageGroupRef Id="MinimalPackageGroup" />
-        </PackageGroup>
-
-        <BundleExtensionRef Id="ExampleBext" />
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleTag/BundleWithTag.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleTag/BundleWithTag.wxs
deleted file mode 100644
index f44fb7bc..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleTag/BundleWithTag.wxs
+++ /dev/null
@@ -1,15 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" >
-  <Bundle Name="~TagTestBundle" Version="4.3.2.1" Manufacturer="Example Corporation" UpgradeCode="047730A5-30FE-4A62-A520-DA9381B8226A">
-    <BootstrapperApplication>
-      <BootstrapperApplicationDll SourceFile="fakeba.dll" />
-    </BootstrapperApplication>
-
-    <SoftwareTag Regid="wixtoolset.org" InstallPath="[ProgramFiles6432Folder]\Test\swidtag" />
-
-    <Chain>
-      <MsiPackage SourceFile="test.msi">
-            <MsiProperty Name="TEST" Value="1" />
-      </MsiPackage>
-    </Chain>
-  </Bundle>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleTag/fakeba.dll b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleTag/fakeba.dll
deleted file mode 100644
index 64061ea0..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleTag/fakeba.dll
+++ /dev/null
@@ -1 +0,0 @@
-This is fakeba.dll.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleWithApprovedExe/Bundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleWithApprovedExe/Bundle.wxs
deleted file mode 100644
index 78e754c1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleWithApprovedExe/Bundle.wxs
+++ /dev/null
@@ -1,5 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Bundle Name="BurnBundle" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="B94478B1-E1F3-4700-9CE8-6AA090854AEC">
-        <ApprovedExeForElevation Id="TestExe" Key="WixToolset\BurnTesting" Value="Test" Bitness="always32" />
-    </Bundle>
-</Wix>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleWithApprovedExe/Bundle64.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleWithApprovedExe/Bundle64.wxs
deleted file mode 100644
index 18cdfd32..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleWithApprovedExe/Bundle64.wxs
+++ /dev/null
@@ -1,5 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Bundle Name="BurnBundle64" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="B94478B1-E1F3-4700-9CE8-6AA090854AEC">
-        <ApprovedExeForElevation Id="TestExe" Key="WixToolset\BurnTesting" Value="Test" Bitness="always64" />
-    </Bundle>
-</Wix>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleWithDetachedContainer/Bundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleWithDetachedContainer/Bundle.wxs
deleted file mode 100644
index a93b23ef..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleWithDetachedContainer/Bundle.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <PackageGroupRef Id="MinimalPackageGroup"/>
-        </PackageGroup>
-        <Container Id="_1" Type="detached">
-            <PackageGroupRef Id="MinimalPackageGroup"/>
-        </Container>
-    </Fragment>
-</Wix>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleWithPackageGroupRef/Bundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleWithPackageGroupRef/Bundle.wxs
deleted file mode 100644
index e738b407..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleWithPackageGroupRef/Bundle.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Bundle Name="BurnBundle" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="B94478B1-E1F3-4700-9CE8-6AA090854AEC">
-        <BootstrapperApplication>
-            <BootstrapperApplicationDll SourceFile="fakeba.dll" />
-        </BootstrapperApplication>
-        <Chain>
-            <PackageGroupRef Id="BundlePackages" />
-        </Chain>
-    </Bundle>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleWithPackageGroupRef/MinimalPackageGroup.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleWithPackageGroupRef/MinimalPackageGroup.wxs
deleted file mode 100644
index b0bde4f6..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleWithPackageGroupRef/MinimalPackageGroup.wxs
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="MinimalPackageGroup">
-            <MsiPackage SourceFile="test.msi" />
-        </PackageGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Class/DecompiledOldClassTableDef.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Class/DecompiledOldClassTableDef.wxs
deleted file mode 100644
index 514f9243..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Class/DecompiledOldClassTableDef.wxs
+++ /dev/null
@@ -1,22 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Codepage="1252" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{12E4699F-E774-4D05-8A01-5BDD41BBA127}" Version="1.0.0.0" ProductCode="{FE17A505-11A9-44D2-8D94-EB6BEAB8FF93}">
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq">
-        <Component Id="ProgIdComp" Guid="{5B3B3FC1-533D-4C29-BFB3-0E88B51E59D8}" Bitness="always32">
-          <Class Id="{F12A6F69-117F-471F-AE73-F8E74218F498}" Context="LocalServer32" Description="FakeClassF12A" Advertise="yes">
-            <ProgId Id="73E7DF7E-EFAC-4E11-90E2-6EBAEB8DE58D" Description="FakeClassF12A" Advertise="yes" />
-          </Class>
-          <File Id="filTki4JQ2gSapF7wK4K1vd.4mDSFQ" Name="ProgIdComp.txt" KeyPath="yes" ShortName="bnvvntsc.txt" Source="MsiPackage\ProgIdComp.txt" />
-          <RegistryValue Id="regUIIK326nDZpkWHuexeF58EikQvA" Root="HKCR" Key="73E7DF7E-EFAC-4E11-90E2-6EBAEB8DE58D" Name="NoOpen" Value="NoOpen73E7" Type="string" />
-          <RegistryValue Id="regY1F4E2lvu_Up6gV6c3jeN5ukn8s" Root="HKCR" Key="CLSID\{F12A6F69-117F-471F-AE73-F8E74218F498}\LocalServer32" Name="ThreadingModel" Value="Apartment" Type="string" />
-          <RegistryValue Id="regvrhMurMp98anbQJkpgA8yJCefdM" Root="HKCR" Key="CLSID\{F12A6F69-117F-471F-AE73-F8E74218F498}\Version" Value="0.0.0.1" Type="string" />
-        </Component>
-      </Directory>
-    </StandardDirectory>
-    <Feature Id="ProductFeature" Level="1" Title="MsiPackageTitle">
-      <ComponentRef Id="ProgIdComp" Primary="yes" />
-    </Feature>
-    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-    <Media Id="1" />
-  </Package>
-</Wix>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Class/IconIndex0.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Class/IconIndex0.wxs
deleted file mode 100644
index c0dc9bc0..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Class/IconIndex0.wxs
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <Component Id="ClassComp" Directory="INSTALLFOLDER" Guid="9BFDA7DC-CA16-40B3-A6B5-961E60B30892">
-                <File Source="test.txt" Name="ClassComp.txt"></File>
-                <Class Id="3FAED4CC-C473-4B8A-BE8B-303871377A4A" Advertise="yes" Context="LocalServer32" Description="FakeClass3FAE" ThreadingModel="apartment" Version="0.0.0.1" Icon="SampleIcon" IconIndex="0" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Class/OldClassTableDef.msi b/src/test/WixToolsetTest.CoreIntegration/TestData/Class/OldClassTableDef.msi
deleted file mode 100644
index 2cd10f09..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Class/OldClassTableDef.msi
+++ /dev/null
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/OtherComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/OtherComponents.wxs
deleted file mode 100644
index 15a9a0ce..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/OtherComponents.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:ex="http://www.example.com/scheams/v1/wxs">
-  <Fragment>
-    <ComponentGroup Id="OtherComponents" Directory="INSTALLFOLDER">
-       <Component>
-         <File Source="other.txt" />
-         <ex:Example Id="Other" Value="Value" />
-       </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/Package.wxs
deleted file mode 100644
index db07af2c..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/Package.wxs
+++ /dev/null
@@ -1,22 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
-    
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <Property Id="ExampleProperty" Value="$(ex.Test)" />
-
-    <PropertyRef Id="PropertyFromExampleWir" />
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
-      <ComponentGroupRef Id="OtherComponents" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-    </StandardDirectory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/PackageComponents.wxs
deleted file mode 100644
index 7f17b538..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/PackageComponents.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:ex="http://www.example.com/scheams/v1/wxs">
-  <Fragment>
-    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-       <Component>
-         <File Source="example.txt" />
-         <ex:Example Id="Foo" Value="Bar" />
-       </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/data/example.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/data/example.txt
deleted file mode 100644
index 1b4ffe8a..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/data/example.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is example.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/data/other.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/data/other.txt
deleted file mode 100644
index 8c874ae7..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/data/other.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is other.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Component/GuidCollision.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Component/GuidCollision.wxs
deleted file mode 100644
index a0e921cb..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Component/GuidCollision.wxs
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-            <Component Guid="5917d193-7b5f-4d5d-bc2e-06aa210699cb">
-                <RegistryValue Root="HKLM" Key="SOFTWARE\WixToolset" Name="Test" Value="test value" />
-            </Component>
-
-            <Component Guid="5917d193-7b5f-4d5d-bc2e-06aa210699cb">
-                <File Source="test.txt" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.wxs
deleted file mode 100644
index d7b5bdc0..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.wxs
+++ /dev/null
@@ -1,17 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="MsiPackage" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
-    
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-    </StandardDirectory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Components/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Components/PackageComponents.wxs
deleted file mode 100644
index beaf70bf..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Components/PackageComponents.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-            <Component Id="NullKeypathComponent" Guid="{C493379B-D655-4331-8F03-B618C70EA779}" KeyPath="yes">
-                <File Source="test.txt" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Components/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/Components/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Components/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Container/HarvestIntoDetachedContainer.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Container/HarvestIntoDetachedContainer.wxs
deleted file mode 100644
index e175a18f..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Container/HarvestIntoDetachedContainer.wxs
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <MsiPackage SourceFile="FirstX86.msi" />
-            <PackageGroupRef Id="FirstX64" />
-        </PackageGroup>
-        <PackageGroup Id="FirstX64">
-            <MsiPackage SourceFile="FirstX64.msi" />
-        </PackageGroup>
-        <Container Id="FirstX64" Name="FirstX64" Type="detached">
-            <PackageGroupRef Id="FirstX64" />
-        </Container>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Container/MultipleAttachedContainers.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Container/MultipleAttachedContainers.wxs
deleted file mode 100644
index 28900e55..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Container/MultipleAttachedContainers.wxs
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <MsiPackage SourceFile="FirstX86.msi" />
-            <PackageGroupRef Id="FirstX64" />
-        </PackageGroup>
-        <PackageGroup Id="FirstX64">
-            <MsiPackage SourceFile="FirstX64.msi" />
-        </PackageGroup>
-        <Container Id="FirstX64" Name="FirstX64" Type="attached">
-            <PackageGroupRef Id="FirstX64" />
-        </Container>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CopyFile/CopyFile.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CopyFile/CopyFile.wxs
deleted file mode 100644
index 90d66cc3..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CopyFile/CopyFile.wxs
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <Component Id="CopyFileComp" Directory="INSTALLFOLDER">
-                <File Id="test.txt" Source="test.txt" />
-                <CopyFile Id="MoveText" Delete="yes" SourceName="*.txt" DestinationDirectory="OtherFolder"/>
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-
-    <Fragment>
-        <DirectoryRef Id="INSTALLFOLDER">
-            <Directory Id="OtherFolder" Name="other" />
-        </DirectoryRef>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/CustomActionCycle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/CustomActionCycle.wxs
deleted file mode 100644
index be991c65..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/CustomActionCycle.wxs
+++ /dev/null
@@ -1,18 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup" />
-        </ComponentGroup>
-
-        <Binary Id="Binary1" SourceFile="test.txt" />
-        <CustomAction Id="Action1" DllEntry="EntryPoint1" BinaryRef="Binary1" />
-        <CustomAction Id="Action2" DllEntry="EntryPoint2" BinaryRef="Binary1" />
-        <CustomAction Id="Action3" DllEntry="EntryPoint3" BinaryRef="Binary1" />
-
-        <InstallExecuteSequence>
-            <Custom Action="Action1" After="Action2" />
-            <Custom Action="Action2" After="Action3" />
-            <Custom Action="Action3" After="Action1" />
-        </InstallExecuteSequence>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/CustomActionCycleWithTail.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/CustomActionCycleWithTail.wxs
deleted file mode 100644
index c64ef143..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/CustomActionCycleWithTail.wxs
+++ /dev/null
@@ -1,20 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup" />
-        </ComponentGroup>
-
-        <Binary Id="Binary1" SourceFile="test.txt" />
-        <CustomAction Id="Action1" DllEntry="EntryPoint1" BinaryRef="Binary1" />
-        <CustomAction Id="Action2" DllEntry="EntryPoint2" BinaryRef="Binary1" />
-        <CustomAction Id="Action3" DllEntry="EntryPoint3" BinaryRef="Binary1" />
-        <CustomAction Id="Action4" DllEntry="EntryPoint4" BinaryRef="Binary1" />
-
-        <InstallExecuteSequence>
-            <Custom Action="Action1" After="Action2" />
-            <Custom Action="Action2" After="Action3" />
-            <Custom Action="Action3" After="Action4" />
-            <Custom Action="Action4" After="Action2" />
-        </InstallExecuteSequence>
-    </Fragment>
-</Wix>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/SimpleCustomAction.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/SimpleCustomAction.wxs
deleted file mode 100644
index ff8741cf..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/SimpleCustomAction.wxs
+++ /dev/null
@@ -1,14 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup" />
-        </ComponentGroup>
-
-        <Binary Id="Binary1" SourceFile="test.txt" />
-        <CustomAction Id="Action1" DllEntry="EntryPoint1" BinaryRef="Binary1" />
-
-        <InstallExecuteSequence>
-            <Custom Action="Action1" After="InstallFiles" />
-        </InstallExecuteSequence>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs
deleted file mode 100644
index f8ce1c38..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs
+++ /dev/null
@@ -1,32 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup" />
-        </ComponentGroup>
-
-        <Binary Id="Binary1" SourceFile="test.txt" />
-        <CustomAction Id="CustomAction1" DllEntry="InvalidEntryPoint" BinaryRef="Binary1" />
-        <CustomAction Id="DiscardOptimismAllBeingsWhoProceed" Error="Abandon hope all ye who enter here." />
-        <CustomAction Id="CustomActionWithHiddenTarget" DllEntry="InvalidEntryPoint" Execute="deferred" HideTarget="yes" BinaryRef="Binary1" />
-        <CustomAction Id="CustomAction2" Property="TestAdvtExecuteSequenceProperty" Value="1" />
-        <AdminExecuteSequence>
-            <Custom Action="CustomAction2" After="CostInitialize" />
-        </AdminExecuteSequence>
-        <AdminUISequence>
-            <Custom Action="CustomAction2" After="CostInitialize" />
-        </AdminUISequence>
-        <AdvertiseExecuteSequence>
-            <Custom Action="CustomAction2" After="CostInitialize" />
-        </AdvertiseExecuteSequence>
-        <InstallExecuteSequence>
-            <Custom Action="CustomAction2" After="CostInitialize" />
-        </InstallExecuteSequence>
-        <InstallUISequence>
-            <Custom Action="CustomAction2" After="CostInitialize" />
-        </InstallUISequence>
-
-        <UI>
-            <ProgressText Action="CustomAction2" Message="Progess2Text" />
-        </UI>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomPackageDescription/CustomPackageDescription.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomPackageDescription/CustomPackageDescription.wxs
deleted file mode 100644
index 10c4f91f..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomPackageDescription/CustomPackageDescription.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <ExePackage DetectCondition="ForTestPurposesOnly" SourceFile="burn.exe" Permanent="yes" />
-            <ExePackage Id="RemotePayloadExe" DetectCondition="ForTestPurposesOnly" Description="Override RemotePayload description" DisplayName="Override RemotePayload display name" Permanent="yes">
-                <ExePackagePayload Description="RemotePayload description" Hash="a" ProductName="RemotePayload product name" Size="1" Version="1.0.0.0" Name="fake.exe" DownloadUrl="example.com" />
-            </ExePackage>
-            <ExePackage DetectCondition="ForTestPurposesOnly" SourceFile="C:\Windows\system32\calc.exe" Permanent="yes" Description="Override harvested description" DisplayName="Override harvested display name" />
-        </PackageGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs
deleted file mode 100644
index d7d86008..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs
+++ /dev/null
@@ -1,29 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Codepage="1252" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{12E4699F-E774-4D05-8A01-5BDD41BBA127}" Version="1.0.0.0" ProductCode="{83F9C623-26FE-42AB-951E-170022117F54}">
-    <CustomTable Id="CustomTable1">
-      <Column Id="Column1" PrimaryKey="yes" Type="string" Width="0" Category="text" Description="The first custom column." />
-      <Column Id="Component_" Type="string" Width="72" KeyTable="Component" KeyColumn="1" Description="The custom table's Component reference" />
-      <Row>
-        <Data Column="Column1" Value="Row1" />
-        <Data Column="Component_" Value="test.txt" />
-      </Row>
-      <Row>
-        <Data Column="Column1" Value="Row2" />
-        <Data Column="Component_" Value="test.txt" />
-      </Row>
-    </CustomTable>
-    <StandardDirectory Id="ProgramFiles6432Folder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="1egc1laj">
-        <Component Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Bitness="always32">
-          <File Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Name="test.txt" KeyPath="yes" Source="MsiPackage\test.txt" />
-        </Component>
-      </Directory>
-    </StandardDirectory>
-    <StandardDirectory Id="ProgramFilesFolder" />
-    <Feature Id="ProductFeature" Level="1" Title="MsiPackageTitle">
-      <ComponentRef Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" />
-    </Feature>
-    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-    <Media Id="1" />
-  </Package>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs
deleted file mode 100644
index d32e808c..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup" />
-        </ComponentGroup>
-
-        <CustomTable Id="CustomTable1">
-            <Column Id="Column1" Type="string" PrimaryKey="yes" Category="text" Modularize="column" Description="The first custom column." />
-            <Column Id="Component_" Type="string" Width="72" KeyTable="Component" KeyColumn="1" Description="The custom table's Component reference" Modularize="column" />
-            <Row>
-                <Data Column="Column1" Value="Row1" />
-                <Data Column="Component_" Value="test.txt" />
-            </Row>
-            <Row>
-                <Data Column="Column1" Value="Row2" />
-                <Data Column="Component_" Value="test.txt" />
-            </Row>
-        </CustomTable>
-
-        <CustomTable Id="CustomTable2" Unreal="yes">
-            <Column Id="ColumnA" Type="string" PrimaryKey="yes" />
-            <Column Id="Component_" Type="string" Width="72" KeyTable="Component" KeyColumn="1" Modularize="column" />
-            <Row>
-                <Data Column="ColumnA" Value="RowA" />
-                <Data Column="Component_" Value="test.txt" />
-            </Row>
-            <Row>
-                <Data Column="ColumnA" Value="RowB" />
-                <Data Column="Component_" Value="test.txt" />
-            </Row>
-        </CustomTable>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTableWithFile.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTableWithFile.wxs
deleted file mode 100644
index 08a9c470..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTableWithFile.wxs
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup" />
-        </ComponentGroup>
-
-        <CustomTable Id="CustomTableWithFile">
-            <Column Id="Column1" Type="string" PrimaryKey="yes" />
-            <Column Id="Source" Type="binary" Width="0" />
-            <Row>
-                <Data Column="Column1" Value="Row1" />
-                <Data Column="Source" Value="file1.txt" />
-            </Row>
-            <Row>
-                <Data Column="Source" Value="SourceDir\file2.txt" />
-                <Data Column="Column1" Value="Row2" />
-            </Row>
-        </CustomTable>
-
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/LocalizedCustomTable.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/LocalizedCustomTable.en-us.wxl
deleted file mode 100644
index bc2ccf04..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/LocalizedCustomTable.en-us.wxl
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="Loc1">This is row one</String>
-  <String Id="Loc2">This is row two</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/LocalizedCustomTable.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/LocalizedCustomTable.wxs
deleted file mode 100644
index e1da74f8..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/LocalizedCustomTable.wxs
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup" />
-        </ComponentGroup>
-
-        <CustomTable Id="CustomTableLocalized">
-            <Column Id="Column1" Type="string" PrimaryKey="yes" />
-            <Column Id="DataColumn" Type="string" Localizable="yes" Width="255" />
-            <Row>
-                <Data Column="Column1" Value="Row1" />
-                <Data Column="DataColumn"  Value="!(loc.Loc1)" />
-            </Row>
-            <Row>
-                <Data Column="Column1" Value="Row2" />
-                <Data Column="DataColumn" Value="!(loc.Loc2)" />
-            </Row>
-        </CustomTable>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/file1.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/file1.txt
deleted file mode 100644
index 97f701ce..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/file1.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is file1.txt
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/file2.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/file2.txt
deleted file mode 100644
index 46493186..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/file2.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is file2.txt
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileNullComponent/Expected.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileNullComponent/Expected.wxs
deleted file mode 100644
index 71553e2a..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileNullComponent/Expected.wxs
+++ /dev/null
@@ -1,16 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Codepage="65001" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{047730A5-30FE-4A62-A520-DA9381B8226A}" Version="1.0.0.0" Compressed="yes" InstallerVersion="200" ProductCode="{6F9B5694-F0F1-437C-919B-0D2DAF2D9DEA}">
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq">
-        <Component Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Guid="" Bitness="always32">
-          <File Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Name="test.txt" KeyPath="yes" Source="SourceDir\File\filcV1yrx0x8wJWj4qMzcH21jwkPko" />
-        </Component>
-      </Directory>
-    </StandardDirectory>
-    <Feature Id="ProductFeature" Level="1" Title="MsiPackage">
-      <ComponentRef Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" />
-    </Feature>
-    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-    <Media Id="1" Cabinet="example.cab" />
-  </Package>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileNullComponent/example.cab b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileNullComponent/example.cab
deleted file mode 100644
index 125eeb2c..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileNullComponent/example.cab
+++ /dev/null
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileNullComponent/example.msi b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileNullComponent/example.msi
deleted file mode 100644
index 81335041..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileNullComponent/example.msi
+++ /dev/null
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed/Expected.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed/Expected.wxs
deleted file mode 100644
index 246bcafc..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed/Expected.wxs
+++ /dev/null
@@ -1,16 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Codepage="65001" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{047730A5-30FE-4A62-A520-DA9381B8226A}" Version="1.0.0.0" Compressed="yes" InstallerVersion="200" ProductCode="{6F9B5694-F0F1-437C-919B-0D2DAF2D9DEA}">
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq">
-        <Component Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Bitness="always32">
-          <File Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Name="test.txt" KeyPath="yes" Source="SourceDir\File\filcV1yrx0x8wJWj4qMzcH21jwkPko" />
-        </Component>
-      </Directory>
-    </StandardDirectory>
-    <Feature Id="ProductFeature" Level="1" Title="MsiPackage">
-      <ComponentRef Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" />
-    </Feature>
-    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-    <Media Id="1" Cabinet="example.cab" />
-  </Package>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed/example.cab b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed/example.cab
deleted file mode 100644
index 125eeb2c..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed/example.cab
+++ /dev/null
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed/example.msi b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed/example.msi
deleted file mode 100644
index 9cb6d6bc..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed/example.msi
+++ /dev/null
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed64/Expected.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed64/Expected.wxs
deleted file mode 100644
index 81915759..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed64/Expected.wxs
+++ /dev/null
@@ -1,16 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Codepage="65001" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{047730A5-30FE-4A62-A520-DA9381B8226A}" Version="1.0.0.0" Compressed="yes" ProductCode="{C51B773A-B3BE-4F29-A8A9-549AAF7FF6EC}">
-    <StandardDirectory Id="ProgramFiles64Folder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq">
-        <Component Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Bitness="always64">
-          <File Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Name="test.txt" KeyPath="yes" Source="SourceDir\File\filcV1yrx0x8wJWj4qMzcH21jwkPko" />
-        </Component>
-      </Directory>
-    </StandardDirectory>
-    <Feature Id="ProductFeature" Level="1" Title="MsiPackage">
-      <ComponentRef Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" />
-    </Feature>
-    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-    <Media Id="1" Cabinet="example.cab" />
-  </Package>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed64/example.cab b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed64/example.cab
deleted file mode 100644
index 125eeb2c..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed64/example.cab
+++ /dev/null
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed64/example.msi b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed64/example.msi
deleted file mode 100644
index 762b136c..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed64/example.msi
+++ /dev/null
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileTargetDirMergeModule/Expected.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileTargetDirMergeModule/Expected.wxs
deleted file mode 100644
index 7c5fe3cf..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileTargetDirMergeModule/Expected.wxs
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Module Id="MergeModule1" Language="1033" Version="1.0.0.0" InstallerVersion="200">
-      <Directory Id="MergeRedirectFolder">
-        <Component Id="ModuleComponent2" Guid="{BB222EE8-229B-4051-9443-49E348F0CC77}" Bitness="always32">
-          <File Id="File2" ShortName="sfmxqeab.wxs" Name="MergeModule.wxs" KeyPath="yes" Source="SourceDir\File\File2.F844F0E3_8CB4_4A0F_973E_31C4F9338382" />
-        </Component>
-      </Directory>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="WixTestDir" ShortName="7bhhvaai" Name="WiX Toolset Test Directory">
-        <Component Id="ModuleComponent1" Guid="{D86EC5A2-9576-4699-BDC3-00586FF72CBE}" Bitness="always32">
-          <File Id="File1" ShortName="gahushls.wxs" Name="MergeModule.wxs" KeyPath="yes" Source="SourceDir\File\File1.F844F0E3_8CB4_4A0F_973E_31C4F9338382" />
-        </Component>
-      </Directory>
-    </StandardDirectory>
-    <SummaryInformation Description="MergeModule1" Manufacturer="WiX Toolset contributors" />
-  </Module>
-</Wix>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileTargetDirMergeModule/MergeModule1.msm b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileTargetDirMergeModule/MergeModule1.msm
deleted file mode 100644
index 2a7b5e3a..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileTargetDirMergeModule/MergeModule1.msm
+++ /dev/null
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DefaultDir/DefaultDir.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/DefaultDir/DefaultDir.wxs
deleted file mode 100644
index 2f277956..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DefaultDir/DefaultDir.wxs
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-            <Component>
-                <File Source="test.txt" />
-            </Component>
-        </ComponentGroup>
-
-        <DirectoryRef Id="INSTALLFOLDER">
-            <Directory Id="DUPLICATENAMEANDSHORTNAME" Name="duplicat" ShortName="duplicat"></Directory>
-            <Directory Id="NAMEWITHSHORTVALUE" Name="SHORTVAL"></Directory>
-            <Directory Id="NAMEANDSHORTNAME" Name="NameAndShortName" ShortName="SHORTNAM"></Directory>
-            <Directory Id="SHORTNAMEONLY" Name="SHORTONL"></Directory>
-            <Directory Id="SOURCENAME" Name="NameAndSourceName" SourceName="SourceNameWithName"></Directory>
-            <Directory Id="SOURCENAMESONLY" SourceName="SourceNameOnly" ShortSourceName="SRCNAMON"></Directory>
-            <Directory Id="NAMEANDSHORTSOURCENAME" Name="NameAndShortSourceName" ShortName="NAMEASSN"></Directory>
-            <Directory Id="SHORTNAMEANDLONGSOURCENAME" SourceName="ShortNameAndLongSourceName" Name="SHNALSNM"></Directory>
-            <Directory Id="SOURCENAMEWITHSHORTVALUE" SourceName="SRTSRCVL"></Directory>
-            <Directory Id="Folder1" Name="Folder.1"></Directory>
-            <Directory Id="Folder12" Name="Folder.12"></Directory>
-            <Directory Id="Folder123" Name="Folder.123"></Directory>
-            <Directory Id="Folder1234" Name="Folder.1234"></Directory>
-        </DirectoryRef>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Dependency/CustomProviderKeyBundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Dependency/CustomProviderKeyBundle.wxs
deleted file mode 100644
index 6df8a7c0..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Dependency/CustomProviderKeyBundle.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Bundle Name="BurnBundle" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="B94478B1-E1F3-4700-9CE8-6AA090854AEC" ProviderKey="MyProviderKey,v1.0">
-        <BootstrapperApplication>
-            <BootstrapperApplicationDll SourceFile="fakeba.dll" />
-        </BootstrapperApplication>
-        <Chain>
-            <PackageGroupRef Id="MinimalPackageGroup" />
-        </Chain>
-    </Bundle>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Dependency/ExePackageProvidesBundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Dependency/ExePackageProvidesBundle.wxs
deleted file mode 100644
index 4d188d3a..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Dependency/ExePackageProvidesBundle.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <ExePackage DetectCondition="DetectedSomething" SourceFile="burn.exe">
-                <Provides Key="DependencyTests_ExeA,v1.0" Version="1.0.0.0" />
-            </ExePackage>
-        </PackageGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Dependency/UsingProvidesBundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Dependency/UsingProvidesBundle.wxs
deleted file mode 100644
index 9c3a9690..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Dependency/UsingProvidesBundle.wxs
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <MsiPackage SourceFile="UsingProvides.msi" />
-        </PackageGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/PackageComponents.wxs
deleted file mode 100644
index ec6e62df..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/PackageComponents.wxs
+++ /dev/null
@@ -1,36 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <UI Id="CustomDialog">
-            <Dialog Id="FirstDialog" Width="100" Height="100">
-                <Control Id="Title" Type="Text" X="0" Y="0" Width="90" Height="13" TabSkip="no" Text="FirstDialogTitle" />
-                <Control Id="Header" Type="Text" X="0" Y="13" Width="90" Height="13" TabSkip="no" Text="FirstDialogHeader" HideCondition="Installed" DisableCondition="Installed" />
-            </Dialog>
-            <Dialog Id="SecondDialog" Width="100" Height="100">
-                <Control Id="Title" Type="Text" X="0" Y="0" Width="90" Height="13" TabSkip="no" Text="SecondDialogTitle" />
-                <Control Id="OptionalCheckBox" Type="CheckBox" X="0" Y="13" Width="100" Height="40" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]" ToolTip="Optional checkbox" Help="Check this box for fun" ShowCondition="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT Installed" />
-            </Dialog>
-
-            <InstallUISequence>
-                <Show Dialog="SecondDialog" Before="FirstDialog" Overridable="yes" Condition="NOT Installed" />
-            </InstallUISequence>
-        </UI>
-    </Fragment>
-    <Fragment>
-        <UI Id="CustomUI">
-            <DialogRef Id="FirstDialog" />
-            <DialogRef Id="SecondDialog" />
-
-            <Publish Dialog="FirstDialog" Control="Next" Event="NewDialog" Value="SecondDialog" Condition="Installed AND PATCH" />
-
-            <InstallUISequence>
-                <Show Dialog="FirstDialog" Before="SecondDialog" Condition="Installed AND PATCH" />
-                <Show Dialog="SecondDialog" Before="ExecuteAction" Condition="NOT Installed" />
-            </InstallUISequence>
-        </UI>
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-            <Component>
-                <File Source="test.txt" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Directory/DefaultName.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Directory/DefaultName.wxs
deleted file mode 100644
index 3e7887c4..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Directory/DefaultName.wxs
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents" Directory="BinFolder" />
-    </Fragment>
-    <Fragment>
-        <StandardDirectory Id="ProgramFilesFolder">
-            <Directory Id="CompanyFolder" Name="!(bind.Property.Manufacturer)">
-                <Directory Id="BinFolder" Name="." />
-            </Directory>
-        </StandardDirectory>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Directory/DuplicateTargetSourceName.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Directory/DuplicateTargetSourceName.wxs
deleted file mode 100644
index 6e9a4495..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Directory/DuplicateTargetSourceName.wxs
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents" Directory="BinFolder" />
-    </Fragment>
-    <Fragment>
-        <StandardDirectory Id="ProgramFilesFolder">
-            <Directory Id="BinFolder" Name="bin" SourceName="bin" />
-        </StandardDirectory>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Directory/Empty.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Directory/Empty.wxs
deleted file mode 100644
index 50cf6850..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Directory/Empty.wxs
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER" />
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Directory/Nested.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Directory/Nested.wxs
deleted file mode 100644
index cc87b49f..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Directory/Nested.wxs
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents" Directory="BinFolder" />
-    </Fragment>
-    <Fragment>
-        <StandardDirectory Id="ProgramFilesFolder">
-            <Directory Id="BinFolder" Name="Example Corporation\Test Product\bin" />
-        </StandardDirectory>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DuplicateDir/DuplicateDir.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/DuplicateDir/DuplicateDir.wxs
deleted file mode 100644
index a58b68c8..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DuplicateDir/DuplicateDir.wxs
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="GroupA" />
-            <ComponentGroupRef Id="GroupB" />
-        </ComponentGroup>
-    </Fragment>
-
-    <Fragment>
-        <ComponentGroup Id="GroupA" Directory="INSTALLFOLDER" Subdirectory="dupe">
-            <Component>
-                <File Name="a.txt" Source="test.txt" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-
-    <Fragment>
-        <ComponentGroup Id="GroupB" Directory="INSTALLFOLDER" Subdirectory="dupe">
-            <Component>
-                <File Name="b.txt" Source="test.txt" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/EnsureTable/EnsureTable.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/EnsureTable/EnsureTable.wxs
deleted file mode 100644
index 01767abb..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/EnsureTable/EnsureTable.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup" />
-        </ComponentGroup>
-
-        <EnsureTable Id="Wix4Example" />
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Environment/Environment.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Environment/Environment.wxs
deleted file mode 100644
index de9744a7..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Environment/Environment.wxs
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <Component Id="WixEnvironmentTest" Guid="{068C1CF4-DA54-4221-B0D2-E7310770DF0B}" Directory="INSTALLFOLDER">
-                <Environment Id="WixEnvironmentTest1" Action="set" Name="WixEnvTest1"/>
-                <Environment Id="WixEnvironmentTest2" Action="create" Name="WixEnvTest1"/>
-                <Environment Id="WixEnvironmentTest3" Action="remove" Name="WixEnvTest1"/>
-                <Environment Id="WixEnvironmentTest4" Name="WIX" Action="set" System="yes" Value="[INSTALLFOLDER]" />
-                <Environment Id="PATH" Name="PATH" Action="set" Part="first" Value="[INSTALLFOLDER]; " System="yes" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.en-us.wxl
deleted file mode 100644
index 066e16bb..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.en-us.wxl
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs
deleted file mode 100644
index 287085e8..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs
+++ /dev/null
@@ -1,20 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="MsiPackage" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
-    
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <CustomAction Id="CanWeReferenceAnError_YesWeCan" Error="1234" />
-    <CustomAction Id="TextErrorsWorkOKToo" Error="If you see this, something went wrong." />
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-    </StandardDirectory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/PackageComponents.wxs
deleted file mode 100644
index 88a4ac81..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/PackageComponents.wxs
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <UI>
-            <Error Id="1234" Message="Category 55 Emergency Doomsday Crisis" />
-            <Error Id="5678" Message=" " />
-        </UI>
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-            <Component>
-                <File Source="test.txt" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs
deleted file mode 100644
index 5c84f33e..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs
+++ /dev/null
@@ -1,21 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
-    
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <Property Id="ExampleProperty" Value="$(ex.Test)" />
-
-    <PropertyRef Id="PropertyFromExampleWir" />
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-    </StandardDirectory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/PackageComponents.wxs
deleted file mode 100644
index 7f17b538..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/PackageComponents.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:ex="http://www.example.com/scheams/v1/wxs">
-  <Fragment>
-    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-       <Component>
-         <File Source="example.txt" />
-         <ex:Example Id="Foo" Value="Bar" />
-       </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/data/example.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/data/example.txt
deleted file mode 100644
index 1b4ffe8a..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/data/example.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is example.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ExePackage/MissingDetectCondition.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ExePackage/MissingDetectCondition.wxs
deleted file mode 100644
index e57180f7..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ExePackage/MissingDetectCondition.wxs
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="TestPackageGroup">
-            <ExePackage InstallArguments="-install"
-                        SourceFile="testsetup.exe" />
-        </PackageGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ExePackage/RequireDetectCondition.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ExePackage/RequireDetectCondition.wxs
deleted file mode 100644
index 0b094860..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ExePackage/RequireDetectCondition.wxs
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="TestPackageGroup">
-            <ExePackage DetectCondition=""
-                        InstallArguments="-install"
-                        UninstallArguments="-uninstall"
-                        SourceFile="testsetup.exe" />
-        </PackageGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/FeatureGroup/FeatureGroup.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/FeatureGroup/FeatureGroup.wxs
deleted file mode 100644
index be302720..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/FeatureGroup/FeatureGroup.wxs
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup"></ComponentGroupRef>
-        </ComponentGroup>
-
-        <FeatureGroup Id="ProductFeatureGroup">
-            <Feature Id="ParentFeature" Title="ParentFeatureTitle">
-                <Feature Id="ChildFeature" Title="ChildFeatureTitle"></Feature>
-            </Feature>
-        </FeatureGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Font/FontTitle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Font/FontTitle.wxs
deleted file mode 100644
index 6fb9ef05..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Font/FontTitle.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <Component Id="FontComp" Directory="INSTALLFOLDER">
-                <File Id="test.txt" Source="test.txt" FontTitle="FakeFont" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Font/TrueType.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Font/TrueType.wxs
deleted file mode 100644
index 6ac48963..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Font/TrueType.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <Component Id="TrueTypeFontComp" Directory="INSTALLFOLDER" Guid="C8116E5E-F731-427C-AF43-6FF8B8D7DA64">
-                <File Id="TrueTypeFontFile" Source="test.txt" Name="TrueTypeFontComp.ttf" TrueType="yes" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/Package.wxs
deleted file mode 100644
index 8fff563e..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/Package.wxs
+++ /dev/null
@@ -1,19 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="MsiPackage" Language="1033" Version="1.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
-    
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-        <ComponentGroupRef Id="ProductComponents.x86" />
-        <ComponentGroupRef Id="ProductComponents.x64" />
-        <ComponentGroupRef Id="ProductComponents.arm" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-    </StandardDirectory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/PackageComponents.wxs
deleted file mode 100644
index 2a75e3d7..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/PackageComponents.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?foreach ComponentPlatform in x86;x64;arm ?>
-    <Fragment>
-        <ComponentGroup Id="ProductComponents.$(var.ComponentPlatform)" Directory="INSTALLFOLDER">
-            <Component>
-                <File Name="$(var.ComponentPlatform).dll" Source="test.txt" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-    <?endforeach?>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Icon/SampleIcon.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Icon/SampleIcon.wxs
deleted file mode 100644
index 1de84e81..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Icon/SampleIcon.wxs
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <Icon Id="SampleIcon" SourceFile="burn.exe" />
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/Package.wxs
deleted file mode 100644
index 0bd80c50..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/Package.wxs
+++ /dev/null
@@ -1,18 +0,0 @@
-<?include Package.wxi ?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="MsiPackage" Language="1033" Version="$(var.ProductVersion)" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
-    
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-    </StandardDirectory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/PackageComponents.wxs
deleted file mode 100644
index 7a0485ed..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/PackageComponents.wxs
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-        <?include DontDoThis.wxi ?>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/data/DontDoThis.wxi b/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/data/DontDoThis.wxi
deleted file mode 100644
index 03885e3e..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/data/DontDoThis.wxi
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Component>
-    <File Source="test.txt" />
-  </Component>
-</Include>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/data/Package.wxi b/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/data/Package.wxi
deleted file mode 100644
index f2df3b86..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/data/Package.wxi
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?define ProductVersion = "1.2.3" ?>
-</Include>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.wxs
deleted file mode 100644
index 7826d673..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.wxs
+++ /dev/null
@@ -1,23 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
-    
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <Property Id="INSTANCEPROPERTY" Secure="yes" />
-
-    <InstanceTransforms Property="INSTANCEPROPERTY">
-      <Instance Id="I1" ProductCode="*" ProductName="MsiPackage (Instance 1)" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" />
-    </InstanceTransforms>
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackageInstance" />
-    </StandardDirectory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/PackageComponents.wxs
deleted file mode 100644
index e26c4509..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/PackageComponents.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-       <Component>
-         <File Source="test.txt" />
-       </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Language/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/Language/Package.en-us.wxl
deleted file mode 100644
index f7453566..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Language/Package.en-us.wxl
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Language/Package.ja-jp.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/Language/Package.ja-jp.wxl
deleted file mode 100644
index ef287da7..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Language/Package.ja-jp.wxl
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="ja-JP">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Language/Package.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/Language/Package.wxl
deleted file mode 100644
index 10ebf2c5..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Language/Package.wxl
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Language/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Language/Package.wxs
deleted file mode 100644
index 13c79e90..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Language/Package.wxs
+++ /dev/null
@@ -1,18 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="~DefaultLanguagePackage" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <Component Directory="INSTALLFOLDER">
-        <File Source="test.txt" />
-      </Component>
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="Example Corporation\MsiPackage" />
-    </StandardDirectory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Language/PackageWithEnSummaryInfo.ja-jp.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/Language/PackageWithEnSummaryInfo.ja-jp.wxl
deleted file mode 100644
index 596ee077..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Language/PackageWithEnSummaryInfo.ja-jp.wxl
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" SummaryInformationCodepage="1252" Culture="ja-JP">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Language/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/Language/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Language/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/LockPermissions/EmptyPermissions.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/LockPermissions/EmptyPermissions.wxs
deleted file mode 100644
index dfae2157..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/LockPermissions/EmptyPermissions.wxs
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup"></ComponentGroupRef>
-            <Component Id="MiscComponent" Guid="D1414BA5-F8DE-4979-938D-C8D0F61A62C9" Directory="INSTALLFOLDER">
-                <CreateFolder>
-                    <Permission User="Administrator"></Permission>
-                </CreateFolder>
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/Package.wxs
deleted file mode 100644
index 4fd3493a..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/Package.wxs
+++ /dev/null
@@ -1,24 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
-    
-
-    <Upgrade Id="01120000-00E0-0000-0000-0000000FF1CE">
-      <UpgradeVersion ExcludeLanguages="no" IgnoreRemoveFailure="yes" IncludeMaximum="no" IncludeMinimum="yes" Maximum="13.0.0" Minimum="12.0.0" OnlyDetect="no" Property="BLAHBLAHBLAH" />
-    </Upgrade>
-    <!--<Property Id="BLAHBLAHBLAH" Secure="yes" />-->
-
-    <InstallExecuteSequence>
-      <RemoveExistingProducts After="InstallValidate" />
-    </InstallExecuteSequence>
-    
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-    </StandardDirectory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/PackageComponents.wxs
deleted file mode 100644
index e26c4509..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/PackageComponents.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-       <Component>
-         <File Source="test.txt" />
-       </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Media/MultiMedia.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Media/MultiMedia.wxs
deleted file mode 100644
index e7492db4..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Media/MultiMedia.wxs
+++ /dev/null
@@ -1,28 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Package Name="~MultiMedia" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation"
-             UpgradeCode="12E4699F-E774-4D05-8A01-5BDD41BBA127">
-
-        <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-
-        <Media Id="1" Cabinet="cab1.cab" />
-        <Media Id="2" Cabinet="cab2.cab" />
-        
-        <Feature Id="ProductFeature" Title="MsiPackageTitle">
-            <Component Directory="ProgramFilesFolder" Subdirectory="~MultiMedia" DiskId="1">
-                <File Source="a1.txt" />
-            </Component>
-
-            <Component Directory="ProgramFilesFolder" Subdirectory="~MultiMedia" DiskId="1">
-                <File Source="a2.txt" />
-            </Component>
-
-            <Component Directory="ProgramFilesFolder" Subdirectory="~MultiMedia" DiskId="2">
-                <File Source="b2.txt" />
-            </Component>
-
-            <Component Directory="ProgramFilesFolder" Subdirectory="~MultiMedia" DiskId="2">
-                <File Source="b1.txt" />
-            </Component>
-        </Feature>
-    </Package>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Media/data/a1.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/Media/data/a1.txt
deleted file mode 100644
index ad9cdcb5..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Media/data/a1.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is a1.txt
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Media/data/a2.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/Media/data/a2.txt
deleted file mode 100644
index d5de23de..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Media/data/a2.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is a2.txt
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Media/data/b1.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/Media/data/b1.txt
deleted file mode 100644
index 88bc4a56..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Media/data/b1.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is b1.txt
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Media/data/b2.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/Media/data/b2.txt
deleted file mode 100644
index 38525276..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Media/data/b2.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is b2.txt
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/FirstX64.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/FirstX64.wxs
deleted file mode 100644
index e72b6402..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/FirstX64.wxs
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup" />
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/FirstX86.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/FirstX86.wxs
deleted file mode 100644
index e72b6402..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/FirstX86.wxs
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup" />
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/SecondX64.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/SecondX64.wxs
deleted file mode 100644
index e72b6402..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/SecondX64.wxs
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup" />
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/SecondX86.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/SecondX86.wxs
deleted file mode 100644
index e72b6402..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/SecondX86.wxs
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup" />
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X64AfterX86Bundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X64AfterX86Bundle.wxs
deleted file mode 100644
index e6527a36..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X64AfterX86Bundle.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <MsiPackage SourceFile="FirstX64\" Name="FirstX64\FirstX64.msi" />
-            <RollbackBoundary Transaction="yes" />
-            <MsiPackage SourceFile="FirstX86\" Name="FirstX86\FirstX86.msi" />
-            <MsiPackage SourceFile="SecondX86\" Name="SecondX86\SecondX86.msi" />
-            <MsiPackage SourceFile="SecondX64\" Name="SecondX64\SecondX64.msi" />
-        </PackageGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X86AfterX64Bundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X86AfterX64Bundle.wxs
deleted file mode 100644
index f1c939db..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X86AfterX64Bundle.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <MsiPackage SourceFile="FirstX86\" Name="FirstX86\FirstX86.msi" />
-            <RollbackBoundary Transaction="yes" />
-            <MsiPackage SourceFile="FirstX64\" Name="FirstX64\FirstX64.msi" />
-            <MsiPackage SourceFile="SecondX64\" Name="SecondX64\SecondX64.msi" />
-            <MsiPackage SourceFile="SecondX86\" Name="SecondX86\SecondX86.msi" />
-        </PackageGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MsuPackage/Bundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MsuPackage/Bundle.wxs
deleted file mode 100644
index dbca3393..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/MsuPackage/Bundle.wxs
+++ /dev/null
@@ -1,11 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Bundle Name="BurnBundle" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="B94478B1-E1F3-4700-9CE8-6AA090854AEC">
-        <BootstrapperApplication>
-            <BootstrapperApplicationDll SourceFile="fakeba.dll" />
-        </BootstrapperApplication>
-        
-        <Chain>
-            <MsuPackage DetectCondition="DetectedTheMsu" SourceFile="test.msu" />
-        </Chain>
-    </Bundle>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MsuPackage/data/fakeba.dll b/src/test/WixToolsetTest.CoreIntegration/TestData/MsuPackage/data/fakeba.dll
deleted file mode 100644
index b3cf17d8..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/MsuPackage/data/fakeba.dll
+++ /dev/null
@@ -1 +0,0 @@
-This is a fake BA DLL
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MsuPackage/data/test.msu b/src/test/WixToolsetTest.CoreIntegration/TestData/MsuPackage/data/test.msu
deleted file mode 100644
index d63da4be..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/MsuPackage/data/test.msu
+++ /dev/null
@@ -1 +0,0 @@
-This is a fake MSU package
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/Package.wxs
deleted file mode 100644
index 2b1a1a0f..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/Package.wxs
+++ /dev/null
@@ -1,26 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200" Scope="perMachine">
-    
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <?ifndef MediaTemplateCompressionLevel?>
-    <Media Id="1" Cabinet="example1.cab" />
-    <Media Id="2" Cabinet="example2.cab" />
-    <?elseif $(MediaTemplateCompressionLevel) = ""?>
-    <MediaTemplate />
-    <?else?>
-    <MediaTemplate CabinetTemplate="lowcab{0}.cab" CompressionLevel="$(MediaTemplateCompressionLevel)" />
-    <?endif?>
-    
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-    </StandardDirectory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/PackageComponents.wxs
deleted file mode 100644
index 82797ebe..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/PackageComponents.wxs
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-      <Component>
-        <File Source="$(env.WINDIR)\Notepad.exe" />
-      </Component>
-      <Component>
-        <File Source="test.txt" />
-      </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs
deleted file mode 100644
index 0bf0e963..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs
+++ /dev/null
@@ -1,48 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
-        
-
-        <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-        <InstallExecuteSequence>
-            <ValidateProductID Suppress="yes" />
-        </InstallExecuteSequence>
-
-        <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-            <ComponentGroupRef Id="ProductComponents" />
-            <ComponentGroupRef Id="Foo1" />
-            <ComponentGroupRef Id="Foo2" />
-        </Feature>
-
-        <!--<CustomActionRef Id="SetFoo" />-->
-
-    </Package>
-
-    <Fragment Id="SetFoo">
-        <CustomAction Id="SetFoo" Property="FOO" Value="BOB" />
-        <CustomAction Id="SetBar" Property="BAR" Value="BOB" />
-    </Fragment>
-
-    <Fragment Id="Foo1">
-        <ComponentGroup Id="Foo1" />
-
-        <InstallExecuteSequence>
-            <Custom Action="SetFoo" Before="SetBar" />
-            <Custom Action="SetBar" Overridable="yes" Before="AppSearch" />
-        </InstallExecuteSequence>
-    </Fragment>
-
-    <Fragment Id="Foo2">
-        <ComponentGroup Id="Foo2" />
-        
-        <InstallExecuteSequence>
-            <Custom Action="SetBar" Before="AppSearch" />
-        </InstallExecuteSequence>
-    </Fragment>
-
-    <Fragment Id="Directories">
-        <StandardDirectory Id="ProgramFilesFolder">
-            <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-        </StandardDirectory>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/PackageComponents.wxs
deleted file mode 100644
index e26c4509..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/PackageComponents.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-       <Component>
-         <File Source="test.txt" />
-       </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/MissingSourceFileAndHash.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/MissingSourceFileAndHash.wxs
deleted file mode 100644
index 5e1b99ff..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/MissingSourceFileAndHash.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <MsuPackage Id="MissingSourceFileAndHash" Permanent="yes" DetectCondition="none">
-                <MsuPackagePayload DownloadUrl="example.com" />
-            </MsuPackage>
-        </PackageGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/MissingSourceFileAndName.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/MissingSourceFileAndName.wxs
deleted file mode 100644
index f220d81a..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/MissingSourceFileAndName.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <MsiPackage Id="MissingSourceFileAndName">
-                <MsiPackagePayload DownloadUrl="example.com" />
-            </MsiPackage>
-        </PackageGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/PackagePayloadInPayloadGroup.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/PackagePayloadInPayloadGroup.wxs
deleted file mode 100644
index 149870a4..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/PackagePayloadInPayloadGroup.wxs
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <ExePackage Id="PackagePayloadInPayloadGroup" Permanent="yes" DetectCondition="none">
-                <PayloadGroupRef Id="PackagePayloadGroup" />
-            </ExePackage>
-        </PackageGroup>
-    </Fragment>
-    <Fragment>
-        <PayloadGroup Id="PackagePayloadGroup">
-            <ExePackagePayload SourceFile="burn.exe" />
-        </PayloadGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedHash.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedHash.wxs
deleted file mode 100644
index 3c361c49..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedHash.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <MspPackage Id="SpecifiedHash">
-                <MspPackagePayload SourceFile="example.msp" DownloadUrl="example.com" Hash="abcd" />
-            </MspPackage>
-        </PackageGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedHashAndMissingDownloadUrl.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedHashAndMissingDownloadUrl.wxs
deleted file mode 100644
index 8e62f660..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedHashAndMissingDownloadUrl.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <MsuPackage Id="SpecifiedHashAndMissingDownloadUrl" Permanent="yes" DetectCondition="none">
-                <MsuPackagePayload Name="example.msu" Hash="abcd" Size="1" Version="1.0.0.0" ProductName="KB1234567" Description="fake msu" />
-            </MsuPackage>
-        </PackageGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedSourceFileAndHash.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedSourceFileAndHash.wxs
deleted file mode 100644
index f79da874..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedSourceFileAndHash.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <ExePackage Id="SpecifiedSourceFileAndHash" Permanent="yes" DetectCondition="none">
-                <ExePackagePayload SourceFile="example.exe" Hash="abcd" />
-            </ExePackage>
-        </PackageGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/WrongPackagePayloadInPayloadGroup.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/WrongPackagePayloadInPayloadGroup.wxs
deleted file mode 100644
index dda306cf..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/WrongPackagePayloadInPayloadGroup.wxs
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <MsiPackage Id="WrongPackagePayloadInPayloadGroup">
-                <PayloadGroupRef Id="WrongPackagePayloadGroup" />
-            </MsiPackage>
-        </PackageGroup>
-    </Fragment>
-    <Fragment>
-        <PayloadGroup Id="WrongPackagePayloadGroup">
-            <ExePackagePayload SourceFile="burn.exe" />
-        </PayloadGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/.data/Av1.0.0.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/.data/Av1.0.0.txt
deleted file mode 100644
index 6fd385bd..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/.data/Av1.0.0.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is A v1.0.0
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/.data/Av1.0.1.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/.data/Av1.0.1.txt
deleted file mode 100644
index b1f0bc01..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/.data/Av1.0.1.txt
+++ /dev/null
@@ -1 +0,0 @@
-This ia A v1.0.1
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/.data/Bv1.0.0.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/.data/Bv1.0.0.txt
deleted file mode 100644
index ece55fec..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/.data/Bv1.0.0.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is B v1.0.0
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/.data/Bv1.0.1.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/.data/Bv1.0.1.txt
deleted file mode 100644
index cf3372fd..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/.data/Bv1.0.1.txt
+++ /dev/null
@@ -1 +0,0 @@
-This ia B v1.0.1
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Package.wxs
deleted file mode 100644
index c9dcdd72..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Package.wxs
+++ /dev/null
@@ -1,28 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="~Test Package" Version="$(var.V)" Manufacturer="Example Corporation" Language="1033" UpgradeCode="e703bf17-4765-444c-91fd-88550fa681d4" Scope="perMachine" ProductCode="e703bf17-4765-444c-91fd-88550fa681d4">
-    
-
-    <MajorUpgrade DowngradeErrorMessage="Newer version already installed." />
-
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLFOLDER" Name="~Test App" />
-      </Directory>
-    </Directory>
-
-    <Feature Id="Main">
-      <ComponentGroupRef Id="Components" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <ComponentGroup Id="Components" Directory="INSTALLFOLDER">
-      <Component Id="A">
-        <File Id="a.txt" Name="a.txt" Source="Av$(var.A).txt" />
-      </Component>
-      <Component Id="B">
-        <File Id="b.txt" Name="b.txt" Source="Bv$(var.B).txt" />
-      </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Patch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Patch.wxs
deleted file mode 100644
index d39170c0..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Patch.wxs
+++ /dev/null
@@ -1,16 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Patch AllowRemoval="yes" Manufacturer="FireGiant" MoreInfoURL="http://www.example.com/" DisplayName="~Test Patch v$(var.V)" Description="~Test Small Update Patch v($var.V)" Classification="Update">
-
-    <Media Id="1" Cabinet="foo.cab">
-      <PatchBaseline Id="RTM" />
-    </Media>
-
-    <PatchFamilyRef Id="SamplePatchFamily" />
-  </Patch>
-
-  <Fragment>
-    <PatchFamily Id="SamplePatchFamily" Version="$(var.V)" Supersede="yes">
-      <ComponentRef Id="A" />
-    </PatchFamily>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFromWixlib/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFromWixlib/Package.wxs
deleted file mode 100644
index 5cb8ede8..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFromWixlib/Package.wxs
+++ /dev/null
@@ -1,30 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="~Test Package" Version="$(var.V)" Manufacturer="Example Corporation" Language="1033" UpgradeCode="{6B8097B9-A5D0-4BDE-B21E-AF6622DDCA01}" Scope="perMachine" ProductCode="{7C871EC1-1F89-4850-A6A9-D7A4C21769F6}">
-    <MajorUpgrade DowngradeErrorMessage="Newer version already installed." />
-    <MediaTemplate EmbedCab="yes" />
-
-    <CustomAction Id="CAFromExtension" DllEntry="DoesntExist" BinaryRef="BinFromWir" />
-
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLFOLDER" Name="~Test App" />
-      </Directory>
-    </Directory>
-
-    <Feature Id="Main">
-      <ComponentGroupRef Id="Components" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <ComponentGroup Id="Components" Directory="INSTALLFOLDER">
-      <Component>
-        <File Source="$(sys.SOURCEFILEPATH)" />
-      </Component>
-
-      <Component>
-        <RegistryValue Root="HKLM" Key="SOFTWARE\!(bind.property.ProductName)\Patch" Name="Version" Value="$(var.V)" />
-      </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFromWixlib/Patch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFromWixlib/Patch.wxs
deleted file mode 100644
index 52e87f64..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFromWixlib/Patch.wxs
+++ /dev/null
@@ -1,16 +0,0 @@
-<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
-    <Patch
-    AllowRemoval="yes"
-    DisplayName="~Test Patch v$(var.V)"
-    Description="~Test Small Update Patch v$(var.V)"
-    MoreInfoURL="http://www.example.com/"
-    Manufacturer="Example Corporation"
-    Classification="Update">
-
-    <Media Id="1" Cabinet="foo.cab">
-      <PatchBaseline Id="RTM" BaselineFile="Baseline.wixpdb" UpdateFile="Update.wixpdb" />
-    </Media>
-
-    <PatchFamily Id='SequenceFamily' Version='$(var.V)' />
-  </Patch>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNoFileChanges/.data/A.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNoFileChanges/.data/A.txt
deleted file mode 100644
index 6fd385bd..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNoFileChanges/.data/A.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is A v1.0.0
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNoFileChanges/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNoFileChanges/Package.wxs
deleted file mode 100644
index dab959d5..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNoFileChanges/Package.wxs
+++ /dev/null
@@ -1,27 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="~Test Package" Version="$(V)" Manufacturer="Example Corporation" Language="1033" UpgradeCode="7d326855-e790-4a94-8611-5351f8321fca" Compressed="yes" Scope="perMachine" ProductCode="7d326855-e790-4a94-8611-5351f8321fca">
-
-    <MajorUpgrade DowngradeErrorMessage="Newer version already installed." />
-    <MediaTemplate EmbedCab="yes" />
-
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="~Test App" />
-    </StandardDirectory>
-
-    <Feature Id="Main">
-      <ComponentGroupRef Id="Components" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <ComponentGroup Id="Components" Directory="INSTALLFOLDER">
-      <Component>
-        <File Id="a.txt" Name="a.txt" Source="A.txt" />
-      </Component>
-
-      <Component>
-        <RegistryValue Root="HKLM" Key="SOFTWARE\!(bind.property.ProductName)\Patch" Name="Version" Value="$(V)" />
-      </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNoFileChanges/Patch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNoFileChanges/Patch.wxs
deleted file mode 100644
index 889b1220..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNoFileChanges/Patch.wxs
+++ /dev/null
@@ -1,16 +0,0 @@
-<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
-  <Patch
-    AllowRemoval="yes"
-    DisplayName="~Test Patch v$(V)"
-    Description="~Test Small Update Patch v$(V)"
-    MoreInfoURL="http://www.example.com/"
-    Manufacturer="Example Corporation"
-    Classification="Update">
-
-    <Media Id="1" Cabinet="foo.cab">
-      <PatchBaseline Id="RTM" BaselineFile="Baseline.wixpdb" UpdateFile="Update.wixpdb" />
-    </Media>
-
-    <PatchFamily Id='SequenceFamily' Version='$(V)' />
-  </Patch>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleA/Bundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleA/Bundle.wxs
deleted file mode 100644
index 4a8f5630..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleA/Bundle.wxs
+++ /dev/null
@@ -1,7 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <PackageGroup Id="BundlePackages">
-      <MspPackage Id="PatchA" SourceFile="PatchA.msp" PerMachine="yes" />
-    </PackageGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleB/Bundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleB/Bundle.wxs
deleted file mode 100644
index 7fb3cb56..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleB/Bundle.wxs
+++ /dev/null
@@ -1,8 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <PackageGroup Id="BundlePackages">
-      <MspPackage Id="PatchA" SourceFile="PatchA.msp" PerMachine="yes" />
-      <MspPackage Id="PatchB" SourceFile="PatchB.msp" PerMachine="yes" />
-    </PackageGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleC/Bundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleC/Bundle.wxs
deleted file mode 100644
index 201d177b..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleC/Bundle.wxs
+++ /dev/null
@@ -1,9 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <PackageGroup Id="BundlePackages">
-      <MspPackage Id="PatchA" SourceFile="PatchA.msp" PerMachine="yes" />
-      <MspPackage Id="PatchB" SourceFile="PatchB.msp" PerMachine="yes" />
-      <MspPackage Id="PatchC" SourceFile="PatchC.msp" PerMachine="yes" />
-    </PackageGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PackageA/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PackageA/Package.wxs
deleted file mode 100644
index 62a89af3..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PackageA/Package.wxs
+++ /dev/null
@@ -1,44 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package ProductCode="26309973-0A5E-4979-B142-98A6E064EDC0" Name="PackageA" Language="1033" Version="$(var.V)" Manufacturer="Example Corporation"
-           UpgradeCode="32B0396A-CE36-4570-B16E-F88FA42DC409" Scope="perMachine" Compressed="yes">
-
-    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-    <MediaTemplate EmbedCab="yes" />
-
-    <PropertyRef Id="TestVersion"/>
-
-    <Feature Id="Complete" Level="1">
-      <ComponentRef Id="FileComponent"/>
-      <ComponentRef Id="RegistryComponent"/>
-      <ComponentRef Id="RegistryComponent2" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-      <StandardDirectory Id="ProgramFilesFolder">
-          <Directory Id="INSTALLFOLDER" Name="~Test A" />
-      </StandardDirectory>
-  </Fragment>
-
-  <Fragment>
-    <Component Id="FileComponent" Directory="INSTALLFOLDER">
-      <File Source="$(sys.SOURCEFILEPATH)"/>
-    </Component>
-  </Fragment>
-
-  <Fragment>
-    <Component Id="RegistryComponent" Directory="INSTALLFOLDER">
-      <RegistryValue Root="HKLM" Key="Software\WiX\Tests\$(var.A)" Name="A" Value="!(bind.Property.TestVersion)" Type="string" />
-    </Component>
-  </Fragment>
-
-  <Fragment>
-    <Component Id="RegistryComponent2" Directory="INSTALLFOLDER">
-      <RegistryValue Root="HKLM" Key="Software\WiX\Tests\$(var.B)" Name="A2" Value="!(bind.Property.TestVersion)" Type="string" />
-    </Component>
-  </Fragment>
-
-  <Fragment>
-    <Property Id="TestVersion" Value="$(var.V)"/>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchA/Patch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchA/Patch.wxs
deleted file mode 100644
index 1b01774c..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchA/Patch.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Patch AllowRemoval="yes" Classification="Update" ClientPatchId="PatchA" Description="Patch A" DisplayName="Patch A" Manufacturer="Example Corporation" MinorUpdateTargetRTM="yes">
-        <Media Id="100" Cabinet="A" EmbedCab="yes">
-            <PatchBaseline Id="PatchA" BaselineFile="Baseline.wixpdb" UpdateFile="Update.wixpdb" />
-        </Media>
-
-        <PatchFamily Id="A" Version="$(var.V)" Supersede="yes">
-          <ComponentRef Id="RegistryComponent" />
-          <PropertyRef Id="TestVersion" />
-        </PatchFamily>
-    </Patch>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchB/Patch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchB/Patch.wxs
deleted file mode 100644
index f0630ead..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchB/Patch.wxs
+++ /dev/null
@@ -1,14 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Patch AllowRemoval="yes" Classification="Update" ClientPatchId="PatchB" Description="Patch B" DisplayName="Patch B" Manufacturer="Example Corporation" MinorUpdateTargetRTM="yes">
-        <Media Id="100" Cabinet="B" EmbedCab="yes">
-            <PatchBaseline Id="PatchB" BaselineFile="Baseline.wixpdb" UpdateFile="Update.wixpdb">
-                <Validate ProductId="no" />
-            </PatchBaseline>
-        </Media>
-
-        <PatchFamily Id="B" Version="$(var.V)" Supersede="yes">
-          <ComponentRef Id="RegistryComponent" />
-          <PropertyRef Id="TestVersion" />
-        </PatchFamily>
-    </Patch>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchC/Patch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchC/Patch.wxs
deleted file mode 100644
index f9d2a55a..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchC/Patch.wxs
+++ /dev/null
@@ -1,14 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Patch AllowRemoval="yes" Classification="Update" ClientPatchId="PatchC" Description="Patch C" DisplayName="Patch C" Manufacturer="Example Corporation" MinorUpdateTargetRTM="yes">
-        <Media Id="100" Cabinet="C" EmbedCab="yes">
-            <PatchBaseline Id="PatchC" BaselineFile="Baseline.wixpdb" UpdateFile="Update.wixpdb">
-                <Validate ProductId="no" UpgradeCode="no" />
-            </PatchBaseline>
-        </Media>
-
-        <PatchFamily Id="C" Version="$(var.V)" Supersede="yes">
-          <ComponentRef Id="RegistryComponent" />
-          <PropertyRef Id="TestVersion" />
-        </PatchFamily>
-    </Patch>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/.data/Av1.0.0.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/.data/Av1.0.0.txt
deleted file mode 100644
index 6fd385bd..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/.data/Av1.0.0.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is A v1.0.0
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/.data/Av1.0.1.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/.data/Av1.0.1.txt
deleted file mode 100644
index b1f0bc01..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/.data/Av1.0.1.txt
+++ /dev/null
@@ -1 +0,0 @@
-This ia A v1.0.1
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/.data/Bv1.0.0.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/.data/Bv1.0.0.txt
deleted file mode 100644
index ece55fec..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/.data/Bv1.0.0.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is B v1.0.0
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/.data/Bv1.0.1.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/.data/Bv1.0.1.txt
deleted file mode 100644
index cf3372fd..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/.data/Bv1.0.1.txt
+++ /dev/null
@@ -1 +0,0 @@
-This ia B v1.0.1
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/BundleA/Bundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/BundleA/Bundle.wxs
deleted file mode 100644
index bc460636..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/BundleA/Bundle.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <PackageGroup Id="BundlePackages">
-      <MsiPackage Id="PackageA" SourceFile="Baseline.msi">
-        <SlipstreamMsp Id="PatchA" />
-      </MsiPackage>
-      <MspPackage Id="PatchA" SourceFile="Patch1.msp" />
-    </PackageGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs
deleted file mode 100644
index e3845382..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs
+++ /dev/null
@@ -1,27 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="~Test Package" Version="$(var.V)" Manufacturer="Example Corporation" Language="1033" UpgradeCode="7d326855-e790-4a94-8611-5351f8321fca" Compressed="yes" Scope="perMachine" ProductCode="7d326855-e790-4a94-8611-5351f8321fca">
-    
-
-    <MajorUpgrade DowngradeErrorMessage="Newer version already installed." />
-    <MediaTemplate EmbedCab="yes" />
-
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="~Test A" />
-    </StandardDirectory>
-
-    <Feature Id="Main">
-      <ComponentGroupRef Id="Components" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <ComponentGroup Id="Components" Directory="INSTALLFOLDER">
-      <Component>
-        <File Id="a.txt" Name="a.txt" Source="Av$(var.A).txt" />
-      </Component>
-      <Component>
-        <File Id="b.txt" Name="b.txt" Source="Bv$(var.B).txt" />
-      </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Patch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Patch.wxs
deleted file mode 100644
index 52e87f64..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Patch.wxs
+++ /dev/null
@@ -1,16 +0,0 @@
-<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
-    <Patch
-    AllowRemoval="yes"
-    DisplayName="~Test Patch v$(var.V)"
-    Description="~Test Small Update Patch v$(var.V)"
-    MoreInfoURL="http://www.example.com/"
-    Manufacturer="Example Corporation"
-    Classification="Update">
-
-    <Media Id="1" Cabinet="foo.cab">
-      <PatchBaseline Id="RTM" BaselineFile="Baseline.wixpdb" UpdateFile="Update.wixpdb" />
-    </Media>
-
-    <PatchFamily Id='SequenceFamily' Version='$(var.V)' />
-  </Patch>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Payload/AbsoluteName.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Payload/AbsoluteName.wxs
deleted file mode 100644
index dc94d688..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Payload/AbsoluteName.wxs
+++ /dev/null
@@ -1,9 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PayloadGroup Id="AbsoluteName">
-            <Payload SourceFile="dir\file.ext" Name="\\server\share\target.file" />
-            <Payload SourceFile="dir\file.ext" Name="C:\target.file" />
-            <Payload SourceFile="dir\file.ext" Name="\dir\target.file" />
-        </PayloadGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Payload/CanonicalizeName.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Payload/CanonicalizeName.wxs
deleted file mode 100644
index 544b80ec..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Payload/CanonicalizeName.wxs
+++ /dev/null
@@ -1,7 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PayloadGroup Id="CanonicalizeName">
-            <Payload SourceFile="dir\file.ext" Name="a\..\c\.\d.exe" />
-        </PayloadGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Payload/DownloadUrlPlaceholdersBundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Payload/DownloadUrlPlaceholdersBundle.wxs
deleted file mode 100644
index f8f38ea6..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Payload/DownloadUrlPlaceholdersBundle.wxs
+++ /dev/null
@@ -1,30 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Bundle Name="DownloadUrlPlaceholders" Version="1.0.0.0" Manufacturer="test" UpgradeCode="{B04C20B8-70C3-4DE1-8D91-4F11C7C68DED}">
-        <BootstrapperApplicationRef Id="fakeba" />
-
-        <Chain>
-            <PackageGroupRef Id="ContainerPackages" />
-            <PackageGroupRef Id="UncompressedPackages" />
-        </Chain>
-
-        <PayloadGroupRef Id="LayoutOnlyPayloads" />
-        <Container Id="PackagesContainer" Name="packages.cab" DownloadUrl="http://example.com/{0}id/{1}/{2}">
-            <PackageGroupRef Id="ContainerPackages" />
-        </Container>
-    </Bundle>
-    <Fragment>
-        <PackageGroup Id="ContainerPackages">
-            <ExePackage SourceFile="burn.exe" DetectCondition="none" Compressed="no" />
-        </PackageGroup>
-    </Fragment>
-    <Fragment>
-        <PackageGroup Id="UncompressedPackages">
-            <MsiPackage SourceFile="test.msi" DownloadUrl="http://example.com/{0}id/{1}/{2}" Compressed="no" />
-        </PackageGroup>
-    </Fragment>
-    <Fragment>
-        <PayloadGroup Id="LayoutOnlyPayloads">
-            <Payload Id="LayoutOnlyPayload" SourceFile="$(sys.SOURCEFILEPATH)" DownloadUrl="http://example.com/{0}id/{1}/{2}" Compressed="no" />
-        </PayloadGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Payload/SharedBAAndPackagePayloadBundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Payload/SharedBAAndPackagePayloadBundle.wxs
deleted file mode 100644
index 5263cbd4..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Payload/SharedBAAndPackagePayloadBundle.wxs
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <ExePackage SourceFile="burn.exe" DetectCondition="none">
-                <PayloadGroupRef Id="Shared" />
-            </ExePackage>
-        </PackageGroup>
-        <BootstrapperApplication>
-            <PayloadGroupRef Id="Shared" />
-        </BootstrapperApplication>
-        <PayloadGroup Id="Shared">
-            <Payload SourceFile="$(sys.SOURCEFILEPATH)" />
-        </PayloadGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Payload/ValidName.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Payload/ValidName.wxs
deleted file mode 100644
index 9c37a27d..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Payload/ValidName.wxs
+++ /dev/null
@@ -1,7 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PayloadGroup Id="ValidName">
-            <Payload SourceFile="dir\file.ext" Name="dir\file.ext" />
-        </PayloadGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Preprocessor/EnvParens.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Preprocessor/EnvParens.wxs
deleted file mode 100644
index 68d115c5..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Preprocessor/EnvParens.wxs
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?define Test = "$(env.CommonProgramFiles(x86))" ?>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/PackageComponents.wxs
deleted file mode 100644
index 37a2c462..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/PackageComponents.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-       <Component>
-         <File Source="example.txt" />
-       </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/PackageWithTag.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/PackageWithTag.wxs
deleted file mode 100644
index 5bf78a9d..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/PackageWithTag.wxs
+++ /dev/null
@@ -1,18 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package ProductCode="8738B0C5-C4AA-4634-8C03-11EAA2F1E15D" Name="~TagTestPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-
-    <SoftwareTag Regid="wixtoolset.org" InstallDirectory="INSTALLFOLDER" />
-  </Package>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-    </StandardDirectory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/example.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/example.txt
deleted file mode 100644
index 1b4ffe8a..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/example.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is example.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/MinimalComponentGroup.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/MinimalComponentGroup.wxs
deleted file mode 100644
index f62bbd0e..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/MinimalComponentGroup.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="MinimalComponentGroup" Directory="INSTALLFOLDER">
-            <Component>
-                <File Source="test.txt" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs
deleted file mode 100644
index 433be7f0..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs
+++ /dev/null
@@ -1,19 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?ifndef ProductCode?>
-    <?define ProductCode = *?>
-    <?endif?>
-    <Package Name="MsiPackage" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="12E4699F-E774-4D05-8A01-5BDD41BBA127" Compressed="no" Scope="perMachine" ProductCode="$(var.ProductCode)">
-
-        <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-
-        <Feature Id="ProductFeature" Title="MsiPackageTitle">
-            <ComponentGroupRef Id="ProductComponents" />
-        </Feature>
-    </Package>
-
-    <Fragment>
-        <StandardDirectory Id="ProgramFiles6432Folder">
-            <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-        </StandardDirectory>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/NestedUnderClass.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/NestedUnderClass.wxs
deleted file mode 100644
index 0621eb8d..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/NestedUnderClass.wxs
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <Component Id="ProgIdComp" Directory="INSTALLFOLDER" Guid="5B3B3FC1-533D-4C29-BFB3-0E88B51E59D8">
-                <File Source="test.txt" Name="ProgIdComp.txt"></File>
-                <Class Id="F12A6F69-117F-471F-AE73-F8E74218F498" Advertise="yes" Context="LocalServer32" Description="FakeClassF12A" ThreadingModel="apartment" Version="0.0.0.1">
-                    <ProgId Id="73E7DF7E-EFAC-4E11-90E2-6EBAEB8DE58D" NoOpen="NoOpen73E7" />
-                </Class>
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/Package.wxs
deleted file mode 100644
index d3b31db5..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/Package.wxs
+++ /dev/null
@@ -1,17 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="ProgId" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
-    
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-    </StandardDirectory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/PackageComponents.wxs
deleted file mode 100644
index 5166be16..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/PackageComponents.wxs
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-            <Component>
-                <File Name="Foo.exe" Source="test.txt" />
-                <ProgId Id="Foo.File.hol.15" Advertise="yes" Description="Foo Holiday File">
-                    <ProgId Id="Foo.File.hol" />
-                    <Extension Id="hol">
-                        <Verb Id="Open" Argument="/hol &quot;%1&quot;" Sequence="1" />
-                    </Extension>
-                </ProgId>
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PublishComponent/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/PublishComponent/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PublishComponent/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PublishComponent/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PublishComponent/Package.wxs
deleted file mode 100644
index 8f4f661d..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PublishComponent/Package.wxs
+++ /dev/null
@@ -1,34 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="MsiPackage" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <Feature Id="ProductFeature1" Title="!(loc.FeatureTitle)">
-      <ComponentRef Id="Component1" Primary="yes" />
-    </Feature>
-
-    <Feature Id="ProductFeature2" Title="!(loc.FeatureTitle)">
-      <ComponentRef Id="Component1" />
-      <ComponentRef Id="Component2" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-    </StandardDirectory>
-  </Fragment>
-
-  <Fragment>
-    <Component Id="Component1" Directory="INSTALLFOLDER" Guid="C8EFA5DF-2876-4724-A003-A6BEBF140BB1">
-        <File Id="File1" Source="test.txt" />
-        <Category Id="{BD245B5A-EC33-46ED-98FF-E9D3D416AD04}" AppData="AppData1" Qualifier="Qualifier1" />
-    </Component>
-  </Fragment>
-
-  <Fragment>
-    <Component Id="Component2" Directory="INSTALLFOLDER" Guid="8DE79DE7-4B55-4D43-88F5-AD6A1E8D242A">
-        <File Id="File2" Source="test.txt" />
-        <Category Id="{0A82C8F6-9CE9-4336-B8BE-91A39B5F7081}" AppData="AppData2" Qualifier="Qualifier2" />
-    </Component>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PublishComponent/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/PublishComponent/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PublishComponent/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Registry/DuplicateRegistryValueIds.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Registry/DuplicateRegistryValueIds.wxs
deleted file mode 100644
index 452aea69..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Registry/DuplicateRegistryValueIds.wxs
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-            <Component>
-                <RegistryKey Root="HKLM" Key="Software\Acme\Foobar 1.0">
-                    <RegistryValue Type="string" Name="InstallDir" Value="[TARGETDIR]" />
-                    <RegistryValue Type="string" Name="InstallDir" Value="[INSTALLDIR]" />
-                    <RegistryValue Type="string" Name="InstallDir" Value="[ProgramFilesFolder]" />
-                </RegistryKey>
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Registry/RegistryKeyEndingWithBackslash.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Registry/RegistryKeyEndingWithBackslash.wxs
deleted file mode 100644
index 1fb2e906..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Registry/RegistryKeyEndingWithBackslash.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-            <Component Id="MiscComponent" Guid="7C40C257-AB36-4B8C-8FD1-C56E0AC4AAEF">
-                <RegistryKey Id="reg1" Root="HKLM" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Key="Software\WBM\WB\">
-                    <RegistryValue Id="reg2" Type="string" Name="InstallationPath" Value="[INSTALLFOLDER]" />
-                </RegistryKey>
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Registry/RegistryValue.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Registry/RegistryValue.wxs
deleted file mode 100644
index fe6e179e..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Registry/RegistryValue.wxs
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-            <Component Id="MiscComponent" Guid="7C40C257-AB36-4B8C-8FD1-C56E0AC4AAEF">
-                <RegistryValue Root="HKLM" Key="Path\To\Key" Value="1.0.1234.123" Type="string" KeyPath="yes" />
-                <RegistryValue Root="HKLM" Key="Path\To\AnotherKey" Name="Secret" Type="binary"  />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Registry/RegistryValueMultiString.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Registry/RegistryValueMultiString.wxs
deleted file mode 100644
index c62c571d..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Registry/RegistryValueMultiString.wxs
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-            <Component Id="MultiStringComponent" Guid="7C40C257-AB36-4B8C-8FD1-C56E0AC4AAEF">
-                <RegistryValue Root="HKLM" Key="Path\To\Key" Type="multiString" KeyPath="yes">
-                    <MultiString Value="a" />
-                    <MultiStringValue Value="b" />
-                    <MultiStringValue />
-                    <MultiString Value="c" />
-                    <MultiStringValue />
-                </RegistryValue>
-                <RegistryValue Root="HKLM" Key="Path\To\AnotherKey" Name="Secret" Type="binary"  />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Registry/RemoveRegistryKey.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Registry/RemoveRegistryKey.wxs
deleted file mode 100644
index a55a1e18..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Registry/RemoveRegistryKey.wxs
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <Component Id="RemoveRegistryKeyComp" Directory="INSTALLFOLDER" Guid="5B3B3FC1-533D-4C29-BFB3-0E88B51E59D8">
-                <File Source="test.txt" />
-                <RemoveRegistryKey Id="RemoveAKeyName" Action="removeOnUninstall" Root="HKLM" Key="AKeyName" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ReserveCost/ReserveCost.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ReserveCost/ReserveCost.wxs
deleted file mode 100644
index 3218295b..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ReserveCost/ReserveCost.wxs
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <Component Id="ReserveCostComp" Directory="INSTALLFOLDER" Guid="5B3B3FC1-533D-4C29-BFB3-0E88B51E59D8">
-                <File Source="test.txt" />
-                <ReserveCost Id="TestCost" RunFromSource="200" RunLocal="100"></ReserveCost>
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/RollbackBoundary/BeginningOfChain.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/RollbackBoundary/BeginningOfChain.wxs
deleted file mode 100644
index ecfccfcb..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/RollbackBoundary/BeginningOfChain.wxs
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <RollbackBoundary Id="nonvital" Vital="no" />
-            <PackageGroupRef Id="MinimalPackageGroup" />
-        </PackageGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SameFileFolders/TestComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SameFileFolders/TestComponents.wxs
deleted file mode 100644
index bbad63e6..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SameFileFolders/TestComponents.wxs
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-      <Component Subdirectory="a">
-        <File Source="a\test.txt" />
-      </Component>
-      <Component Subdirectory="b">
-        <File Source="b\test.txt" />
-      </Component>
-      <Component Subdirectory="c">
-        <File Source="c\test.txt" />
-      </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SameFileFolders/data/a/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/SameFileFolders/data/a/test.txt
deleted file mode 100644
index 1970cae6..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SameFileFolders/data/a/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is a\test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SameFileFolders/data/b/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/SameFileFolders/data/b/test.txt
deleted file mode 100644
index fa2c7082..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SameFileFolders/data/b/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is b\test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SameFileFolders/data/c/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/SameFileFolders/data/c/test.txt
deleted file mode 100644
index 1c0cbda6..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SameFileFolders/data/c/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is c\test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SequenceTables/DecompiledSequenceTables.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SequenceTables/DecompiledSequenceTables.wxs
deleted file mode 100644
index d5379e7b..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SequenceTables/DecompiledSequenceTables.wxs
+++ /dev/null
@@ -1,32 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Codepage="1252" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{12E4699F-E774-4D05-8A01-5BDD41BBA127}" Version="1.0.0.0" ProductCode="{74C29381-1915-4948-B8B4-5646806A0BD4}">
-    <CustomAction Id="CustomAction2" Property="TestAdvtExecuteSequenceProperty" Value="1" />
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="ykd0udtb">
-        <Component Id="test.txt" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Bitness="always32">
-          <File Id="test.txt" Name="test.txt" KeyPath="yes" Source="MsiPackage\test.txt" />
-        </Component>
-      </Directory>
-    </StandardDirectory>
-    <Feature Id="ProductFeature" Level="1" Title="MsiPackageTitle">
-      <ComponentRef Id="test.txt" />
-    </Feature>
-    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-    <Media Id="1" />
-    <InstallExecuteSequence>
-      <Custom Action="CustomAction2" After="CostInitialize" />
-    </InstallExecuteSequence>
-    <InstallUISequence>
-      <Custom Action="CustomAction2" After="CostInitialize" />
-    </InstallUISequence>
-    <AdminExecuteSequence>
-      <Custom Action="CustomAction2" After="CostInitialize" />
-    </AdminExecuteSequence>
-    <AdminUISequence>
-      <Custom Action="CustomAction2" After="CostInitialize" />
-    </AdminUISequence>
-    <AdvertiseExecuteSequence>
-      <Custom Action="CustomAction2" After="CostInitialize" />
-    </AdvertiseExecuteSequence>
-  </Package>
-</Wix>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SequenceTables/SequenceTables.msi b/src/test/WixToolsetTest.CoreIntegration/TestData/SequenceTables/SequenceTables.msi
deleted file mode 100644
index 7f894091..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SequenceTables/SequenceTables.msi
+++ /dev/null
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ServiceInstall/OwnProcess.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ServiceInstall/OwnProcess.wxs
deleted file mode 100644
index 65cba20e..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ServiceInstall/OwnProcess.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <Component Directory="INSTALLFOLDER">
-                <File Id="test.txt" Source="test.txt" />
-                <ServiceInstall Name="SampleService" ErrorControl="ignore" Start="disabled" Type="ownProcess" />
-                <ServiceControl Name="SampleService" Start="install" Stop="uninstall" Remove="uninstall" Wait="yes" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/Package.wxs
deleted file mode 100644
index d3f8accf..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/Package.wxs
+++ /dev/null
@@ -1,19 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="MsiPackage" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
-    
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-
-    <SetProperty Id="INSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" />
-  </Package>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-    </StandardDirectory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/PackageComponents.wxs
deleted file mode 100644
index e26c4509..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/PackageComponents.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-       <Component>
-         <File Source="test.txt" />
-       </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SetVariable/Simple.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SetVariable/Simple.wxs
deleted file mode 100644
index 7e8f2e99..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SetVariable/Simple.wxs
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <PackageGroupRef Id="MinimalPackageGroup" />
-        </PackageGroup>
-
-        <SetVariable Id="SetCoercedNumber" Variable="CoercedNumber" Value="2" />
-        <SetVariable Id="SetCoercedString" Variable="CoercedString" Value="Bar" />
-        <SetVariable Id="SetCoercedVersion" Variable="CoercedVersion" Value="v2.0" />
-        <SetVariable Id="SetNeedsFormatting" Variable="NeedsFormatting" Value="[One] [Two] [Three]" />
-        <SetVariable Id="SetUnset" Variable="Unset" Condition="VersionString = v2.0" After="SetVersionString" />
-        <SetVariable Id="SetVersionString" Variable="VersionString" Value="v1.0" Type="string" />
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SharedPayloadsBetweenPackages/SharedPayloadsBetweenPackages.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SharedPayloadsBetweenPackages/SharedPayloadsBetweenPackages.wxs
deleted file mode 100644
index f16fce0d..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SharedPayloadsBetweenPackages/SharedPayloadsBetweenPackages.wxs
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <ExePackage SourceFile="C:\Windows\system32\credwiz.exe" Permanent="yes" DetectCondition="none">
-                <PayloadGroupRef Id="SharedPayloads" />
-            </ExePackage>
-            <ExePackage SourceFile="C:\Windows\system32\cscript.exe" Permanent="yes" DetectCondition="none">
-                <PayloadGroupRef Id="SharedPayloads" />
-            </ExePackage>
-        </PackageGroup>
-    </Fragment>
-    <Fragment>
-        <PayloadGroup Id="SharedPayloads">
-            <Payload Id="SourceFilePayload" SourceFile="$(sys.SOURCEFILEPATH)" />
-        </PayloadGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Shortcut/DecompiledShortcuts.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Shortcut/DecompiledShortcuts.wxs
deleted file mode 100644
index da1e4f38..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Shortcut/DecompiledShortcuts.wxs
+++ /dev/null
@@ -1,19 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Codepage="1252" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{12E4699F-E774-4D05-8A01-5BDD41BBA127}" Version="1.0.0.0" ProductCode="{6CA94D1D-B568-4ED6-9EBC-3534C85970BB}">
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="ykd0udtb">
-        <Component Id="ShortcutComp" Guid="{5B3B3FC1-533D-4C29-BFB3-0E88B51E59D8}" Bitness="always32">
-        <File Id="test.txt" Name="test.txt" KeyPath="yes" Source="MsiPackage\test.txt" />
-        <Shortcut Id="FileTargetShortcut" Directory="INSTALLFOLDER" Name="FileTargetShortcut" ShortName="lm2tdtqp" Target="[#test.txt]" />
-        <Shortcut Id="CustomTargetShortcut" Directory="INSTALLFOLDER" Name="Planner" ShortName="PLANNER" Target="[INSTALLFOLDER]custom.target" />
-        <Shortcut Id="AdvtShortcut" Directory="INSTALLFOLDER" Name="AdvtShortcut" ShortName="mdbqel9r" Advertise="yes" />
-        </Component>
-      </Directory>
-    </StandardDirectory>
-    <Feature Id="ProductFeature" Level="1" Title="MsiPackageTitle">
-      <ComponentRef Id="ShortcutComp" Primary="yes" />
-    </Feature>
-    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-    <Media Id="1" />
-  </Package>
-</Wix>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Shortcut/ShortcutProperty.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Shortcut/ShortcutProperty.wxs
deleted file mode 100644
index 27f2ab9b..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Shortcut/ShortcutProperty.wxs
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <Component Id="ShortcutComp" Directory="INSTALLFOLDER" Guid="5B3B3FC1-533D-4C29-BFB3-0E88B51E59D8">
-                <File Source="test.txt">
-                    <Shortcut Id="TheShortcut" Name="d" Directory="INSTALLFOLDER">
-                        <ShortcutProperty Key="CustomShortcutKey" Value="CustomShortcutValue"></ShortcutProperty>
-                    </Shortcut>
-                </File>
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Shortcut/ShortcutSameNameShortName.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Shortcut/ShortcutSameNameShortName.wxs
deleted file mode 100644
index d704bbf1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Shortcut/ShortcutSameNameShortName.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <Component Id="ShortcutComp" Directory="INSTALLFOLDER" Guid="5B3B3FC1-533D-4C29-BFB3-0E88B51E59D8">
-                <File Source="test.txt">
-                    <Shortcut Name="DaName" ShortName="DANAME" Directory="INSTALLFOLDER" />
-                </File>
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Shortcut/shortcuts.msi b/src/test/WixToolsetTest.CoreIntegration/TestData/Shortcut/shortcuts.msi
deleted file mode 100644
index 8737f3c2..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Shortcut/shortcuts.msi
+++ /dev/null
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/Bundle.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/Bundle.en-us.wxl
deleted file mode 100644
index bc1dee83..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/Bundle.en-us.wxl
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="BundleName">~TestBundle</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/Bundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/Bundle.wxs
deleted file mode 100644
index 21749c07..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/Bundle.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Bundle Name="!(loc.BundleName)" Version="!(bind.packageVersion.test.msi)" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-    <BootstrapperApplication>
-      <BootstrapperApplicationDll SourceFile="fakeba.dll" />
-    </BootstrapperApplication>
-    <Chain>
-      <MsiPackage SourceFile="test.msi">
-        <MsiProperty Name="TEST" Value="1" />
-      </MsiPackage>
-    </Chain>
-  </Bundle>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/MultiFileBootstrapperApplication.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/MultiFileBootstrapperApplication.wxs
deleted file mode 100644
index f5fe9885..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/MultiFileBootstrapperApplication.wxs
+++ /dev/null
@@ -1,7 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <BootstrapperApplication Id="fakeba">
-      <BootstrapperApplicationDll SourceFile="fakeba.dll" />
-    </BootstrapperApplication>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/MultiFileBundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/MultiFileBundle.wxs
deleted file mode 100644
index 48f53ae3..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/MultiFileBundle.wxs
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Bundle Name="!(loc.BundleName)" Version="!(bind.packageVersion.test.msi)" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-    <BootstrapperApplicationRef Id="fakeba">
-      <PayloadGroupRef Id="TestPayloadGroup" />
-    </BootstrapperApplicationRef>
-    <Chain>
-      <MsiPackage SourceFile="test.msi">
-        <MsiProperty Name="TEST" Value="1" />
-      </MsiPackage>
-    </Chain>
-  </Bundle>
-  <Fragment>
-    <PayloadGroup Id="TestPayloadGroup">
-      <Payload SourceFile="MsiPackage\test.txt" />
-    </PayloadGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/data/MsiPackage/Shared.dll b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/data/MsiPackage/Shared.dll
deleted file mode 100644
index 0e461ba8..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/data/MsiPackage/Shared.dll
+++ /dev/null
@@ -1 +0,0 @@
-This is Shared.dll.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/data/MsiPackage/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/data/MsiPackage/test.txt
deleted file mode 100644
index 8b986220..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/data/MsiPackage/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/data/fakeba.dll b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/data/fakeba.dll
deleted file mode 100644
index 970efdf0..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/data/fakeba.dll
+++ /dev/null
@@ -1 +0,0 @@
-This is a fakeba.dll
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/data/test.msi b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/data/test.msi
deleted file mode 100644
index 0722d60e..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/data/test.msi
+++ /dev/null
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/.data/test.msm b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/.data/test.msm
deleted file mode 100644
index 6f179aba..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/.data/test.msm
+++ /dev/null
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs
deleted file mode 100644
index 3c999812..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs
+++ /dev/null
@@ -1,20 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="MsiPackage" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200" Scope="perMachine">
-    
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <MergeRef Id="TestMsm" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage">
-        <!--   -->
-        <Merge Id="TestMsm" Language="1033" SourceFile="test.msm" />
-      </Directory>
-    </StandardDirectory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.en-us.wxl
deleted file mode 100644
index c74e86a7..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.en-us.wxl
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="Manufacturer">Example Company</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wixproj b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wixproj
deleted file mode 100644
index 597d4318..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wixproj
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>0.9</ProductVersion>
-    <ProjectGuid>27df04c6-3cef-4b9a-bac6-4e78d188384f</ProjectGuid>
-    <OutputName>MergeModule1</OutputName>
-    <OutputType>Module</OutputType>
-    <Name>MergeModule1</Name>
-    <RootNamespace>MergeModule1</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="MergeModule.wxs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="MergeModule.en-us.wxl" />
-  </ItemGroup>
-  <ItemGroup>
-    <WixExtension Include="FgwepExtension.wixext">
-      <Name>FgwepExtension.wixext</Name>
-      <HintPath>$(WixExtDir)\FgwepExtension.wixext.dll</HintPath>
-    </WixExtension>
-  </ItemGroup>
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " />
-  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="FG-WiX or WiX Toolset build tools (v3.11 or later) must be installed to build this project. To download FG-WiX, go to https://www.firegiant.com/downloads/. To download the WiX Toolset, go to http://wixtoolset.org/releases/." />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wxs
deleted file mode 100644
index 8317e7af..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wxs
+++ /dev/null
@@ -1,17 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Module Id="MergeModule1" Language="1033" Version="1.0.0.0" Guid="243FB739-4D05-472F-9CFB-EF6B1017B6DE" InstallerVersion="200">
-        <SummaryInformation Manufacturer="!(loc.Manufacturer)" />
-
-        <Directory Id="MergeRedirectFolder">
-            <Component Id="ModuleComponent1" Guid="A04E61B2-3ED4-4803-B2EB-4B773576FA45">
-                <File Id="File1" Source="test.txt" />
-            </Component>
-        </Directory>
-
-        <Directory Id="NotTheMergeRedirectFolder">
-            <Component Id="ModuleComponent2" Guid="EADB3047-BD32-417B-AABF-B8D9CCDC22DA">
-                <File Id="File2" Source="test.txt" />
-            </Component>
-        </Directory>
-    </Module>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleExeBundle/SingleExePackageGroup.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleExeBundle/SingleExePackageGroup.wxs
deleted file mode 100644
index cad1f049..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleExeBundle/SingleExePackageGroup.wxs
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <ExePackage DetectCondition="DetectedSomething" SourceFile="burn.exe" />
-        </PackageGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleExeBundle/SingleExeRemotePayload.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleExeBundle/SingleExeRemotePayload.wxs
deleted file mode 100644
index 0d459f02..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleExeBundle/SingleExeRemotePayload.wxs
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <PackageGroup Id="BundlePackages">
-            <ExePackage
-                InstallArguments="/q /norestart &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
-                UninstallArguments="/uninstall /q /norestart &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
-                PerMachine="yes"
-                DetectCondition="A"
-                InstallCondition="B"
-                Id="NetFx462Web"
-                Vital="yes"
-                Permanent="yes"
-                Protocol="netfx4"
-                LogPathVariable="NetFx462FullLog">
-                <ExePackagePayload
-                  DownloadUrl="C"
-                  Name="NDP462-KB3151802-Web.exe"
-                  Description="Microsoft .NET Framework 4.6.2 Setup"
-                  Hash="C42E6ED280290648BBD59F664008852F4CFE4548"
-                  ProductName="Microsoft .NET Framework 4.6.2"
-                  Size="9223372036854775807"
-                  Version="4.6.1590.0" />
-            </ExePackage>
-        </PackageGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs
deleted file mode 100644
index d7b5bdc0..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs
+++ /dev/null
@@ -1,17 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="MsiPackage" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
-    
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-    </StandardDirectory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/PackageComponents.wxs
deleted file mode 100644
index b8e9f59c..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/PackageComponents.wxs
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-            <Component>
-                <File Source="test.txt" />
-            </Component>
-            <Component Id="Shared.dll" Shared="yes">
-                <File Name="Shared.dll" Source="test.txt" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/Package.wxs
deleted file mode 100644
index baa0c6b1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/Package.wxs
+++ /dev/null
@@ -1,25 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="MsiPackage" Codepage="65001" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200" Scope="perMachine">
-    
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <?ifndef MediaTemplateCompressionLevel?>
-    <Media Id="1" Cabinet="example.cab" />
-    <?elseif $(MediaTemplateCompressionLevel) = ""?>
-    <MediaTemplate />
-    <?else?>
-    <MediaTemplate CabinetTemplate="low{0}.cab" CompressionLevel="$(MediaTemplateCompressionLevel)" />
-    <?endif?>
-    
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-    </StandardDirectory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/PackageComponents.wxs
deleted file mode 100644
index e26c4509..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/PackageComponents.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-       <Component>
-         <File Source="test.txt" />
-       </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SuppressModularization/Module.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/SuppressModularization/Module.en-us.wxl
deleted file mode 100644
index c74e86a7..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SuppressModularization/Module.en-us.wxl
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="Manufacturer">Example Company</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SuppressModularization/Module.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SuppressModularization/Module.wxs
deleted file mode 100644
index f4ce9c48..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SuppressModularization/Module.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Module Id="MergeModule1" Language="1033" Version="1.0.0.0" Guid="243FB739-4D05-472F-9CFB-EF6B1017B6DE">
-    <SummaryInformation Manufacturer="!(loc.Manufacturer)" />
-
-    <Property Id="Test" Hidden="true" SuppressModularization="true" />
-    <CustomAction Id="Test" DllEntry="TestEntry" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="FakeCA" />
-
-    <Binary Id="FakeCA" SourceFile="test.txt" />
-  </Module>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SuppressModularization/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/SuppressModularization/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SuppressModularization/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/TextStyle/ColorNull.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/TextStyle/ColorNull.wxs
deleted file mode 100644
index 669de6ec..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/TextStyle/ColorNull.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup"></ComponentGroupRef>
-        </ComponentGroup>
-
-        <UI Id="CustomUI">
-            <TextStyle Id="FirstTextStyle" FaceName="Arial" Size="2" />
-        </UI>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/TextStyle/SizeLocalized.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/TextStyle/SizeLocalized.en-us.wxl
deleted file mode 100644
index 77d46861..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/TextStyle/SizeLocalized.en-us.wxl
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-  <String Id="CustomFontName"><!-- NameComment -->Tahoma</String>
-  <String Id="CustomFontSize"><!-- SizeComment -->8</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/TextStyle/SizeLocalized.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/TextStyle/SizeLocalized.wxs
deleted file mode 100644
index a591fdd9..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/TextStyle/SizeLocalized.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup"></ComponentGroupRef>
-        </ComponentGroup>
-
-        <UI Id="CustomUI">
-            <TextStyle Id="CustomFont" FaceName="!(loc.CustomFontName)" Size="!(loc.CustomFontSize)" />
-        </UI>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/TypeLib/Language0.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/TypeLib/Language0.wxs
deleted file mode 100644
index fa64f98f..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/TypeLib/Language0.wxs
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <Component Id="TypeLibComp" Directory="INSTALLFOLDER" Guid="E85CB46B-BC22-4943-B678-5E399CBE53A6">
-                <File Source="test.txt" Name="TypeLibComp.txt"></File>
-                <TypeLib Id="765BE8EE-BD7F-491E-90D2-C5A972462B50" Advertise="yes" Language="0" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Upgrade/DetectOnly.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Upgrade/DetectOnly.wxs
deleted file mode 100644
index 587d8e95..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Upgrade/DetectOnly.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup"></ComponentGroupRef>
-        </ComponentGroup>
-
-        <Upgrade Id="B05772EA-82B8-4DE0-B7EB-45B5F0CCFE6D">
-            <UpgradeVersion Minimum="1.0.0" Property="RELPRODFOUND"></UpgradeVersion>
-        </Upgrade>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/UsingProvides/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/UsingProvides/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/UsingProvides/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/UsingProvides/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/UsingProvides/Package.wxs
deleted file mode 100644
index 59839f30..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/UsingProvides/Package.wxs
+++ /dev/null
@@ -1,16 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package ProductCode="{A81D50F9-B696-4F3D-ABE0-E64D61590E5F}" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-    </StandardDirectory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/UsingProvides/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/UsingProvides/PackageComponents.wxs
deleted file mode 100644
index 7e459e9a..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/UsingProvides/PackageComponents.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-        <Component>
-            <File Source="example.txt" />
-            <Provides Key="UsingProvides" />
-        </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/UsingProvides/example.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/UsingProvides/example.txt
deleted file mode 100644
index 1b4ffe8a..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/UsingProvides/example.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is example.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs
deleted file mode 100644
index 7de55810..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs
+++ /dev/null
@@ -1,31 +0,0 @@
-<?define Foo = "Foo" ?>
-<?define Foo = "Foo" ?>
-
-<?define Bar = "Bar" ?>
-<?define Bar = "Baz" ?>
-
-<?ifdef $(sys.WIXVERSION) ?>
-<?if $(sys.WIXMAJORVERSION) >= 4 AND $(sys.WIXMAJORVERSION) < 5 ?>
-  <?warning WiX v4 is in effect! ?>
-<?endif?>
-<?endif?>
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
-    
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-      </Directory>
-    </Directory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/PackageComponents.wxs
deleted file mode 100644
index e26c4509..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/PackageComponents.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-       <Component>
-         <File Source="test.txt" />
-       </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/WixVariableOverride/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/WixVariableOverride/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/WixVariableOverride/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/WixVariableOverride/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/WixVariableOverride/Package.wxs
deleted file mode 100644
index f8203a07..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/WixVariableOverride/Package.wxs
+++ /dev/null
@@ -1,19 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="MsiPackage" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
-
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-
-    <WixVariable Id="TestFile" Value="test2.txt" />
-  </Package>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-    </StandardDirectory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/WixVariableOverride/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/WixVariableOverride/PackageComponents.wxs
deleted file mode 100644
index df867923..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/WixVariableOverride/PackageComponents.wxs
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <Binary Id="Test.txt" SourceFile="!(wix.TestFile=test.txt)" />
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-            <Component>
-                <File Source="test.txt" />
-            </Component>
-            <Component Id="Shared.dll" Shared="yes">
-                <File Name="Shared.dll" Source="test.txt" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/WixVariableOverride/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/WixVariableOverride/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/WixVariableOverride/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/WixVariableOverride/data/test2.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/WixVariableOverride/data/test2.txt
deleted file mode 100644
index eab3a9b5..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/WixVariableOverride/data/test2.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test2.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs
deleted file mode 100644
index 7e6eee9f..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs
+++ /dev/null
@@ -1,19 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Package Name="MsiPackage" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
-        
-
-        <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-        <CustomAction Id="CAFromExtension" DllEntry="DoesntExist" BinaryRef="BinFromWir" />
-
-        <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-            <ComponentGroupRef Id="ProductComponents" />
-        </Feature>
-    </Package>
-
-    <Fragment>
-        <StandardDirectory Id="ProgramFilesFolder">
-            <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-        </StandardDirectory>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/PackageComponents.wxs
deleted file mode 100644
index e26c4509..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/PackageComponents.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-       <Component>
-         <File Source="test.txt" />
-       </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/Package.wxs
deleted file mode 100644
index b29a785f..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/Package.wxs
+++ /dev/null
@@ -1,19 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Package Name="MsiPackage" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
-        
-
-        <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-        <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-            <ComponentGroupRef Id="ProductComponents" />
-        </Feature>
-    </Package>
-
-    <Fragment>
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="ProgramFilesFolder">
-                <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-            </Directory>
-        </Directory>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/PackageComponents.wxs
deleted file mode 100644
index 7d1a4ae1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/PackageComponents.wxs
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-        <Binary Id="FooAlpha" SourceFile="!(bindpath.AlphaBits)foo.dll" />
-    </Fragment>
-
-    <Fragment>
-        <Binary Id="FooMips" SourceFile="!(bindpath.MipsBits)foo.dll" />
-    </Fragment>
-
-    <Fragment>
-        <Binary Id="FooPowerPC" SourceFile="!(bindpath.PowerBits)foo.dll" />
-    </Fragment>
-
-    <Fragment>
-        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-            <Component>
-                <File Source="test.txt" />
-            </Component>
-            
-            <Component Id="Shared.dll" Shared="yes">
-                <File Name="Shared.dll" Source="test.txt" />
-            </Component>
-        </ComponentGroup>
-    </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/data/alpha/foo.dll b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/data/alpha/foo.dll
deleted file mode 100644
index fd36c768..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/data/alpha/foo.dll
+++ /dev/null
@@ -1 +0,0 @@
-This is alpha\foo.dll.
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/data/mips/foo.dll b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/data/mips/foo.dll
deleted file mode 100644
index 292925c7..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/data/mips/foo.dll
+++ /dev/null
@@ -1 +0,0 @@
-This is mips\foo.dll.
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/data/powerpc/foo.dll b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/data/powerpc/foo.dll
deleted file mode 100644
index 663e9d99..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/data/powerpc/foo.dll
+++ /dev/null
@@ -1 +0,0 @@
-This is powerpc\foo.dll.
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestXmlFixture.cs b/src/test/WixToolsetTest.CoreIntegration/TestXmlFixture.cs
deleted file mode 100644
index 5330305e..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestXmlFixture.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System.Collections.Generic;
-    using WixToolset.Core.TestPackage;
-    using Xunit;
-
-    public class TestXmlFixture
-    {
-        [Fact]
-        public void ChangesIgnoredAttributesToStarToHelpMakeTestsLessFragile()
-        {
-            var original = @"<Top One='f'>
-  <First Two='t'>
-    <Target One='a' Two='b' Three='c' />
-  </First>
-  <Target One='z' Two='x' Three = 'y' />
-</Top>";
-            var expected = "<Top One='f'><First Two='t'><Target One='*' Two='*' Three='c' /></First><Target One='*' Two='*' Three='y' /></Top>";
-            var ignored = new Dictionary<string, List<string>> { { "Target", new List<string> { "One", "Two", "Missing" } } };
-            Assert.Equal(expected, original.GetTestXml(ignored));
-        }
-
-        [Fact]
-        public void OutputsSingleQuotesSinceDoubleQuotesInCsharpLiteralStringsArePainful()
-        {
-            var original = "<Test Simple=\"\" EscapedDoubleQuote=\"&quot;\" SingleQuoteValue=\"'test'\" Alternating='\"' AlternatingEscaped='&quot;' />";
-            var expected = "<Test Simple='' EscapedDoubleQuote='\"' SingleQuoteValue='&apos;test&apos;' Alternating='\"' AlternatingEscaped='\"' />";
-            Assert.Equal(expected, original.GetTestXml());
-        }
-
-        [Fact]
-        public void RemovesAllNamespacesToReduceTyping()
-        {
-            var original = "<Test xmlns='a'><Child xmlns:b='b'><Grandchild xmlns:c='c' /><Grandchild /></Child></Test>";
-            var expected = "<Test><Child><Grandchild /><Grandchild /></Child></Test>";
-            Assert.Equal(expected, original.GetTestXml());
-        }
-
-        [Fact]
-        public void RemovesUnnecessaryWhitespaceToAvoidLineEndingIssues()
-        {
-            var original = @"<Test>
-  <Child>
-    <Grandchild />
-    <Grandchild />
-  </Child>
-</Test>";
-            var expected = "<Test><Child><Grandchild /><Grandchild /></Child></Test>";
-            Assert.Equal(expected, original.GetTestXml());
-        }
-
-        [Fact]
-        public void RemovesXmlDeclarationToReduceTyping()
-        {
-            var original = "<?xml version='1.0'?><Test />";
-            var expected = "<Test />";
-            Assert.Equal(expected, original.GetTestXml());
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/VariableResolverFixture.cs b/src/test/WixToolsetTest.CoreIntegration/VariableResolverFixture.cs
deleted file mode 100644
index 15e5d334..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/VariableResolverFixture.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System.Collections.Generic;
-    using WixToolset.Core;
-    using WixToolset.Data;
-    using WixToolset.Data.Bind;
-    using WixToolset.Extensibility.Services;
-    using Xunit;
-
-    public class VariableResolverFixture
-    {
-        [Fact]
-        public void CanRecursivelyResolveVariables()
-        {
-            var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider();
-            var variableResolver = serviceProvider.GetService<IVariableResolver>();
-
-            var variables = new Dictionary<string, BindVariable>()
-            {
-                { "ProductName", new BindVariable() { Id = "ProductName", Value = "Localized Product Name" } },
-                { "ProductNameEdition", new BindVariable() { Id = "ProductNameEdition", Value = "!(loc.ProductName) Enterprise Edition" } },
-                { "ProductNameEditionVersion", new BindVariable() { Id = "ProductNameEditionVersion", Value = "!(loc.ProductNameEdition) v1.2.3" } },
-            };
-
-            var localization = new Localization(0, null, "x-none", variables, new Dictionary<string,LocalizedControl>());
-
-            variableResolver.AddLocalization(localization);
-
-            var result = variableResolver.ResolveVariables(null, "These are not the loc strings you're looking for.");
-            Assert.Equal("These are not the loc strings you're looking for.", result.Value);
-            Assert.False(result.UpdatedValue);
-
-            result = variableResolver.ResolveVariables(null, "Welcome to !(loc.ProductName)");
-            Assert.Equal("Welcome to Localized Product Name", result.Value);
-            Assert.True(result.UpdatedValue);
-
-            result = variableResolver.ResolveVariables(null, "Welcome to !(loc.ProductNameEdition)");
-            Assert.Equal("Welcome to Localized Product Name Enterprise Edition", result.Value);
-            Assert.True(result.UpdatedValue);
-
-            result = variableResolver.ResolveVariables(null, "Welcome to !(loc.ProductNameEditionVersion)");
-            Assert.Equal("Welcome to Localized Product Name Enterprise Edition v1.2.3", result.Value);
-            Assert.True(result.UpdatedValue);
-
-            result = variableResolver.ResolveVariables(null, "Welcome to !(bind.property.ProductVersion)");
-            Assert.Equal("Welcome to !(bind.property.ProductVersion)", result.Value);
-            Assert.False(result.UpdatedValue);
-            Assert.True(result.DelayedResolve);
-
-            var withUnknownLocString = "Welcome to !(loc.UnknownLocalizationVariable)";
-            Assert.Throws<WixException>(() => variableResolver.ResolveVariables(null, withUnknownLocString));
-
-            result = variableResolver.ResolveVariables(null, withUnknownLocString, errorOnUnknown: false);
-            Assert.Equal(withUnknownLocString, result.Value);
-            Assert.False(result.UpdatedValue);
-
-            result = variableResolver.ResolveVariables(null, "Welcome to !!(loc.UnknownLocalizationVariable)");
-            Assert.Equal("Welcome to !(loc.UnknownLocalizationVariable)", result.Value);
-            Assert.True(result.UpdatedValue);
-
-            result = variableResolver.ResolveVariables(null, "Welcome to !!(loc.UnknownLocalizationVariable) v!(bind.property.ProductVersion)");
-            Assert.Equal("Welcome to !(loc.UnknownLocalizationVariable) v!(bind.property.ProductVersion)", result.Value);
-            Assert.True(result.UpdatedValue);
-            Assert.True(result.DelayedResolve);
-
-            result = variableResolver.ResolveVariables(null, "Welcome to !(loc.ProductNameEditionVersion) !!(loc.UnknownLocalizationVariable) v!(bind.property.ProductVersion)");
-            Assert.Equal("Welcome to Localized Product Name Enterprise Edition v1.2.3 !(loc.UnknownLocalizationVariable) v!(bind.property.ProductVersion)", result.Value);
-            Assert.True(result.UpdatedValue);
-            Assert.True(result.DelayedResolve);
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/WarningFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WarningFixture.cs
deleted file mode 100644
index c5b6c261..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/WarningFixture.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System.IO;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using WixToolset.Data;
-    using Xunit;
-
-    public class WarningFixture
-    {
-        [Fact]
-        public void SuppressedWarningsWithWarningAsErrorsAreNotErrors()
-        {
-            var folder = TestData.Get(@"TestData\Payload");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var wixlibPath = Path.Combine(intermediateFolder, @"test.wixlib");
-
-                var result = WixRunner.Execute(warningsAsErrors: true, new[]
-                {
-                    "build",
-                    "-sw1152",
-                    Path.Combine(folder, "CanonicalizeName.wxs"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", wixlibPath,
-                });
-
-                result.AssertSuccess();
-            }
-        }
-
-        [Fact]
-        public void WarningsAsErrorsTreatsWarningsAsErrors()
-        {
-            var folder = TestData.Get(@"TestData\Payload");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var wixlibPath = Path.Combine(intermediateFolder, @"test.wixlib");
-
-                var result = WixRunner.Execute(warningsAsErrors: true, new[]
-                {
-                    "build",
-                    Path.Combine(folder, "CanonicalizeName.wxs"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", wixlibPath,
-                });
-
-                Assert.Equal((int)WarningMessages.Ids.PathCanonicalized, result.ExitCode);
-
-                var message = Assert.Single(result.Messages);
-                Assert.Equal(MessageLevel.Warning, message.Level); // TODO: is this right?
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
deleted file mode 100644
index fc62e932..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <DebugType>embedded</DebugType>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\WixToolset.Core\WixToolset.Core.csproj" />
-    <ProjectReference Include="..\..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" />
-    <ProjectReference Include="..\..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" />
-    <ProjectReference Include="..\..\WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj" />
-    <ProjectReference Include="..\Example.Extension\Example.Extension.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
-  </ItemGroup>
-</Project>
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs
deleted file mode 100644
index 942f253f..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs
+++ /dev/null
@@ -1,205 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System;
-    using System.IO;
-    using System.Linq;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using WixToolset.Data;
-    using WixToolset.Data.Symbols;
-    using Example.Extension;
-    using Xunit;
-
-    public class WixiplFixture
-    {
-        [Fact]
-        public void CanBuildSingleFile()
-        {
-            var folder = TestData.Get(@"TestData\SingleFile");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var wixiplPath = Path.Combine(intermediateFolder, @"test.wixipl");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", wixiplPath,
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(wixiplPath);
-
-                Assert.False(intermediate.HasLevel(IntermediateLevels.Compiled));
-                Assert.True(intermediate.HasLevel(IntermediateLevels.Linked));
-                Assert.False(intermediate.HasLevel(IntermediateLevels.Resolved));
-
-                result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(intermediateFolder, @"test.wixipl"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-
-                Assert.False(intermediate.HasLevel(IntermediateLevels.Compiled));
-                Assert.True(intermediate.HasLevel(IntermediateLevels.Linked));
-                Assert.True(intermediate.HasLevel(IntermediateLevels.Resolved));
-
-                var section = intermediate.Sections.Single();
-
-                var fileSymbol = section.Symbols.OfType<FileSymbol>().First();
-                Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
-                Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
-            }
-        }
-
-        [Fact]
-        public void CannotBuildWithSourceFileAndWixipl()
-        {
-            var folder = TestData.Get(@"TestData\SingleFile");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(intermediateFolder, @"test.wixipl")
-                });
-
-                result.AssertSuccess();
-
-                result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(intermediateFolder, @"test.wixipl"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                });
-                Assert.Equal((int)ErrorMessages.Ids.WixiplSourceFileIsExclusive, result.ExitCode);
-            }
-        }
-
-        [Fact]
-        public void CanBuildMsiUsingExtensionLibrary()
-        {
-            var folder = TestData.Get(@"TestData\Wixipl");
-            var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath);
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    "-ext", extensionPath,
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi"),
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                {
-                    var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
-                    Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
-                    Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
-                }
-
-                {
-                    var binary = section.Symbols.OfType<BinarySymbol>().Single();
-                    var path = binary[BinarySymbolFields.Data].AsPath().Path;
-                    Assert.StartsWith(Path.Combine(baseFolder, @"obj\Example.Extension"), path);
-                    Assert.EndsWith(@"wix-ir\example.txt", path);
-                    Assert.Equal(@"BinFromWir", binary.Id.Id);
-                }
-            }
-        }
-
-        [Fact]
-        public void CanBuildWixiplUsingExtensionLibrary()
-        {
-            var folder = TestData.Get(@"TestData\Wixipl");
-            var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath);
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    "-ext", extensionPath,
-                    Path.Combine(folder, "Package.wxs"),
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(intermediateFolder, @"test.wixipl"),
-                });
-
-                result.AssertSuccess();
-
-                result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(intermediateFolder, @"test.wixipl"),
-                    "-ext", extensionPath,
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi"),
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                {
-                    var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
-                    Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
-                    Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
-                }
-
-                {
-                    var binary = section.Symbols.OfType<BinarySymbol>().Single();
-                    var path = binary[BinarySymbolFields.Data].AsPath().Path;
-                    Assert.StartsWith(Path.Combine(baseFolder, @"obj\test"), path);
-                    Assert.EndsWith(@"wix-ir\example.txt", path);
-                    Assert.Equal(@"BinFromWir", binary.Id.Id);
-                }
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
deleted file mode 100644
index d7296cfe..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
+++ /dev/null
@@ -1,316 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System;
-    using System.IO;
-    using System.Linq;
-    using Example.Extension;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using WixToolset.Data;
-    using WixToolset.Data.Symbols;
-    using Xunit;
-
-    public class WixlibFixture
-    {
-        [Fact]
-        public void CanBuildSimpleBundleUsingWixlib()
-        {
-            var folder = TestData.Get(@"TestData\SimpleBundle");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "MultiFileBootstrapperApplication.wxs"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(intermediateFolder, @"test.wixlib")
-                });
-
-                result.AssertSuccess();
-
-                result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "MultiFileBundle.wxs"),
-                    "-loc", Path.Combine(folder, "Bundle.en-us.wxl"),
-                    "-lib", Path.Combine(intermediateFolder, @"test.wixlib"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.exe")
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.exe")));
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb")));
-            }
-        }
-
-        [Fact]
-        public void CanBuildWixlibWithBinariesFromNamedBindPaths()
-        {
-            var folder = TestData.Get(@"TestData\WixlibWithBinaries");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var wixlibPath = Path.Combine(intermediateFolder, @"test.wixlib");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-bf",
-                    "-bindpath", Path.Combine(folder, "data"),
-                    // Use names that aren't excluded in default .gitignores.
-                    "-bindpath", $"AlphaBits={Path.Combine(folder, "data", "alpha")}",
-                    "-bindpath", $"MipsBits={Path.Combine(folder, "data", "mips")}",
-                    "-bindpath", $"PowerBits={Path.Combine(folder, "data", "powerpc")}",
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", wixlibPath,
-                });
-
-                result.AssertSuccess();
-
-                var wixlib = Intermediate.Load(wixlibPath);
-                var binarySymbols = wixlib.Sections.SelectMany(s => s.Symbols).OfType<BinarySymbol>().ToList();
-                Assert.Equal(3, binarySymbols.Count);
-                Assert.Single(binarySymbols.Where(t => t.Data.Path == "wix-ir/foo.dll"));
-                Assert.Single(binarySymbols.Where(t => t.Data.Path == "wix-ir/foo.dll-1"));
-                Assert.Single(binarySymbols.Where(t => t.Data.Path == "wix-ir/foo.dll-2"));
-            }
-        }
-
-        [Fact]
-        public void CanBuildSingleFileUsingWixlib()
-        {
-            var folder = TestData.Get(@"TestData\SingleFile");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var wixlibPath = Path.Combine(intermediateFolder, @"test.wixlib");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", wixlibPath,
-                });
-
-                result.AssertSuccess();
-
-                var wixlib = Intermediate.Load(wixlibPath);
-
-                Assert.True(wixlib.HasLevel(IntermediateLevels.Compiled));
-                Assert.True(wixlib.HasLevel(IntermediateLevels.Combined));
-                Assert.False(wixlib.HasLevel(IntermediateLevels.Linked));
-                Assert.False(wixlib.HasLevel(IntermediateLevels.Resolved));
-
-                result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-lib", Path.Combine(intermediateFolder, @"test.wixlib"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-
-                Assert.False(intermediate.HasLevel(IntermediateLevels.Compiled));
-                Assert.False(intermediate.HasLevel(IntermediateLevels.Combined));
-                Assert.True(intermediate.HasLevel(IntermediateLevels.Linked));
-                Assert.True(intermediate.HasLevel(IntermediateLevels.Resolved));
-
-                var section = intermediate.Sections.Single();
-
-                var wixFile = section.Symbols.OfType<FileSymbol>().First();
-                Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[FileSymbolFields.Source].AsPath().Path);
-                Assert.Equal(@"test.txt", wixFile[FileSymbolFields.Source].PreviousValue.AsPath().Path);
-            }
-        }
-
-        [Fact]
-        public void CanOverridePathWixVariable()
-        {
-            var folder = TestData.Get(@"TestData\WixVariableOverride");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var wixlibPath = Path.Combine(intermediateFolder, @"test.wixlib");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-bf",
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", wixlibPath,
-                });
-
-                result.AssertSuccess();
-
-                var wixlib = Intermediate.Load(wixlibPath);
-
-                Assert.True(wixlib.HasLevel(IntermediateLevels.Compiled));
-                Assert.True(wixlib.HasLevel(IntermediateLevels.Combined));
-                Assert.False(wixlib.HasLevel(IntermediateLevels.Linked));
-                Assert.False(wixlib.HasLevel(IntermediateLevels.Resolved));
-
-                result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-lib", Path.Combine(intermediateFolder, @"test.wixlib"),
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
-
-                Assert.False(intermediate.HasLevel(IntermediateLevels.Compiled));
-                Assert.False(intermediate.HasLevel(IntermediateLevels.Combined));
-                Assert.True(intermediate.HasLevel(IntermediateLevels.Linked));
-                Assert.True(intermediate.HasLevel(IntermediateLevels.Resolved));
-
-                var section = intermediate.Sections.Single();
-
-                var wixFile = section.Symbols.OfType<BinarySymbol>().First();
-                Assert.Equal(Path.Combine(folder, @"data\test2.txt"), wixFile.Data.Path);
-            }
-        }
-
-        [Fact]
-        public void CanBuildWithExtensionUsingWixlib()
-        {
-            var folder = TestData.Get(@"TestData\ExampleExtension");
-            var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath);
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-ext", extensionPath,
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(intermediateFolder, @"test.wixlib")
-                });
-
-                result.AssertSuccess();
-
-                result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-lib", Path.Combine(intermediateFolder, @"test.wixlib"),
-                    "-ext", extensionPath,
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
-                Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
-                Assert.Equal(@"example.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
-
-                var example = section.Symbols.Where(t => t.Definition.Type == SymbolDefinitionType.MustBeFromAnExtension).Single();
-                Assert.Equal("Foo", example.Id?.Id);
-                Assert.Equal("Bar", example[0].AsString());
-            }
-        }
-
-        [Fact]
-        public void CanBuildWithExtensionUsingMultipleWixlibs()
-        {
-            var folder = TestData.Get(@"TestData\ComplexExampleExtension");
-            var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath);
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "PackageComponents.wxs"),
-                    "-ext", extensionPath,
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(intermediateFolder, @"components.wixlib")
-                });
-
-                result.AssertSuccess();
-
-                result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "OtherComponents.wxs"),
-                    "-ext", extensionPath,
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(intermediateFolder, @"other.wixlib")
-                });
-
-                result.AssertSuccess();
-
-                result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-lib", Path.Combine(intermediateFolder, @"components.wixlib"),
-                    "-lib", Path.Combine(intermediateFolder, @"other.wixlib"),
-                    "-ext", extensionPath,
-                    "-bindpath", Path.Combine(folder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-
-                var fileSymbols = section.Symbols.OfType<FileSymbol>().OrderBy(t => Path.GetFileName(t.Source.Path)).ToArray();
-                Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileSymbols[0][FileSymbolFields.Source].AsPath().Path);
-                Assert.Equal(@"example.txt", fileSymbols[0][FileSymbolFields.Source].PreviousValue.AsPath().Path);
-                Assert.Equal(Path.Combine(folder, @"data\other.txt"), fileSymbols[1][FileSymbolFields.Source].AsPath().Path);
-                Assert.Equal(@"other.txt", fileSymbols[1][FileSymbolFields.Source].PreviousValue.AsPath().Path);
-
-                var examples = section.Symbols.Where(t => t.Definition.Type == SymbolDefinitionType.MustBeFromAnExtension).ToArray();
-                Assert.Equal(new string[] { "Foo", "Other" }, examples.Select(t => t.Id?.Id).ToArray());
-                Assert.Equal(new[] { "Bar", "Value" }, examples.Select(t => t[0].AsString()).ToArray());
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixlibQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixlibQueryFixture.cs
deleted file mode 100644
index 57351b27..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/WixlibQueryFixture.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.CoreIntegration
-{
-    using System.IO;
-    using System.Linq;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using WixToolset.Data;
-    using WixToolset.Data.Symbols;
-    using Xunit;
-
-    public class WixlibQueryFixture
-    {
-        [Fact]
-        public void UpgradeProducesReferenceToRemoveExistingProducts()
-        {
-            var folder = TestData.Get(@"TestData\Upgrade");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var wixlibPath = Path.Combine(intermediateFolder, @"test.wixlib");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "DetectOnly.wxs"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", wixlibPath,
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(wixlibPath);
-                var allSymbols = intermediate.Sections.SelectMany(s => s.Symbols);
-                var wixSimpleRefSymbols = allSymbols.OfType<WixSimpleReferenceSymbol>();
-                var repRef = wixSimpleRefSymbols.Where(t => t.Table == "WixAction" &&
-                                                           t.PrimaryKeys == "InstallExecuteSequence/RemoveExistingProducts")
-                                               .SingleOrDefault();
-                Assert.NotNull(repRef);
-            }
-        }
-
-        [Fact]
-        public void TypeLibLanguageAsStringReturnsZero()
-        {
-            var folder = TestData.Get(@"TestData\TypeLib");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var wixlibPath = Path.Combine(intermediateFolder, @"test.wixlib");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Language0.wxs"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", wixlibPath
-                });
-
-                result.AssertSuccess();
-
-                var intermediate = Intermediate.Load(wixlibPath);
-                var allSymbols = intermediate.Sections.SelectMany(s => s.Symbols);
-                var typeLibSymbol = allSymbols.OfType<TypeLibSymbol>()
-                                            .SingleOrDefault();
-                Assert.NotNull(typeLibSymbol);
-
-                var fields = typeLibSymbol.Fields.Select(field => field?.Type == IntermediateFieldType.Bool
-                                                        ? field.AsNullableNumber()?.ToString()
-                                                        : field?.AsString())
-                                                .ToList();
-                Assert.Equal("0", fields[1]);
-            }
-        }
-    }
-}