diff --git a/test/unit/Elsa.UnitTests/Scripting/JavaScript/Services/EnumerableResultConverterTests.cs b/test/unit/Elsa.UnitTests/Scripting/JavaScript/Services/EnumerableResultConverterTests.cs
index 4c5830c31..2aa57166b 100644
--- a/test/unit/Elsa.UnitTests/Scripting/JavaScript/Services/EnumerableResultConverterTests.cs
+++ b/test/unit/Elsa.UnitTests/Scripting/JavaScript/Services/EnumerableResultConverterTests.cs
@@ -9,10 +9,8 @@ namespace Elsa.Scripting.JavaScript.Services
     public class EnumerableResultConverterTests
     {
         [Theory(DisplayName = "The ConvertToDesiredType method should be able to convert a JS array of string/number objects to a List of single-item string/double dictionaries."), AutoMoqData]
-        public void ConvertToDesiredTypeCanConvertArrayOfStringAndNumberObjectsToAListOfDictionaries([ServiceProviderForConverters] IServiceProvider serviceProvider)
+        public void ConvertToDesiredTypeCanConvertArrayOfStringAndNumberObjectsToAListOfDictionaries(EnumerableResultConverter sut)
         {
-            var sut = new EnumerableResultConverter(serviceProvider.GetRequiredService<Lazy<IConvertsExpandoToObject>>());
-
             var engine = new Engine();
             engine.Execute(@"[{""foo"":5},{""bar"":15}]");
             var tuples = engine.GetCompletionValue().ToObject();
@@ -25,9 +23,8 @@ namespace Elsa.Scripting.JavaScript.Services
         }
 
         [Theory(DisplayName = "The ConvertToDesiredType method should be able to convert a JS array of strings to a List of strings."), AutoMoqData]
-        public void ConvertToDesiredTypeCanConvertArrayOfStringsToAListOfStrings([ServiceProviderForConverters] IServiceProvider serviceProvider)
+        public void ConvertToDesiredTypeCanConvertArrayOfStringsToAListOfStrings(EnumerableResultConverter sut)
         {
-            var sut = new EnumerableResultConverter(serviceProvider.GetRequiredService<Lazy<IConvertsExpandoToObject>>());
 
             var engine = new Engine();
             engine.Execute(@"[""foo"",""bar""]");
@@ -38,9 +35,8 @@ namespace Elsa.Scripting.JavaScript.Services
         }
 
         [Theory(DisplayName = "The ConvertToDesiredType method should convert a JS array of strings to an array of strings if the desired type is object."), AutoMoqData]
-        public void ConvertToDesiredTypeShouldConvertArrayOfStringsToArrayOfStringsWhenNoDesiredTypeIsSpecified([ServiceProviderForConverters] IServiceProvider serviceProvider)
+        public void ConvertToDesiredTypeShouldConvertArrayOfStringsToArrayOfStringsWhenNoDesiredTypeIsSpecified(EnumerableResultConverter sut)
         {
-            var sut = new EnumerableResultConverter(serviceProvider.GetRequiredService<Lazy<IConvertsExpandoToObject>>());
 
             var engine = new Engine();
             engine.Execute(@"[""foo"",""bar""]");
diff --git a/test/unit/Elsa.UnitTests/Scripting/JavaScript/Services/ExpandoObjectToDictionaryWhenNoDesiredTypeResultConverterTests.cs b/test/unit/Elsa.UnitTests/Scripting/JavaScript/Services/ExpandoObjectToDictionaryWhenNoDesiredTypeResultConverterTests.cs
index 9e14b22b1..e56bdab4f 100644
--- a/test/unit/Elsa.UnitTests/Scripting/JavaScript/Services/ExpandoObjectToDictionaryWhenNoDesiredTypeResultConverterTests.cs
+++ b/test/unit/Elsa.UnitTests/Scripting/JavaScript/Services/ExpandoObjectToDictionaryWhenNoDesiredTypeResultConverterTests.cs
@@ -9,10 +9,8 @@ namespace Elsa.Scripting.JavaScript.Services
     public class ExpandoObjectToDictionaryWhenNoDesiredTypeResultConverterTests
     {
         [Theory(DisplayName = "The ConvertToDesiredType method should be able to convert a JS object into a dictionary of strings/objects when the desired type is object."), AutoMoqData]
-        public void ConvertToDesiredTypeCanConvertJSObjectToDictionaryWhenDesiredTypeIsObject([ServiceProviderForConverters] IServiceProvider serviceProvider)
+        public void ConvertToDesiredTypeCanConvertJSObjectToDictionaryWhenDesiredTypeIsObject(ExpandoObjectToDictionaryWhenNoDesiredTypeResultConverter sut)
         {
-            var sut = new ExpandoObjectToDictionaryWhenNoDesiredTypeResultConverter(serviceProvider.GetRequiredService<Lazy<IConvertsEnumerableToObject>>());
-
             var engine = new Engine();
             engine.Execute(@"JSON.parse('{ ""Foo"": 20, ""Bar"": ""A string"" }')");
             var result = engine.GetCompletionValue().ToObject();
diff --git a/test/unit/Elsa.UnitTests/Scripting/JavaScript/Services/ServiceProviderForConvertersAttribute.cs b/test/unit/Elsa.UnitTests/Scripting/JavaScript/Services/ServiceProviderForConvertersAttribute.cs
index f6a8f655d..79be51068 100644
--- a/test/unit/Elsa.UnitTests/Scripting/JavaScript/Services/ServiceProviderForConvertersAttribute.cs
+++ b/test/unit/Elsa.UnitTests/Scripting/JavaScript/Services/ServiceProviderForConvertersAttribute.cs
@@ -18,11 +18,8 @@ namespace Elsa.Scripting.JavaScript.Services
             {
                 var serviceProvider = fixture.Freeze<IServiceProvider>();
                 Mock.Get(serviceProvider)
-                    .Setup(x => x.GetService(typeof(Lazy<IConvertsEnumerableToObject>)))
-                    .Returns(() => new Lazy<IConvertsEnumerableToObject>(() => new EnumerableResultConverter(serviceProvider.GetRequiredService<Lazy<IConvertsExpandoToObject>>())));
-                Mock.Get(serviceProvider)
-                    .Setup(x => x.GetService(typeof(Lazy<IConvertsExpandoToObject>)))
-                    .Returns(() => new Lazy<IConvertsExpandoToObject>(() => new ExpandoObjectToDictionaryWhenNoDesiredTypeResultConverter(serviceProvider.GetRequiredService<Lazy<IConvertsEnumerableToObject>>())));
+                    .Setup(x => x.GetService(typeof(IConvertsEnumerableToObject)))
+                    .Returns(() => new EnumerableResultConverter(default));
             }
         }
     }