diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs
index c08c0714..38abcd4f 100644
--- a/EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs
+++ b/EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs
@@ -1,33 +1,34 @@
-using DigitalData.Core.DTO;
+using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.AspNetCore.Mvc;
-using static EnvelopeGenerator.CommonServices.Constants;
+using static EnvelopeGenerator.Domain.Constants;
 
-namespace EnvelopeGenerator.Web.Controllers.Test
+namespace EnvelopeGenerator.Web.Controllers.Test;
+
+[Obsolete("Use MediatR")]
+public class TestEmailTemplateController : TestControllerBase<IEmailTemplateService, EmailTemplateDto, EmailTemplate, int>
 {
-    public class TestEmailTemplateController : TestControllerBase<IEmailTemplateService, EmailTemplateDto, EmailTemplate, int>
+    public TestEmailTemplateController(ILogger<TestEmailTemplateController> logger, IEmailTemplateService service) : base(logger, service)
     {
-        public TestEmailTemplateController(ILogger<TestEmailTemplateController> logger, IEmailTemplateService service) : base(logger, service)
-        {
-        }
-
-        [HttpGet]
-        public virtual async Task<IActionResult> GetAll([FromQuery] string? tempType = null)
-        {
-            return tempType is null
-                ? await base.GetAll()
-                : await _service.ReadByNameAsync((EmailTemplateType)Enum.Parse(typeof(EmailTemplateType), tempType)).ThenAsync(
-                    Success: Ok,
-                    Fail: IActionResult (messages, notices) =>
-                    {
-                        _logger.LogNotice(notices);
-                        return NotFound(messages);
-                    });
-        }
-
-        [NonAction]
-        public override Task<IActionResult> GetAll() => base.GetAll();
     }
+
+    [HttpGet]
+    [Obsolete("Use MediatR")]
+    public virtual async Task<IActionResult> GetAll([FromQuery] string? tempType = null)
+    {
+        return tempType is null
+            ? await base.GetAll()
+            : await _service.ReadByNameAsync((EmailTemplateType)Enum.Parse(typeof(EmailTemplateType), tempType)).ThenAsync(
+                Success: Ok,
+                Fail: IActionResult (messages, notices) =>
+                {
+                    _logger.LogNotice(notices);
+                    return NotFound(messages);
+                });
+    }
+
+    [NonAction]
+    public override Task<IActionResult> GetAll() => base.GetAll();
 }
\ No newline at end of file
diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeCertificateController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeCertificateController.cs
index a7f8778a..acf0a89f 100644
--- a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeCertificateController.cs
+++ b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeCertificateController.cs
@@ -2,13 +2,13 @@
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Web.Controllers.Test
-{
-    public class TestEnvelopeCertificateController : TestControllerBase<IEnvelopeCertificateService, EnvelopeCertificateDto, EnvelopeCertificate, int>
-    {
-        public TestEnvelopeCertificateController(ILogger<TestEnvelopeCertificateController> logger, IEnvelopeCertificateService service) : base(logger, service)
-        {
+namespace EnvelopeGenerator.Web.Controllers.Test;
+
+[Obsolete("Use MediatR")]
+public class TestEnvelopeCertificateController : TestControllerBase<IEnvelopeCertificateService, EnvelopeCertificateDto, EnvelopeCertificate, int>
+{
+    public TestEnvelopeCertificateController(ILogger<TestEnvelopeCertificateController> logger, IEnvelopeCertificateService service) : base(logger, service)
+    {
 
-        }
     }
 }
\ No newline at end of file