diff --git a/tests/ReC.Tests/Application/EndpointAuth/EndpointAuthProcedureTests.cs b/tests/ReC.Tests/Application/EndpointAuth/EndpointAuthProcedureTests.cs
index 28021e3..d9e97f7 100644
--- a/tests/ReC.Tests/Application/EndpointAuth/EndpointAuthProcedureTests.cs
+++ b/tests/ReC.Tests/Application/EndpointAuth/EndpointAuthProcedureTests.cs
@@ -24,11 +24,10 @@ public class EndpointAuthProcedureTests : RecApplicationTestBase
     public async Task InsertEndpointAuthProcedure_runs_via_mediator()
     {
         var procedure = new InsertEndpointAuthProcedure { Active = true, Description = "auth", TypeId = 1, ApiKey = "key", ApiValue = "value" };
-        var objectProc = procedure.ToObjectProcedure("ReC.Tests");
 
         var (sender, scope) = CreateScopedSender();
         using var _ = scope;
-        var result = await sender.Send(objectProc);
+        var result = await sender.Send(procedure);
 
         Assert.That(result, Is.GreaterThan(0));
     }
@@ -36,12 +35,11 @@ public class EndpointAuthProcedureTests : RecApplicationTestBase
     [Test]
     public async Task UpdateEndpointAuthProcedure_runs_via_mediator()
     {
-        var procedure = new UpdateEndpointAuthProcedure { Active = false, Description = "auth-update", TypeId = 2 };
-        var objectProc = procedure.ToObjectProcedure(15, "ReC.Tests");
+        var procedure = new UpdateEndpointAuthProcedure { Data = { Active = false, Description = "auth-update", TypeId = 2 }, Id = 15 };
 
         var (sender, scope) = CreateScopedSender();
         using var _ = scope;
-        var result = await sender.Send(objectProc);
+        var result = await sender.Send(procedure);
 
         Assert.That(result, Is.Not.EqualTo(default(int)));
     }
@@ -50,11 +48,10 @@ public class EndpointAuthProcedureTests : RecApplicationTestBase
     public async Task DeleteEndpointAuthProcedure_runs_via_mediator()
     {
         var procedure = new DeleteEndpointAuthProcedure { Start = 3, End = 4, Force = false };
-        var objectProc = procedure.ToObjectProcedure();
 
         var (sender, scope) = CreateScopedSender();
         using var _ = scope;
-        var result = await sender.Send(objectProc);
+        var result = await sender.Send(procedure);
 
         Assert.That(result, Is.Not.EqualTo(default(int)));
     }
diff --git a/tests/ReC.Tests/Application/EndpointParams/EndpointParamsProcedureTests.cs b/tests/ReC.Tests/Application/EndpointParams/EndpointParamsProcedureTests.cs
index f1f27a9..e82da0c 100644
--- a/tests/ReC.Tests/Application/EndpointParams/EndpointParamsProcedureTests.cs
+++ b/tests/ReC.Tests/Application/EndpointParams/EndpointParamsProcedureTests.cs
@@ -1,12 +1,6 @@
-using System.Threading.Tasks;
 using MediatR;
 using Microsoft.Extensions.DependencyInjection;
-using NUnit.Framework;
-using ReC.Application.Common.Procedures.DeleteProcedure;
-using ReC.Application.Common.Procedures.InsertProcedure;
-using ReC.Application.Common.Procedures.UpdateProcedure;
 using ReC.Application.EndpointParams.Commands;
-using ReC.Tests.Application;
 
 namespace ReC.Tests.Application.EndpointParams;
 
@@ -24,11 +18,10 @@ public class EndpointParamsProcedureTests : RecApplicationTestBase
     public async Task InsertEndpointParamsProcedure_runs_via_mediator()
     {
         var procedure = new InsertEndpointParamsProcedure { Active = true, Description = "param", GroupId = 1, Sequence = 1, Key = "k", Value = "v" };
-        var objectProc = procedure.ToObjectProcedure("ReC.Tests");
 
         var (sender, scope) = CreateScopedSender();
         using var _ = scope;
-        var result = await sender.Send(objectProc);
+        var result = await sender.Send(procedure);
 
         Assert.That(result, Is.GreaterThan(0));
     }
@@ -36,12 +29,11 @@ public class EndpointParamsProcedureTests : RecApplicationTestBase
     [Test]
     public async Task UpdateEndpointParamsProcedure_runs_via_mediator()
     {
-        var procedure = new UpdateEndpointParamsProcedure { Active = false, Description = "param-update", GroupId = 2, Sequence = 2, Key = "k2", Value = "v2" };
-        var objectProc = procedure.ToObjectProcedure(25, "ReC.Tests");
+        var procedure = new UpdateEndpointParamsProcedure { Data = { Active = false, Description = "param-update", GroupId = 2, Sequence = 2, Key = "k2", Value = "v2" }, Id = 25 };
 
         var (sender, scope) = CreateScopedSender();
         using var _ = scope;
-        var result = await sender.Send(objectProc);
+        var result = await sender.Send(procedure);
 
         Assert.That(result, Is.Not.EqualTo(default(int)));
     }
@@ -50,11 +42,10 @@ public class EndpointParamsProcedureTests : RecApplicationTestBase
     public async Task DeleteEndpointParamsProcedure_runs_via_mediator()
     {
         var procedure = new DeleteEndpointParamsProcedure { Start = 5, End = 6, Force = true };
-        var objectProc = procedure.ToObjectProcedure();
 
         var (sender, scope) = CreateScopedSender();
         using var _ = scope;
-        var result = await sender.Send(objectProc);
+        var result = await sender.Send(procedure);
 
         Assert.That(result, Is.Not.EqualTo(default(int)));
     }
diff --git a/tests/ReC.Tests/Application/Endpoints/EndpointProcedureTests.cs b/tests/ReC.Tests/Application/Endpoints/EndpointProcedureTests.cs
index 60552ee..e10b28c 100644
--- a/tests/ReC.Tests/Application/Endpoints/EndpointProcedureTests.cs
+++ b/tests/ReC.Tests/Application/Endpoints/EndpointProcedureTests.cs
@@ -24,11 +24,10 @@ public class EndpointProcedureTests : RecApplicationTestBase
     public async Task InsertEndpointProcedure_runs_via_mediator()
     {
         var procedure = new InsertEndpointProcedure { Active = true, Description = "desc", Uri = "http://example" };
-        var objectProc = procedure.ToObjectProcedure("ReC.Tests");
 
         var (sender, scope) = CreateScopedSender();
         using var _ = scope;
-        var result = await sender.Send(objectProc);
+        var result = await sender.Send(procedure);
 
         Assert.That(result, Is.GreaterThan(0));
     }
@@ -36,12 +35,11 @@ public class EndpointProcedureTests : RecApplicationTestBase
     [Test]
     public async Task UpdateEndpointProcedure_runs_via_mediator()
     {
-        var procedure = new UpdateEndpointProcedure { Active = false, Description = "updated", Uri = "http://updated" };
-        var objectProc = procedure.ToObjectProcedure(12, "ReC.Tests");
+        var procedure = new UpdateEndpointProcedure { Data = { Active = false, Description = "updated", Uri = "http://updated" }, Id = 12 };
 
         var (sender, scope) = CreateScopedSender();
         using var _ = scope;
-        var result = await sender.Send(objectProc);
+        var result = await sender.Send(procedure);
 
         Assert.That(result, Is.Not.EqualTo(default(int)));
     }
@@ -50,11 +48,10 @@ public class EndpointProcedureTests : RecApplicationTestBase
     public async Task DeleteEndpointProcedure_runs_via_mediator()
     {
         var procedure = new DeleteEndpointProcedure { Start = 1, End = 2, Force = true };
-        var objectProc = procedure.ToObjectProcedure();
 
         var (sender, scope) = CreateScopedSender();
         using var _ = scope;
-        var result = await sender.Send(objectProc);
+        var result = await sender.Send(procedure);
 
         Assert.That(result, Is.Not.EqualTo(default(int)));
     }
diff --git a/tests/ReC.Tests/Application/Procedures/ProcedureExecutionTests.cs b/tests/ReC.Tests/Application/Procedures/ProcedureExecutionTests.cs
index 30358be..5afa4c5 100644
--- a/tests/ReC.Tests/Application/Procedures/ProcedureExecutionTests.cs
+++ b/tests/ReC.Tests/Application/Procedures/ProcedureExecutionTests.cs
@@ -27,7 +27,7 @@ public class ProcedureExecutionTests : RecApplicationTestBase
 
         var (sender, scope) = CreateScopedSender();
         using var _ = scope;
-        var result = await sender.ExecuteInsertProcedure(procedure, "ReC.Tests");
+        var result = await sender.Send(procedure);
 
         Assert.That(result, Is.GreaterThan(0));
     }
@@ -35,11 +35,11 @@ public class ProcedureExecutionTests : RecApplicationTestBase
     [Test]
     public async Task ExecuteUpdateProcedure_runs_with_changedWho()
     {
-        var procedure = new UpdateProfileProcedure { Name = "updated" };
+        var procedure = new UpdateProfileProcedure { Data = { Name = "updated" }, Id = 123 };
 
         var (sender, scope) = CreateScopedSender();
         using var _ = scope;
-        var result = await sender.ExecuteUpdateProcedure(procedure, 123, "ReC.Tests");
+        var result = await sender.Send(procedure);
 
         Assert.That(result, Is.Not.EqualTo(default(int)));
     }
@@ -51,7 +51,7 @@ public class ProcedureExecutionTests : RecApplicationTestBase
 
         var (sender, scope) = CreateScopedSender();
         using var _ = scope;
-        var result = await sender.ExecuteDeleteProcedure(procedure);
+        var result = await sender.Send(procedure);
 
         Assert.That(result, Is.Not.EqualTo(default(int)));
     }
diff --git a/tests/ReC.Tests/Application/Profile/ProfileProcedureTests.cs b/tests/ReC.Tests/Application/Profile/ProfileProcedureTests.cs
index 3091b01..501e783 100644
--- a/tests/ReC.Tests/Application/Profile/ProfileProcedureTests.cs
+++ b/tests/ReC.Tests/Application/Profile/ProfileProcedureTests.cs
@@ -24,11 +24,10 @@ public class ProfileProcedureTests : RecApplicationTestBase
     public async Task InsertProfileProcedure_runs_via_mediator()
     {
         var procedure = new InsertProfileProcedure { Active = true, TypeId = 1, Name = "name", Mandantor = "man" };
-        var objectProc = procedure.ToObjectProcedure("ReC.Tests");
 
         var (sender, scope) = CreateScopedSender();
         using var _ = scope;
-        var result = await sender.Send(objectProc);
+        var result = await sender.Send(procedure);
 
         Assert.That(result, Is.GreaterThan(0));
     }
@@ -36,12 +35,11 @@ public class ProfileProcedureTests : RecApplicationTestBase
     [Test]
     public async Task UpdateProfileProcedure_runs_via_mediator()
     {
-        var procedure = new UpdateProfileProcedure { Active = false, TypeId = 2, Name = "updated", Mandantor = "man2" };
-        var objectProc = procedure.ToObjectProcedure(45, "ReC.Tests");
+        var procedure = new UpdateProfileProcedure { Data = { Active = false, TypeId = 2, Name = "updated", Mandantor = "man2" }, Id = 45 };
 
         var (sender, scope) = CreateScopedSender();
         using var _ = scope;
-        var result = await sender.Send(objectProc);
+        var result = await sender.Send(procedure);
 
         Assert.That(result, Is.Not.EqualTo(default(int)));
     }
@@ -50,11 +48,10 @@ public class ProfileProcedureTests : RecApplicationTestBase
     public async Task DeleteProfileProcedure_runs_via_mediator()
     {
         var procedure = new DeleteProfileProcedure { Start = 9, End = 10, Force = false };
-        var objectProc = procedure.ToObjectProcedure();
 
         var (sender, scope) = CreateScopedSender();
         using var _ = scope;
-        var result = await sender.Send(objectProc);
+        var result = await sender.Send(procedure);
 
         Assert.That(result, Is.Not.EqualTo(default(int)));
     }
diff --git a/tests/ReC.Tests/Application/RecActions/RecActionProcedureTests.cs b/tests/ReC.Tests/Application/RecActions/RecActionProcedureTests.cs
index 9f2b973..fb06661 100644
--- a/tests/ReC.Tests/Application/RecActions/RecActionProcedureTests.cs
+++ b/tests/ReC.Tests/Application/RecActions/RecActionProcedureTests.cs
@@ -26,11 +26,10 @@ public class RecActionProcedureTests : RecApplicationTestBase
         try
         {
             var procedure = new InsertActionProcedure { ProfileId = 1, Active = true, Sequence = 1, EndpointId = 1 };
-            var objectProc = procedure.ToObjectProcedure("ReC.Tests");
 
             var (sender, scope) = CreateScopedSender();
             using var _ = scope;
-            var result = await sender.Send(objectProc);
+            var result = await sender.Send(procedure);
 
             Assert.That(result, Is.GreaterThan(0), "Expected a valid ID greater than 0 to be returned from the insert operation.");
         }
@@ -54,12 +53,11 @@ public class RecActionProcedureTests : RecApplicationTestBase
     [Test]
     public async Task UpdateActionProcedure_runs_via_mediator()
     {
-        var procedure = new UpdateActionProcedure { ProfileId = 2, Active = false, Sequence = 2 };
-        var objectProc = procedure.ToObjectProcedure(35, "ReC.Tests");
+        var procedure = new UpdateActionProcedure { Data = { ProfileId = 2, Active = false, Sequence = 2 }, Id = 35 };
 
         var (sender, scope) = CreateScopedSender();
         using var _ = scope;
-        var result = await sender.Send(objectProc);
+        var result = await sender.Send(procedure);
 
         Assert.That(result, Is.Not.EqualTo(default(int)));
     }
@@ -68,11 +66,10 @@ public class RecActionProcedureTests : RecApplicationTestBase
     public async Task DeleteActionProcedure_runs_via_mediator()
     {
         var procedure = new DeleteActionProcedure { Start = 7, End = 8, Force = true };
-        var objectProc = procedure.ToObjectProcedure();
 
         var (sender, scope) = CreateScopedSender();
         using var _ = scope;
-        var result = await sender.Send(objectProc);
+        var result = await sender.Send(procedure);
 
         Assert.That(result, Is.Not.EqualTo(default(int)));
     }
diff --git a/tests/ReC.Tests/Application/Results/ResultProcedureTests.cs b/tests/ReC.Tests/Application/Results/ResultProcedureTests.cs
index 65bd8e9..3b30633 100644
--- a/tests/ReC.Tests/Application/Results/ResultProcedureTests.cs
+++ b/tests/ReC.Tests/Application/Results/ResultProcedureTests.cs
@@ -24,11 +24,10 @@ public class ResultProcedureTests : RecApplicationTestBase
     public async Task InsertResultProcedure_runs_via_mediator()
     {
         var procedure = new InsertResultProcedure { ActionId = 1, StatusId = 200, Header = "h", Body = "b" };
-        var objectProc = procedure.ToObjectProcedure("ReC.Tests");
 
         var (sender, scope) = CreateScopedSender();
         using var _ = scope;
-        var result = await sender.Send(objectProc);
+        var result = await sender.Send(procedure);
 
         Assert.That(result, Is.GreaterThan(0));
     }
@@ -36,12 +35,11 @@ public class ResultProcedureTests : RecApplicationTestBase
     [Test]
     public async Task UpdateResultProcedure_runs_via_mediator()
     {
-        var procedure = new UpdateResultProcedure { ActionId = 2, StatusId = 500, Header = "h2", Body = "b2" };
-        var objectProc = procedure.ToObjectProcedure(55, "ReC.Tests");
+        var procedure = new UpdateResultProcedure { Data = { ActionId = 2, StatusId = 500, Header = "h2", Body = "b2" }, Id = 55 };
 
         var (sender, scope) = CreateScopedSender();
         using var _ = scope;
-        var result = await sender.Send(objectProc);
+        var result = await sender.Send(procedure);
 
         Assert.That(result, Is.Not.EqualTo(default(int)));
     }
@@ -50,11 +48,10 @@ public class ResultProcedureTests : RecApplicationTestBase
     public async Task DeleteResultProcedure_runs_via_mediator()
     {
         var procedure = new DeleteResultProcedure { Start = 11, End = 12, Force = false };
-        var objectProc = procedure.ToObjectProcedure();
 
         var (sender, scope) = CreateScopedSender();
         using var _ = scope;
-        var result = await sender.Send(objectProc);
+        var result = await sender.Send(procedure);
 
         Assert.That(result, Is.Not.EqualTo(default(int)));
     }