diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs
index fad0f452..bab65d37 100644
--- a/EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs
+++ b/EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs
@@ -1,34 +1,22 @@
-using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Domain.Entities;
-using Microsoft.AspNetCore.Mvc;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Application.Common.Interfaces.Services;
+using Microsoft.AspNetCore.Mvc;
+using MediatR;
+using EnvelopeGenerator.Application.EmailTemplates.Queries;
 
 namespace EnvelopeGenerator.Web.Controllers.Test;
 
-[Obsolete("Use MediatR")]
-public class TestEmailTemplateController : TestControllerBase<IEmailTemplateService, EmailTemplateDto, EmailTemplate, int>
+public class TestEmailTemplateController : ControllerBase
 {
-    public TestEmailTemplateController(ILogger<TestEmailTemplateController> logger, IEmailTemplateService service) : base(logger, service)
+    private readonly IMediator _mediator;
+
+    public TestEmailTemplateController(IMediator mediator)
     {
+        _mediator = mediator;
     }
 
     [HttpGet]
-    [Obsolete("Use MediatR")]
-    public virtual async Task<IActionResult> GetAll([FromQuery] string? tempType = null)
+    public virtual async Task<IActionResult> GetAll([FromQuery] ReadEmailTemplateQuery query, CancellationToken cancel)
     {
-        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);
-                });
+        var res = await _mediator.Send(query, cancel);
+        return Ok(res);
     }
-
-    [NonAction]
-    public override Task<IActionResult> GetAll() => base.GetAll();
 }
\ No newline at end of file