diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeController.cs
index a4a5058b..011af296 100644
--- a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeController.cs
+++ b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeController.cs
@@ -1,56 +1,32 @@
-using EnvelopeGenerator.Domain.Entities;
-using Microsoft.AspNetCore.Mvc;
-using EnvelopeGenerator.Application.Common.Dto;
+using Microsoft.AspNetCore.Mvc;
 using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Common.Interfaces.Services;
+using MediatR;
+using EnvelopeGenerator.Application.Envelopes.Queries;
 
 namespace EnvelopeGenerator.Web.Controllers.Test;
 
 [Obsolete("Use MediatR")]
-public class TestEnvelopeController : TestControllerBase<IEnvelopeService, EnvelopeDto, Envelope, int>
+public class TestEnvelopeController : ControllerBase
 {
-    public TestEnvelopeController(ILogger<TestEnvelopeController> logger, IEnvelopeService service) : base(logger, service)
-    {
-    }
+    private readonly IMediator _mediator;
 
-    [NonAction]
-    public override Task<IActionResult> GetAll() => base.GetAll();
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="mediator"></param>
+    public TestEnvelopeController(IMediator mediator)
+    {
+        _mediator = mediator;
+    }
 
     [HttpGet]
-    public async Task<IActionResult> GetAll([FromQuery] string? envelopeKey = default, [FromQuery] bool withDocuments = false, [FromQuery] bool withHistory = false, [FromQuery] bool withDocumentReceiverElement = false, [FromQuery] bool withUser = false, [FromQuery] bool withAll = true)
-    {
-        if (envelopeKey is not null)
-        {
-            (var uuid, var signature) = envelopeKey.DecodeEnvelopeReceiverId();
-            if (uuid is null)
-                return BadRequest("UUID is null");
-            var envlopeServiceResult = await _service.ReadByUuidAsync(
-                uuid: uuid,
-                withDocuments: withDocuments, withHistory: withHistory, withDocumentReceiverElement: withDocumentReceiverElement, withUser: withUser, withAll: withAll);
-
-            if (envlopeServiceResult.IsSuccess)
-            {
-                return Ok(envlopeServiceResult.Data);
-            }
-            return NotFound();
-        }
-
-        var result = await _service.ReadAllWithAsync(documents: withDocuments, history: withHistory);
-        if (result.IsSuccess)
-        {
-            return Ok(result);
-        }
-        return NotFound(result);
-    }
+    public async Task<IActionResult> GetAll([FromQuery] ReadEnvelopeQuery query, CancellationToken cancel) => Ok(await _mediator.Send(query, cancel));
 
     [HttpGet("decode")]
-    public IActionResult DecodeEnvelopeReceiverId(string envelopeReceiverId, int type = 0)
+    public IActionResult DecodeEnvelopeReceiverId(string envelopeReceiverId, int type = 0) => type switch
     {
-        return type switch
-        {
-            1 => Ok(envelopeReceiverId.GetEnvelopeUuid()),
-            2 => Ok(envelopeReceiverId.GetReceiverSignature()),
-            _ => Ok(envelopeReceiverId.DecodeEnvelopeReceiverId()),
-        };
-    }
+        1 => Ok(envelopeReceiverId.GetEnvelopeUuid()),
+        2 => Ok(envelopeReceiverId.GetReceiverSignature()),
+        _ => Ok(envelopeReceiverId.DecodeEnvelopeReceiverId()),
+    };
 }
\ No newline at end of file