diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeReceiverController.cs b/EnvelopeGenerator.Web/Controllers/Test/EnvelopeReceiverController.cs
similarity index 84%
rename from EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeReceiverController.cs
rename to EnvelopeGenerator.Web/Controllers/Test/EnvelopeReceiverController.cs
index 3400c16c..3472da99 100644
--- a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeReceiverController.cs
+++ b/EnvelopeGenerator.Web/Controllers/Test/EnvelopeReceiverController.cs
@@ -1,31 +1,34 @@
 using DigitalData.Core.API;
 using EnvelopeGenerator.Extensions;
-using EnvelopeGenerator.Domain.Entities;
 using Microsoft.AspNetCore.Mvc;
-using EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Interfaces.Services;
 using DigitalData.Core.Abstraction.Application.DTO;
-using AutoMapper;
 using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 using MediatR;
 using EnvelopeGenerator.Application.Extensions;
 
 namespace EnvelopeGenerator.Web.Controllers.Test;
 
-[Obsolete("Use MediatR")]
-public class TestEnvelopeReceiverController : ReadControllerBase<IEnvelopeReceiverService, EnvelopeReceiverDto, EnvelopeReceiver, (int Envelope, int Receiver)>
+[Route("test/[controller]")]
+[ApiController]
+public class EnvelopeReceiverController : ControllerBase
 {
     private readonly IMediator _mediator;
+    [Obsolete("Use MediatR")]
+    private readonly IEnvelopeReceiverService _service;
 
-    public TestEnvelopeReceiverController(ILogger<TestEnvelopeReceiverController> logger, IEnvelopeReceiverService service, IMediator mediator) : base(logger, service)
+    [Obsolete("Use MediatR")]
+    public EnvelopeReceiverController(ILogger<EnvelopeReceiverController> logger, IEnvelopeReceiverService service, IMediator mediator, IEnvelopeReceiverService erService)
     {
         _mediator = mediator;
+        _service = erService;
     }
 
     [HttpGet]
     public async Task<IActionResult> Get([FromQuery] ReadEnvelopeReceiverQuery q, CancellationToken cancel) 
         => Ok(await _mediator.Send(q, cancel).ThrowIfNull());
 
+    [Obsolete("Use MediatR")]
     [HttpGet("verify-access-code/{envelope_receiver_id}")]
     public async Task<IActionResult> VerifyAccessCode([FromRoute] string envelope_receiver_id, [FromQuery] string access_code)
     {
@@ -41,6 +44,7 @@ public class TestEnvelopeReceiverController : ReadControllerBase<IEnvelopeReceiv
             return this.InnerServiceError(verification);
     }
 
+    [Obsolete("Use MediatR")]
     [HttpGet("e-r-id/{envelope_receiver_id}")]
     public async Task<IActionResult> GetByEnvelopeReceiverId([FromRoute] string envelope_receiver_id)
     {