diff --git a/src/Microsoft.TestPlatform.Build/ArgumentEscaper.cs b/src/Microsoft.TestPlatform.Build/ArgumentEscaper.cs
deleted file mode 100644
index 8d9f22b6b5..0000000000
--- a/src/Microsoft.TestPlatform.Build/ArgumentEscaper.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System;
-using System.Text;
-
-namespace Microsoft.TestPlatform.Build.Utils;
-
-public static class ArgumentEscaper
-{
-    /// <summary>
-    /// Undo the processing which took place to create string[] args in Main,
-    /// so that the next process will receive the same string[] args
-    ///
-    /// See here for more info:
-    /// http://blogs.msdn.com/b/twistylittlepassagesallalike/archive/2011/04/23/everyone-quotes-arguments-the-wrong-way.aspx
-    /// </summary>
-    /// <param name="arg"></param>
-    /// <returns>Return original string passed by client</returns>
-    public static string HandleEscapeSequenceInArgForProcessStart(string arg)
-    {
-        var sb = new StringBuilder();
-
-        var needsQuotes = ShouldSurroundWithQuotes(arg);
-        var isQuoted = needsQuotes || IsSurroundedWithQuotes(arg);
-
-        if (needsQuotes)
-        {
-            sb.Append('\"');
-        }
-
-        for (int i = 0; i < arg.Length; ++i)
-        {
-            var backslashCount = 0;
-
-            // Consume All Backslashes
-            while (i < arg.Length && arg[i] == '\\')
-            {
-                backslashCount++;
-                i++;
-            }
-
-            // Escape any backslashes at the end of the arg
-            // when the argument is also quoted.
-            // This ensures the outside quote is interpreted as
-            // an argument delimiter
-            if (i == arg.Length && isQuoted)
-            {
-                sb.Append('\\', 2 * backslashCount);
-            }
-
-            // At then end of the arg, which isn't quoted,
-            // just add the backslashes, no need to escape
-            else if (i == arg.Length)
-            {
-                sb.Append('\\', backslashCount);
-            }
-
-            // Escape any preceding backslashes and the quote
-            else if (arg[i] == '"')
-            {
-                sb.Append('\\', (2 * backslashCount) + 1);
-                sb.Append('"');
-            }
-
-            // Output any consumed backslashes and the character
-            else
-            {
-                sb.Append('\\', backslashCount);
-                sb.Append(arg[i]);
-            }
-        }
-
-        if (needsQuotes)
-        {
-            sb.Append('\"');
-        }
-
-        return sb.ToString();
-    }
-
-    internal static bool ShouldSurroundWithQuotes(string argument)
-    {
-        // Don't quote already quoted strings
-        if (IsSurroundedWithQuotes(argument))
-        {
-            return false;
-        }
-
-        // Only quote if whitespace exists in the string
-        return ArgumentContainsWhitespace(argument);
-    }
-
-    internal static bool IsSurroundedWithQuotes(string argument)
-        => argument.StartsWith("\"", StringComparison.Ordinal)
-        && argument.EndsWith("\"", StringComparison.Ordinal);
-
-    internal static bool ArgumentContainsWhitespace(string argument)
-        => argument.Contains(" ") || argument.Contains("\t") || argument.Contains("\n");
-}
diff --git a/src/Microsoft.TestPlatform.Build/Tasks/VSTestForwardingApp.cs b/src/Microsoft.TestPlatform.Build/Tasks/VSTestForwardingApp.cs
deleted file mode 100644
index 618cdf342c..0000000000
--- a/src/Microsoft.TestPlatform.Build/Tasks/VSTestForwardingApp.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-
-using Microsoft.TestPlatform.Build.Trace;
-using Microsoft.TestPlatform.Build.Utils;
-
-namespace Microsoft.TestPlatform.Build.Tasks;
-
-public class VSTestForwardingApp
-{
-    private const string HostExe = "dotnet";
-    private readonly List<string> _allArgs = new();
-    private int _activeProcessId;
-
-    public VSTestForwardingApp(string vsTestExePath, IEnumerable<string> argsToForward)
-    {
-        _allArgs.Add("exec");
-
-        // Ensure that path to vstest.console is whitespace friendly. User may install
-        // dotnet-cli to any folder containing whitespace (e.g. VS installs to program files).
-        // Arguments are already whitespace friendly.
-        _allArgs.Add(ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(vsTestExePath));
-        _allArgs.AddRange(argsToForward);
-    }
-
-    public int Execute()
-    {
-        var processInfo = new ProcessStartInfo
-        {
-            FileName = HostExe,
-            Arguments = string.Join(" ", _allArgs),
-            UseShellExecute = false,
-        };
-
-        Tracing.Trace("VSTest: Starting vstest.console...");
-        Tracing.Trace("VSTest: Arguments: " + processInfo.FileName + " " + processInfo.Arguments);
-
-        using var activeProcess = new Process { StartInfo = processInfo };
-        activeProcess.Start();
-        _activeProcessId = activeProcess.Id;
-
-        activeProcess.WaitForExit();
-        Tracing.Trace("VSTest: Exit code: " + activeProcess.ExitCode);
-        return activeProcess.ExitCode;
-    }
-
-    public void Cancel()
-    {
-        try
-        {
-            Process.GetProcessById(_activeProcessId).Kill();
-        }
-        catch (ArgumentException ex)
-        {
-            Tracing.Trace($"VSTest: Killing process throws ArgumentException with the following message {ex}. It may be that process is not running");
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.Build.UnitTests/ArgumentEscaperTests.cs b/test/Microsoft.TestPlatform.Build.UnitTests/ArgumentEscaperTests.cs
deleted file mode 100644
index 1508f313e6..0000000000
--- a/test/Microsoft.TestPlatform.Build.UnitTests/ArgumentEscaperTests.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.TestPlatform.Build.Utils.UnitTests;
-
-[TestClass]
-public class ArgumentEscaperTests
-{
-    [TestMethod]
-    public void EscapeArgForProcessStartShouldAddDoubleQuoteIfThereIsSpace()
-    {
-        string stringWithSpace = "Some string";
-
-        string expected = "\"Some string\"";
-        string result = ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(stringWithSpace);
-
-        Assert.AreEqual(expected, result);
-    }
-
-    [TestMethod]
-    public void EscapeArgForProcessStartShouldAddDoubleQuoteIfThereIsSpaceAtEnd()
-    {
-        string stringWithSpaceAtEnd = "Some string  ";
-
-        string expected = "\"Some string  \"";
-        string result = ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(stringWithSpaceAtEnd);
-
-        Assert.AreEqual(expected, result);
-    }
-
-    [TestMethod]
-    public void EscapeArgForProcessStartShouldHandleForwardSlash()
-    {
-        string stringWithForwardSlash = "Some/string";
-
-        string expected = "Some/string";
-        string result = ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(stringWithForwardSlash);
-
-        Assert.AreEqual(expected, result);
-    }
-
-    [TestMethod]
-    public void EscapeArgForProcessStartShouldPreserveDoubleQuote()
-    {
-        string stringWithDoubleQuote = "Some\"string";
-
-        string expected = "Some\\\"string";
-        string result = ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(stringWithDoubleQuote);
-
-        Assert.AreEqual(expected, result);
-    }
-
-    [TestMethod]
-    public void EscapeArgForProcessStartShouldPreserveSingleQuote()
-    {
-        string stringWithSingleQuote = "Some'string";
-
-        string expected = "Some'string";
-        string result = ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(stringWithSingleQuote);
-
-        Assert.AreEqual(expected, result);
-    }
-
-    [TestMethod]
-    public void EscapeArgForProcessStartShouldPreserveBackSlash()
-    {
-        string stringWithBackSlash = @"Some\\string";
-
-        string expected = "Some\\\\string";
-        string result = ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(stringWithBackSlash);
-
-        Assert.AreEqual(expected, result);
-    }
-
-    [TestMethod]
-    public void EscapeArgForProcessStartShouldPreserveBackSlashIfStringHasWhiteSpace()
-    {
-        string stringWithBackSlash = @"Some string With Space\\";
-
-        string expected = @"""Some string With Space\\\\""";
-        string result = ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(stringWithBackSlash);
-
-        Assert.AreEqual(expected, result);
-    }
-
-    [TestMethod]
-    public void ShouldSurroundWithQuotesShouldReturnFalseIfAlreadySurroundWithQuotes()
-    {
-        string stringSurroundWithQuotes = "\"some string\"";
-
-        Assert.IsFalse(ArgumentEscaper.ShouldSurroundWithQuotes(stringSurroundWithQuotes));
-    }
-
-    [TestMethod]
-    public void ShouldSurroundWithQuotesShouldReturnFalseIfItIsNotSurroundWithQuotesAndHasNoWhiteSpace()
-    {
-        string stringWithoutSpace = "someStringWithNoWhiteSpace";
-
-        Assert.IsFalse(ArgumentEscaper.ShouldSurroundWithQuotes(stringWithoutSpace));
-    }
-
-    [TestMethod]
-    public void ShouldSurroundWithQuotesShouldReturnTrueIfItIsNotSurroundWithQuotesAndHasWhiteSpace()
-    {
-        string stringWithSpace = "some String With WhiteSpace";
-
-        Assert.IsTrue(ArgumentEscaper.ShouldSurroundWithQuotes(stringWithSpace));
-    }
-
-    [TestMethod]
-    public void IsSurroundedWithQuotesShouldReturnTrueIfStringIsSurrondedByQuotes()
-    {
-        string stringSurroundWithQuotes = "\"some string\"";
-
-        Assert.IsTrue(ArgumentEscaper.IsSurroundedWithQuotes(stringSurroundWithQuotes));
-    }
-
-    [TestMethod]
-    public void IsSurroundedWithQuotesShouldReturnFalseIfStringIsNotSurrondedByQuotes()
-    {
-        string stringNotSurroundWithQuotes = "some string";
-
-        Assert.IsFalse(ArgumentEscaper.IsSurroundedWithQuotes(stringNotSurroundWithQuotes));
-    }
-}
diff --git a/test/Microsoft.TestPlatform.Build.UnitTests/VsTestTaskTests.cs b/test/Microsoft.TestPlatform.Build.UnitTests/VsTestTaskTests.cs
index d0ad688f43..27a5f852bb 100644
--- a/test/Microsoft.TestPlatform.Build.UnitTests/VsTestTaskTests.cs
+++ b/test/Microsoft.TestPlatform.Build.UnitTests/VsTestTaskTests.cs
@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System;
-using System.Linq;
+using System.Text.RegularExpressions;
 
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
 using Microsoft.TestPlatform.Build.Tasks;
-
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.TestPlatform.Build.UnitTests;
@@ -19,7 +19,7 @@ public VsTestTaskTests()
     {
         _vsTestTask = new VSTestForwardingTask
         {
-            TestFileFullPath = @"C:\path\to\test-assembly.dll",
+            TestFileFullPath = new TaskItem(@"C:\path\to\test-assembly.dll"),
             VSTestFramework = ".NETCoreapp,Version2.0"
         };
     }
@@ -34,22 +34,20 @@ public void CreateArgumentShouldAddOneEntryForCLIRunSettings()
         _vsTestTask.VSTestCLIRunSettings[0] = arg1;
         _vsTestTask.VSTestCLIRunSettings[1] = arg2;
 
-        var result = _vsTestTask.CreateArgument().ToArray();
-
-        Assert.AreEqual(5, result.Length);
+        var commandline = _vsTestTask.CreateArguments();
 
-        // First, second and third args would be framework:".NETCoreapp,Version2.0", testfilepath and -- respectively.
-        Assert.AreEqual($"\"{arg1}\"", result[3]);
-        Assert.AreEqual($"{arg2}", result[4]);
+        StringAssert.Contains(commandline, " -- ");
+        StringAssert.Contains(commandline, $"\"{arg1}\"");
+        StringAssert.Contains(commandline, $"{arg2}");
     }
 
     [TestMethod]
-    public void CreateArgumentShouldAddCliRunSettingsArgAtEnd()
+    public void CreateArgumentShouldAddCLIRunSettingsArgAtEnd()
     {
         const string codeCoverageOption = "Code Coverage";
 
         _vsTestTask.VSTestCollect = new string[] { codeCoverageOption };
-        _vsTestTask.VSTestBlame = "Blame";
+        _vsTestTask.VSTestBlame = true;
 
         const string arg1 = "RunConfiguration.ResultsDirectory=Path having Space";
         const string arg2 = "MSTest.DeploymentEnabled";
@@ -58,24 +56,22 @@ public void CreateArgumentShouldAddCliRunSettingsArgAtEnd()
         _vsTestTask.VSTestCLIRunSettings[0] = arg1;
         _vsTestTask.VSTestCLIRunSettings[1] = arg2;
 
-        var result = _vsTestTask.CreateArgument().ToArray();
-
-        Assert.AreEqual(7, result.Length);
+        var commandline = _vsTestTask.CreateArguments();
 
-        // Following are expected  --framework:".NETCoreapp,Version2.0", testfilepath, blame, collect:"Code coverage" -- respectively.
-        Assert.AreEqual($"\"{arg1}\"", result[5]);
-        Assert.AreEqual($"{arg2}", result[6]);
+        StringAssert.Contains(commandline, " -- ");
+        StringAssert.Contains(commandline, $"\"{arg1}\"");
+        StringAssert.Contains(commandline, $"{arg2}");
     }
 
     [TestMethod]
     public void CreateArgumentShouldPassResultsDirectoryCorrectly()
     {
         const string resultsDirectoryValue = @"C:\tmp\Results Directory";
-        _vsTestTask.VSTestResultsDirectory = resultsDirectoryValue;
+        _vsTestTask.VSTestResultsDirectory = new TaskItem(resultsDirectoryValue);
 
-        var result = _vsTestTask.CreateArgument().ToArray();
+        var commandline = _vsTestTask.CreateArguments();
 
-        Assert.AreEqual($"--resultsDirectory:\"{resultsDirectoryValue}\"", result[1]);
+        StringAssert.Contains(commandline, $"--resultsDirectory:\"{_vsTestTask.VSTestResultsDirectory?.ItemSpec}\"");
     }
 
     [TestMethod]
@@ -84,10 +80,10 @@ public void CreateArgumentShouldNotSetConsoleLoggerVerbosityIfConsoleLoggerIsGiv
         _vsTestTask.VSTestVerbosity = "diag";
         _vsTestTask.VSTestLogger = new string[] { "Console;Verbosity=quiet" };
 
-        var allArguments = _vsTestTask.CreateArgument().ToArray();
+        var commandline = _vsTestTask.CreateArguments();
 
-        Assert.IsNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=normal")));
-        Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=quiet")));
+        StringAssert.DoesNotMatch(commandline, new Regex("(--logger:\"Console;Verbosity=normal\")"));
+        StringAssert.Contains(commandline, "--logger:\"Console;Verbosity=quiet\"");
     }
 
     [TestMethod]
@@ -95,9 +91,9 @@ public void CreateArgumentShouldSetConsoleLoggerVerbosityToNormalIfConsoleLogger
     {
         _vsTestTask.VSTestVerbosity = "n";
 
-        var allArguments = _vsTestTask.CreateArgument().ToArray();
+        var commandline = _vsTestTask.CreateArguments();
 
-        Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=normal")));
+        StringAssert.Contains(commandline, "--logger:Console;Verbosity=normal");
     }
 
     [TestMethod]
@@ -105,9 +101,9 @@ public void CreateArgumentShouldSetConsoleLoggerVerbosityToNormalIfConsoleLogger
     {
         _vsTestTask.VSTestVerbosity = "normal";
 
-        var allArguments = _vsTestTask.CreateArgument().ToArray();
+        var commandline = _vsTestTask.CreateArguments();
 
-        Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=normal")));
+        StringAssert.Contains(commandline, "--logger:Console;Verbosity=normal");
     }
 
     [TestMethod]
@@ -115,9 +111,9 @@ public void CreateArgumentShouldSetConsoleLoggerVerbosityToNormalIfConsoleLogger
     {
         _vsTestTask.VSTestVerbosity = "d";
 
-        var allArguments = _vsTestTask.CreateArgument().ToArray();
+        var commandline = _vsTestTask.CreateArguments();
 
-        Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=normal")));
+        StringAssert.Contains(commandline, "--logger:Console;Verbosity=normal");
     }
 
     [TestMethod]
@@ -125,9 +121,9 @@ public void CreateArgumentShouldSetConsoleLoggerVerbosityToNormalIfConsoleLogger
     {
         _vsTestTask.VSTestVerbosity = "detailed";
 
-        var allArguments = _vsTestTask.CreateArgument().ToArray();
+        var commandline = _vsTestTask.CreateArguments();
 
-        Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=normal")));
+        StringAssert.Contains(commandline, "--logger:Console;Verbosity=normal");
     }
 
     [TestMethod]
@@ -135,9 +131,9 @@ public void CreateArgumentShouldSetConsoleLoggerVerbosityToNormalIfConsoleLogger
     {
         _vsTestTask.VSTestVerbosity = "diag";
 
-        var allArguments = _vsTestTask.CreateArgument().ToArray();
+        var commandline = _vsTestTask.CreateArguments();
 
-        Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=normal")));
+        StringAssert.Contains(commandline, "--logger:Console;Verbosity=normal");
     }
 
     [TestMethod]
@@ -145,9 +141,9 @@ public void CreateArgumentShouldSetConsoleLoggerVerbosityToNormalIfConsoleLogger
     {
         _vsTestTask.VSTestVerbosity = "diagnostic";
 
-        var allArguments = _vsTestTask.CreateArgument().ToArray();
+        var commandline = _vsTestTask.CreateArguments();
 
-        Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=normal")));
+        StringAssert.Contains(commandline, "--logger:Console;Verbosity=normal");
     }
 
     [TestMethod]
@@ -155,9 +151,9 @@ public void CreateArgumentShouldSetConsoleLoggerVerbosityToQuietIfConsoleLoggerI
     {
         _vsTestTask.VSTestVerbosity = "q";
 
-        var allArguments = _vsTestTask.CreateArgument().ToArray();
+        var commandline = _vsTestTask.CreateArguments();
 
-        Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=quiet")));
+        StringAssert.Contains(commandline, "--logger:Console;Verbosity=quiet");
     }
 
     [TestMethod]
@@ -165,9 +161,9 @@ public void CreateArgumentShouldSetConsoleLoggerVerbosityToQuietIfConsoleLoggerI
     {
         _vsTestTask.VSTestVerbosity = "quiet";
 
-        var allArguments = _vsTestTask.CreateArgument().ToArray();
+        var commandline = _vsTestTask.CreateArguments();
 
-        Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=quiet")));
+        StringAssert.Contains(commandline, "--logger:Console;Verbosity=quiet");
     }
 
     [TestMethod]
@@ -175,9 +171,9 @@ public void CreateArgumentShouldSetConsoleLoggerVerbosityToMinimalIfConsoleLogge
     {
         _vsTestTask.VSTestVerbosity = "m";
 
-        var allArguments = _vsTestTask.CreateArgument().ToArray();
+        var commandline = _vsTestTask.CreateArguments();
 
-        Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=minimal")));
+        StringAssert.Contains(commandline, "--logger:Console;Verbosity=minimal");
     }
 
     [TestMethod]
@@ -185,9 +181,9 @@ public void CreateArgumentShouldSetConsoleLoggerVerbosityToMinimalIfConsoleLogge
     {
         _vsTestTask.VSTestVerbosity = "minimal";
 
-        var allArguments = _vsTestTask.CreateArgument().ToArray();
+        var commandline = _vsTestTask.CreateArguments();
 
-        Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=minimal")));
+        StringAssert.Contains(commandline, "--logger:Console;Verbosity=minimal");
     }
 
     [TestMethod]
@@ -195,9 +191,9 @@ public void CreateArgumentShouldSetConsoleLoggerVerbosityToNormalIfConsoleLogger
     {
         _vsTestTask.VSTestVerbosity = "Normal";
 
-        var allArguments = _vsTestTask.CreateArgument().ToArray();
+        var commandline = _vsTestTask.CreateArguments();
 
-        Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=normal")));
+        StringAssert.Contains(commandline, "--logger:Console;Verbosity=normal");
     }
 
     [TestMethod]
@@ -205,9 +201,9 @@ public void CreateArgumentShouldSetConsoleLoggerVerbosityToQuietIfConsoleLoggerI
     {
         _vsTestTask.VSTestVerbosity = "Quiet";
 
-        var allArguments = _vsTestTask.CreateArgument().ToArray();
+        var commandline = _vsTestTask.CreateArguments();
 
-        Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=quiet")));
+        StringAssert.Contains(commandline, "--logger:Console;Verbosity=quiet");
     }
 
     [TestMethod]
@@ -215,9 +211,9 @@ public void CreateArgumentShouldPreserveWhiteSpaceInLogger()
     {
         _vsTestTask.VSTestLogger = new string[] { "trx;LogFileName=foo bar.trx" };
 
-        var allArguments = _vsTestTask.CreateArgument().ToArray();
+        var commandline = _vsTestTask.CreateArguments();
 
-        Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:\"trx;LogFileName=foo bar.trx\"")));
+        StringAssert.Contains(commandline, "--logger:\"trx;LogFileName=foo bar.trx\"");
     }
 
     [TestMethod]
@@ -228,103 +224,91 @@ public void CreateArgumentShouldAddOneCollectArgumentForEachCollect()
         _vsTestTask.VSTestCollect[0] = "name1";
         _vsTestTask.VSTestCollect[1] = "name 2";
 
-        var allArguments = _vsTestTask.CreateArgument().ToArray();
+        var commandline = _vsTestTask.CreateArguments();
 
-        Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--collect:name1")));
-        Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--collect:\"name 2\"")));
+        StringAssert.Contains(commandline, "--collect:name1");
+        StringAssert.Contains(commandline, "--collect:\"name 2\"");
     }
 
     [TestMethod]
     public void CreateArgumentShouldAddMultipleTestAdapterPaths()
     {
-        _vsTestTask.VSTestTestAdapterPath = new string[] { "path1", "path2" };
+        _vsTestTask.VSTestTestAdapterPath = new ITaskItem[] { new TaskItem("path1"), new TaskItem("path2") };
 
-        var allArguments = _vsTestTask.CreateArgument().ToArray();
+        var commandline = _vsTestTask.CreateArguments();
 
-        Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--testAdapterPath:path1")));
-        Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--testAdapterPath:path2")));
+        StringAssert.Contains(commandline, "--testAdapterPath:path1");
+        StringAssert.Contains(commandline, "--testAdapterPath:path2");
     }
 
     [TestMethod]
     public void CreateArgumentShouldAddMultipleLoggers()
     {
         _vsTestTask.VSTestLogger = new string[] { "trx;LogFileName=foo bar.trx", "console" };
-        var allArguments = _vsTestTask.CreateArgument().ToArray();
+        var commandline = _vsTestTask.CreateArguments();
 
-        Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:\"trx;LogFileName=foo bar.trx\"")));
-        Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:console")));
+        StringAssert.Contains(commandline, "--logger:\"trx;LogFileName=foo bar.trx\"");
+        StringAssert.Contains(commandline, "--logger:console");
     }
 
     [TestMethod]
     public void CreateArgumentShouldAddTraceCollectorDirectoryPathAsTestAdapterForCodeCoverageCollect()
     {
         const string traceDataCollectorDirectoryPath = @"c:\path\to\tracedata collector";
-        _vsTestTask.VSTestTraceDataCollectorDirectoryPath = traceDataCollectorDirectoryPath;
+        _vsTestTask.VSTestTraceDataCollectorDirectoryPath = new TaskItem(traceDataCollectorDirectoryPath);
         _vsTestTask.VSTestCollect = new string[] { "code coverage" };
 
-        var allArguments = _vsTestTask.CreateArgument().ToArray();
+        var commandline = _vsTestTask.CreateArguments();
 
-        const string expectedArg = "--testAdapterPath:\"c:\\path\\to\\tracedata collector\"";
-        CollectionAssert.Contains(allArguments, expectedArg, $"Expected argument: '''{expectedArg}''' not present in [{string.Join(", ", allArguments)}]");
-    }
-
-    [TestMethod]
-    public void CreateArgumentShouldAddTraceCollectorDirectoryPathAsTestAdapterForCodeCoverageCollectWithExtraConfigurations()
-    {
-        const string traceDataCollectorDirectoryPath = @"c:\path\to\tracedata collector";
-        _vsTestTask.VSTestTraceDataCollectorDirectoryPath = traceDataCollectorDirectoryPath;
-        _vsTestTask.VSTestCollect = new string[] { "code coverage;someParameter=someValue" };
-
-        var allArguments = _vsTestTask.CreateArgument().ToArray();
-
-        const string expectedArg = "--testAdapterPath:\"c:\\path\\to\\tracedata collector\"";
-        CollectionAssert.Contains(allArguments, expectedArg, $"Expected argument: '''{expectedArg}''' not present in [{string.Join(", ", allArguments)}]");
+        string expectedArg = $"--testAdapterPath:\"{_vsTestTask.VSTestTraceDataCollectorDirectoryPath?.ItemSpec}\"";
+        StringAssert.Contains(commandline, expectedArg);
     }
 
     [TestMethod]
     public void CreateArgumentShouldNotAddTraceCollectorDirectoryPathAsTestAdapterForNonCodeCoverageCollect()
     {
         const string traceDataCollectorDirectoryPath = @"c:\path\to\tracedata collector";
-        _vsTestTask.VSTestTraceDataCollectorDirectoryPath = traceDataCollectorDirectoryPath;
+        _vsTestTask.VSTestTraceDataCollectorDirectoryPath = new TaskItem(traceDataCollectorDirectoryPath);
         _vsTestTask.VSTestCollect = new string[] { "not code coverage" };
 
-        var allArguments = _vsTestTask.CreateArgument().ToArray();
+        var commandline = _vsTestTask.CreateArguments();
 
-        const string notExpectedArg = "--testAdapterPath:\"c:\\path\\to\\tracedata collector\"";
-        CollectionAssert.DoesNotContain(allArguments, notExpectedArg, $"Not expected argument: '''{notExpectedArg}''' present in [{string.Join(", ", allArguments)}]");
+        string notExpectedArg = $"--testAdapterPath:\"{this._vsTestTask.VSTestTraceDataCollectorDirectoryPath?.ItemSpec}\"";
+        StringAssert.DoesNotMatch(commandline, new Regex(Regex.Escape(notExpectedArg)));
     }
 
     [TestMethod]
     public void CreateArgumentShouldAddTraceCollectorDirectoryPathAsTestAdapterIfSettingsGiven()
     {
         const string traceDataCollectorDirectoryPath = @"c:\path\to\tracedatacollector\";
-        _vsTestTask.VSTestTraceDataCollectorDirectoryPath = traceDataCollectorDirectoryPath;
+        _vsTestTask.VSTestTraceDataCollectorDirectoryPath = new TaskItem(traceDataCollectorDirectoryPath);
         _vsTestTask.VSTestSetting = @"c:\path\to\sample.runsettings";
 
-        var allArguments = _vsTestTask.CreateArgument().ToArray();
+        var commandline = _vsTestTask.CreateArguments();
 
-        const string expectedArg = "--testAdapterPath:c:\\path\\to\\tracedatacollector\\";
-        CollectionAssert.Contains(allArguments, expectedArg, $"Expected argument: '''{expectedArg}''' not present in [{string.Join(", ", allArguments)}]");
+        string expectedArg = $"--testAdapterPath:{_vsTestTask.VSTestTraceDataCollectorDirectoryPath?.ItemSpec}";
+        StringAssert.Contains(commandline, expectedArg);
     }
 
     [TestMethod]
-    public void CreateArgumentShouldNotAddTestAdapterPathIfVsTestTraceDataCollectorDirectoryPathIsEmpty()
+    public void CreateArgumentShouldNotAddTestAdapterPathIfVSTestTraceDataCollectorDirectoryPathIsEmpty()
     {
-        _vsTestTask.VSTestTraceDataCollectorDirectoryPath = string.Empty;
+        _vsTestTask.VSTestTraceDataCollectorDirectoryPath = null;
         _vsTestTask.VSTestSetting = @"c:\path\to\sample.runsettings";
         _vsTestTask.VSTestCollect = new string[] { "code coverage" };
 
-        var allArguments = _vsTestTask.CreateArgument().ToArray();
+        var commandline = _vsTestTask.CreateArguments();
 
-        Assert.IsNull(Array.Find(allArguments, arg => arg.Contains("--testAdapterPath:")));
+        StringAssert.DoesNotMatch(commandline, new Regex(@"(--testAdapterPath:)"));
     }
 
     [TestMethod]
     public void CreateArgumentShouldAddNoLogoOptionIfSpecifiedByUser()
     {
-        _vsTestTask.VSTestNoLogo = "--nologo";
-        var allArguments = _vsTestTask.CreateArgument().ToArray();
+        _vsTestTask.VSTestNoLogo = true;
+
+        var commandline = _vsTestTask.CreateArguments();
 
-        Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--nologo")));
+        StringAssert.Contains(commandline, "--nologo");
     }
 }