Re-enable skipped test and minor code clean up

2 files changed, 1 insertions, 3 deletions

diff --git a/src/wix/test/WixToolsetTest.Core.Native/MsmFixture.cs b/src/wix/test/WixToolsetTest.Core.Native/MsmFixture.cs
index 8d473d17..709d4b93 100644
--- a/src/wix/test/WixToolsetTest.Core.Native/MsmFixture.cs
+++ b/src/wix/test/WixToolsetTest.Core.Native/MsmFixture.cs
@@ -7,7 +7,7 @@ namespace WixToolsetTest.CoreNative
 
     public class MsmFixture
     {
-        [Fact(Skip = "Test fails in new repo")]
+        [Fact]
         public void CanCreateMsmInterface()
         {
             var merge = MsmInterop.GetMsmMerge();
diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
index 3b113242..0bee1b01 100644
--- a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
+++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
@@ -332,7 +332,6 @@ namespace WixToolsetTest.Sdk
             {
                 fs.Initialize(sourceFolder);
                 var baseFolder = fs.BaseFolder;
-                var binFolder = Path.Combine(baseFolder, @"bin\");
                 var projectPath = Path.Combine(baseFolder, "MsiPackage.wixproj");
 
                 var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, suppressValidation: false);
@@ -367,7 +366,6 @@ namespace WixToolsetTest.Sdk
             {
                 fs.Initialize(sourceFolder);
                 var baseFolder = fs.BaseFolder;
-                var binFolder = Path.Combine(baseFolder, @"bin\");
                 var projectPath = Path.Combine(baseFolder, "MsiPackage.wixproj");
 
                 var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[]