diff --git a/src/Codebelt.Extensions.Xunit/StringExtensions.cs b/src/Codebelt.Extensions.Xunit/StringExtensions.cs
index 92849dc..e607cdc 100644
--- a/src/Codebelt.Extensions.Xunit/StringExtensions.cs
+++ b/src/Codebelt.Extensions.Xunit/StringExtensions.cs
@@ -1,7 +1,6 @@
 #if NETSTANDARD2_0_OR_GREATER
 using System;
 using System.Text.RegularExpressions;
-using Cuemon;
 
 namespace Codebelt.Extensions.Xunit
 {
@@ -36,8 +35,8 @@ public static string ReplaceLineEndings(this string input)
         /// </exception>
         public static string ReplaceLineEndings(this string input, string replacementText)
         {
-            Validator.ThrowIfNull(input);
-            Validator.ThrowIfNull(replacementText);
+            if (input == null) { throw new ArgumentNullException(nameof(input)); }
+            if (replacementText == null) { throw new ArgumentNullException(nameof(replacementText)); }
             return NewLineRegex.Replace(input, replacementText);
         }
     }
diff --git a/src/Codebelt.Extensions.Xunit/Test.cs b/src/Codebelt.Extensions.Xunit/Test.cs
index d3ed751..e8ce291 100644
--- a/src/Codebelt.Extensions.Xunit/Test.cs
+++ b/src/Codebelt.Extensions.Xunit/Test.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Text.RegularExpressions;
-using Cuemon;
 using Xunit.Abstractions;
 
 namespace Codebelt.Extensions.Xunit
@@ -25,7 +24,8 @@ public abstract class Test : ITest
         /// </exception>
         public static bool Match(string expected, string actual, Action<WildcardOptions> setup = null)
         {
-            Validator.ThrowIfInvalidConfigurator(setup, out var options);
+            var options = new WildcardOptions();
+            setup?.Invoke(options);
 
             var pattern = $"^{Regex.Escape(expected).Replace(options.SingleCharacter, ".").Replace(options.GroupOfCharacters, ".*")}$";
 
diff --git a/src/Codebelt.Extensions.Xunit/WildcardOptions.cs b/src/Codebelt.Extensions.Xunit/WildcardOptions.cs
index c1bb7ff..a67f8f1 100644
--- a/src/Codebelt.Extensions.Xunit/WildcardOptions.cs
+++ b/src/Codebelt.Extensions.Xunit/WildcardOptions.cs
@@ -1,12 +1,11 @@
 using System;
-using Cuemon.Configuration;
 
 namespace Codebelt.Extensions.Xunit
 {
     /// <summary>
     /// Configuration options for <see cref="Test.Match"/>.
     /// </summary>
-    public class WildcardOptions : IParameterObject
+    public class WildcardOptions
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="WildcardOptions"/> class.