diff --git a/Streetcode/Streetcode.BLL/MediatR/Toponyms/GetByStreetcodeId/GetToponymsByStreetcodeIdHandler.cs b/Streetcode/Streetcode.BLL/MediatR/Toponyms/GetByStreetcodeId/GetToponymsByStreetcodeIdHandler.cs
index cbbe319..11cf5ef 100644
--- a/Streetcode/Streetcode.BLL/MediatR/Toponyms/GetByStreetcodeId/GetToponymsByStreetcodeIdHandler.cs
+++ b/Streetcode/Streetcode.BLL/MediatR/Toponyms/GetByStreetcodeId/GetToponymsByStreetcodeIdHandler.cs
@@ -1,6 +1,8 @@
 using AutoMapper;
+using AutoMapper.QueryableExtensions;
 using FluentResults;
 using MediatR;
+using Microsoft.EntityFrameworkCore;
 using Streetcode.BLL.DTO.Toponyms;
 using Microsoft.EntityFrameworkCore;
 using Streetcode.BLL.Interfaces.Logging;
@@ -27,11 +29,11 @@ public GetToponymsByStreetcodeIdHandler(IRepositoryWrapper repositoryWrapper, IM
 
     public async Task<Result<IEnumerable<ToponymDTO>>> Handle(GetToponymsByStreetcodeIdQuery request, CancellationToken cancellationToken)
     {
-        List<ToponymDTO> toponyms = await _repositoryWrapper.ToponymRepository.FindAll(
+        List<ToponymDTO> toponyms = _repositoryWrapper.ToponymRepository.FindAll(
             sc => sc.Streetcodes.Any(s => s.Id == request.StreetcodeId)
-        ).DistinctBy(t => t.StreetName).ProjectTo<ToponymDTO>(_mapper.ConfigurationProvider).ToListAsync(cancellationToken);
+        ).DistinctBy(t => t.StreetName).ProjectTo<ToponymDTO>(_mapper.ConfigurationProvider).ToList();
 
-        if(toponyms.Count == 0)
+        if (toponyms.Count == 0)
         {
             string errorMsg = $"Cannot find any toponym by the streetcode id: {request.StreetcodeId}";
             _logger.LogError(request, errorMsg);
diff --git a/Streetcode/Streetcode.XUnitTest/BLL/MediatR/Toponyms/GetAllToponymsHandlerTests.cs b/Streetcode/Streetcode.XUnitTest/BLL/MediatR/Toponyms/GetAllToponymsHandlerTests.cs
new file mode 100644
index 0000000..db8b552
--- /dev/null
+++ b/Streetcode/Streetcode.XUnitTest/BLL/MediatR/Toponyms/GetAllToponymsHandlerTests.cs
@@ -0,0 +1,202 @@
+namespace Streetcode.XUnitTest.BLL.MediatR.Toponyms
+{
+    using AutoMapper;
+    using FluentAssertions;
+    using Moq;
+    using Streetcode.BLL.DTO.Toponyms;
+    using Streetcode.BLL.Interfaces.Logging;
+    using Streetcode.BLL.MediatR.Toponyms.GetAll;
+    using Streetcode.DAL.Entities.Toponyms;
+    using Streetcode.DAL.Repositories.Interfaces.Base;
+    using Streetcode.DAL.Repositories.Interfaces.Toponyms;
+    using Xunit;
+
+    /// <summary>
+    /// Contains tests for <see cref="GetAllToponymsHandler"/>.
+    /// </summary>
+    public sealed class GetAllToponymsHandlerTests
+    {
+        private readonly IMapper mapper;
+        private readonly Mock<ILoggerService> loggerMock;
+        private readonly Mock<IRepositoryWrapper> repositoryWrapperMock;
+        private readonly Mock<IToponymRepository> toponymRepositoryMock;
+        private readonly GetAllToponymsHandler handler;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GetAllToponymsHandlerTests"/> class.
+        /// </summary>
+        public GetAllToponymsHandlerTests()
+        {
+            this.mapper = new MapperConfiguration(cfg =>
+            {
+                cfg.CreateMap<Toponym, ToponymDTO>();
+            }).CreateMapper();
+            this.loggerMock = new Mock<ILoggerService>();
+            this.repositoryWrapperMock = new Mock<IRepositoryWrapper>();
+            this.toponymRepositoryMock = new Mock<IToponymRepository>();
+            this.repositoryWrapperMock.Setup(r => r.ToponymRepository).Returns(this.toponymRepositoryMock.Object);
+            this.handler = new GetAllToponymsHandler(this.repositoryWrapperMock.Object, this.mapper, this.loggerMock.Object);
+        }
+
+        /// <summary>
+        /// Should return all toponyms when <see cref="GetAllToponymsRequestDTO.Title"/> <see langword="is null"/>.
+        /// </summary>
+        /// <returns>Awaitable task.</returns>
+        [Fact]
+        public async Task Handle_ShouldReturnAllToponyms_WhenNoTitleProvided()
+        {
+            // Arrange
+            IQueryable<Toponym> toponyms = new List<Toponym>
+            {
+                new()
+                {
+                    Id = 1,
+                    StreetName = "Шевченка",
+                },
+                new()
+                {
+                    Id = 2,
+                    StreetName = "Бандери",
+                },
+            }.AsQueryable();
+            List<ToponymDTO> expected_toponyms = new()
+            {
+                this.mapper.Map<ToponymDTO>(toponyms.ElementAt(0)),
+                this.mapper.Map<ToponymDTO>(toponyms.ElementAt(1)),
+            };
+            GetAllToponymsQuery query = new(new GetAllToponymsRequestDTO
+            {
+                Title = null,
+            });
+            this.toponymRepositoryMock.Setup(r => r.FindAll(null)).Returns(toponyms);
+
+            // Act
+            var result = await this.handler.Handle(query, CancellationToken.None);
+
+            // Assert
+            result.IsSuccess.Should().BeTrue();
+            result.Value.Toponyms.Should().BeEquivalentTo(expected_toponyms);
+            this.toponymRepositoryMock.Verify(r => r.FindAll(null), Times.Once);
+        }
+
+        /// <summary>
+        /// Should return filtered toponyms when <see cref="GetAllToponymsRequestDTO.Title"/> <see langword="is not null"/>.
+        /// Must be case-insensitive.
+        /// </summary>
+        /// <returns>Awaitable task.</returns>
+        [Fact]
+        public async Task Handle_ShouldFilterToponyms_WhenTitleProvided_CaseInsensitive()
+        {
+            // Arrange
+            IQueryable<Toponym> toponyms = new List<Toponym>
+            {
+                new()
+                {
+                    Id = 1,
+                    StreetName = "Шевченка",
+                },
+                new()
+                {
+                    Id = 2,
+                    StreetName = "Бандери",
+                },
+            }.AsQueryable();
+            List<ToponymDTO> expected_toponyms = new()
+            {
+                this.mapper.Map<ToponymDTO>(toponyms.ElementAt(1)),
+            };
+            GetAllToponymsQuery query = new(new GetAllToponymsRequestDTO
+            {
+                Title = "аНдЕр",
+            });
+            this.toponymRepositoryMock.Setup(r => r.FindAll(null)).Returns(toponyms);
+
+            // Act
+            var result = await this.handler.Handle(query, CancellationToken.None);
+
+            // Assert
+            result.IsSuccess.Should().BeTrue();
+            result.Value.Toponyms.Should().BeEquivalentTo(expected_toponyms);
+            this.toponymRepositoryMock.Verify(r => r.FindAll(null), Times.Once);
+        }
+
+        /// <summary>
+        /// Should return unique toponyms when <see cref="GetAllToponymsRequestDTO.Title"/> <see langword="is not null"/>.
+        /// </summary>
+        /// <returns>Awaitable task.</returns>
+        [Fact]
+        public async Task Handle_ShouldReturnUniqueToponyms_WhenTitleProvided()
+        {
+            // Arrange
+            IQueryable<Toponym> toponyms = new List<Toponym>
+            {
+                new()
+                {
+                    Id = 1,
+                    StreetName = "Шевченка",
+                    Oblast = "Київська",
+                },
+                new()
+                {
+                    Id = 2,
+                    StreetName = "Шевченка",
+                    Oblast = "Львівська",
+                },
+            }.AsQueryable();
+            List<ToponymDTO> expected_toponyms = new()
+            {
+                this.mapper.Map<ToponymDTO>(toponyms.ElementAt(0)),
+            };
+            GetAllToponymsQuery query = new(new GetAllToponymsRequestDTO
+            {
+                Title = "евч",
+            });
+            this.toponymRepositoryMock.Setup(r => r.FindAll(null)).Returns(toponyms);
+
+            // Act
+            var result = await this.handler.Handle(query, CancellationToken.None);
+
+            // Assert
+            result.IsSuccess.Should().BeTrue();
+            result.Value.Toponyms.Should().BeEquivalentTo(expected_toponyms);
+            this.toponymRepositoryMock.Verify(r => r.FindAll(null), Times.Once);
+        }
+
+        /// <summary>
+        /// Should return empty collection when no matches found.
+        /// </summary>
+        /// <returns>Awaitable task.</returns>
+        [Fact]
+        public async Task Handle_ShouldReturnEmptyCollection_WhenNoMatchesFound()
+        {
+            // Arrange
+            IQueryable<Toponym> toponyms = new List<Toponym>
+            {
+                new()
+                {
+                    Id = 1,
+                    StreetName = "Шевченка",
+                },
+                new()
+                {
+                    Id = 2,
+                    StreetName = "Бандери",
+                },
+            }.AsQueryable();
+            List<ToponymDTO> expected_toponyms = new();
+            GetAllToponymsQuery query = new(new GetAllToponymsRequestDTO
+            {
+                Title = "ийськ",
+            });
+            this.toponymRepositoryMock.Setup(r => r.FindAll(null)).Returns(toponyms);
+
+            // Act
+            var result = await this.handler.Handle(query, CancellationToken.None);
+
+            // Assert
+            result.IsSuccess.Should().BeTrue();
+            result.Value.Toponyms.Should().BeEquivalentTo(expected_toponyms);
+            this.toponymRepositoryMock.Verify(r => r.FindAll(null), Times.Once);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Streetcode/Streetcode.XUnitTest/BLL/MediatR/Toponyms/GetToponymByIdHandlerTests.cs b/Streetcode/Streetcode.XUnitTest/BLL/MediatR/Toponyms/GetToponymByIdHandlerTests.cs
new file mode 100644
index 0000000..0b88c8a
--- /dev/null
+++ b/Streetcode/Streetcode.XUnitTest/BLL/MediatR/Toponyms/GetToponymByIdHandlerTests.cs
@@ -0,0 +1,117 @@
+namespace Streetcode.XUnitTest.BLL.MediatR.Toponyms
+{
+    using System.Linq.Expressions;
+    using AutoMapper;
+    using FluentAssertions;
+    using Moq;
+    using Streetcode.BLL.DTO.Toponyms;
+    using Streetcode.BLL.Interfaces.Logging;
+    using Streetcode.BLL.MediatR.Toponyms.GetById;
+    using Streetcode.DAL.Entities.Toponyms;
+    using Streetcode.DAL.Repositories.Interfaces.Base;
+    using Streetcode.DAL.Repositories.Interfaces.Toponyms;
+    using Xunit;
+
+    /// <summary>
+    /// Contains tests for <see cref="GetToponymByIdHandler"/>.
+    /// </summary>
+    public sealed class GetToponymByIdHandlerTests
+    {
+        private readonly IMapper mapper;
+        private readonly Mock<ILoggerService> loggerMock;
+        private readonly Mock<IRepositoryWrapper> repositoryWrapperMock;
+        private readonly Mock<IToponymRepository> toponymRepositoryMock;
+        private readonly GetToponymByIdHandler handler;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GetToponymByIdHandlerTests"/> class.
+        /// </summary>
+        public GetToponymByIdHandlerTests()
+        {
+            this.mapper = new MapperConfiguration(cfg =>
+            {
+                cfg.CreateMap<Toponym, ToponymDTO>();
+            }).CreateMapper();
+            this.loggerMock = new Mock<ILoggerService>();
+            this.repositoryWrapperMock = new Mock<IRepositoryWrapper>();
+            this.toponymRepositoryMock = new Mock<IToponymRepository>();
+            this.repositoryWrapperMock.Setup(r => r.ToponymRepository).Returns(this.toponymRepositoryMock.Object);
+            this.handler = new GetToponymByIdHandler(this.repositoryWrapperMock.Object, this.mapper, this.loggerMock.Object);
+        }
+
+        /// <summary>
+        /// Should return toponym when found by id.
+        /// </summary>
+        /// <returns>Awaitable task.</returns>
+        [Fact]
+        public async Task Handle_ShouldReturnToponym_WhenFound()
+        {
+            // Arrange
+            Toponym toponym = new()
+            {
+                Id = 2,
+                StreetName = "Бандери",
+            };
+            ToponymDTO expected_toponym = this.mapper.Map<ToponymDTO>(toponym);
+            GetToponymByIdQuery query = new(2);
+            this.toponymRepositoryMock.Setup(
+                r => r.GetFirstOrDefaultAsync(
+                    It.IsAny<Expression<Func<Toponym, bool>>>(),
+                    null
+                )
+            ).ReturnsAsync(toponym);
+
+            // Act
+            var result = await this.handler.Handle(query, CancellationToken.None);
+
+            // Assert
+            result.IsSuccess.Should().BeTrue();
+            result.Value.Should().BeEquivalentTo(expected_toponym);
+            this.toponymRepositoryMock.Verify(
+                r => r.GetFirstOrDefaultAsync(
+                    It.IsAny<Expression<Func<Toponym, bool>>>(),
+                    null
+                ),
+                Times.Once
+            );
+        }
+
+        /// <summary>
+        /// Should return error and log it when toponym not found by id.
+        /// </summary>
+        /// <returns>Awaitable task.</returns>
+        [Fact]
+        public async Task Handle_ShouldReturnError_WhenNotFound()
+        {
+            // Arrange
+            GetToponymByIdQuery query = new(1);
+            this.toponymRepositoryMock.Setup(
+                r => r.GetFirstOrDefaultAsync(
+                    It.IsAny<Expression<Func<Toponym, bool>>>(),
+                    null
+                )
+            ).ReturnsAsync(null as Toponym);
+            this.loggerMock.Setup(
+                l => l.LogError(query, It.IsAny<string>())
+            );
+
+            // Act
+            var result = await this.handler.Handle(query, CancellationToken.None);
+
+            // Assert
+            result.IsSuccess.Should().BeFalse();
+            result.Errors.Should().NotBeEmpty();
+            this.toponymRepositoryMock.Verify(
+                r => r.GetFirstOrDefaultAsync(
+                    It.IsAny<Expression<Func<Toponym, bool>>>(),
+                    null
+                ),
+                Times.Once
+            );
+            this.loggerMock.Verify(
+                l => l.LogError(query, It.IsAny<string>()),
+                Times.Once
+            );
+        }
+    }
+}
\ No newline at end of file
diff --git a/Streetcode/Streetcode.XUnitTest/BLL/MediatR/Toponyms/GetToponymsByStreetcodeIdHandlerTests.cs b/Streetcode/Streetcode.XUnitTest/BLL/MediatR/Toponyms/GetToponymsByStreetcodeIdHandlerTests.cs
new file mode 100644
index 0000000..de85c04
--- /dev/null
+++ b/Streetcode/Streetcode.XUnitTest/BLL/MediatR/Toponyms/GetToponymsByStreetcodeIdHandlerTests.cs
@@ -0,0 +1,210 @@
+namespace Streetcode.XUnitTest.BLL.MediatR.Toponyms
+{
+    using AutoMapper;
+    using Moq;
+    using Streetcode.BLL.DTO.Toponyms;
+    using Streetcode.BLL.Interfaces.Logging;
+    using Streetcode.DAL.Entities.Toponyms;
+    using Streetcode.DAL.Repositories.Interfaces.Base;
+    using Streetcode.DAL.Repositories.Interfaces.Toponyms;
+    using Xunit;
+    using DAL.Entities.Streetcode;
+    using Streetcode.BLL.MediatR.Toponyms.GetByStreetcodeId;
+    using System.Linq.Expressions;
+    using Streetcode.BLL.DTO.Streetcode;
+    using FluentAssertions;
+    using Streetcode.DAL.Entities.AdditionalContent.Coordinates.Types;
+    using Streetcode.BLL.DTO.AdditionalContent.Coordinates.Types;
+    using Streetcode.DAL.Entities.AdditionalContent;
+    using Streetcode.BLL.DTO.AdditionalContent.Tag;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="GetToponymsByStreetcodeIdHandlerTests"/> class.
+    /// </summary>
+    public sealed class GetToponymsByStreetcodeIdHandlerTests
+    {
+        private readonly IMapper mapper;
+        private readonly Mock<ILoggerService> loggerMock;
+        private readonly Mock<IRepositoryWrapper> repositoryWrapperMock;
+        private readonly Mock<IToponymRepository> toponymRepositoryMock;
+        private readonly GetToponymsByStreetcodeIdHandler handler;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GetToponymsByStreetcodeIdHandlerTests"/> class.
+        /// </summary>
+        public GetToponymsByStreetcodeIdHandlerTests()
+        {
+            this.mapper = new MapperConfiguration(cfg =>
+            {
+                cfg.CreateMap<Toponym, ToponymDTO>();
+                cfg.CreateMap<ToponymCoordinate, ToponymCoordinateDTO>();
+                cfg.CreateMap<StreetcodeContent, StreetcodeDTO>();
+                cfg.CreateMap<Tag, StreetcodeTagDTO>();
+            }).CreateMapper();
+            this.loggerMock = new Mock<ILoggerService>();
+            this.repositoryWrapperMock = new Mock<IRepositoryWrapper>();
+            this.toponymRepositoryMock = new Mock<IToponymRepository>();
+            this.repositoryWrapperMock.Setup(r => r.ToponymRepository).Returns(this.toponymRepositoryMock.Object);
+            this.handler = new GetToponymsByStreetcodeIdHandler(this.repositoryWrapperMock.Object, this.mapper, this.loggerMock.Object);
+        }
+
+        /// <summary>
+        /// Should return toponyms when found by streetcode id.
+        /// </summary>
+        /// <returns>Awaitable task.</returns>
+        [Fact]
+        public async Task Handle_ShouldReturnToponyms_WhenFound()
+        {
+            // Arrange
+            IQueryable<Toponym> toponyms = new List<Toponym>()
+            {
+                new()
+                {
+                    Id = 1,
+                    StreetName = "Шевченка",
+                    Oblast = "Київська",
+                    Streetcodes = new List<StreetcodeContent>()
+                    {
+                        new()
+                        {
+                            Id = 1,
+                        },
+                        new()
+                        {
+                            Id = 2,
+                        },
+                    },
+                },
+            }.AsQueryable();
+            List<ToponymDTO> expected_toponyms = new()
+            {
+                this.mapper.Map<ToponymDTO>(toponyms.First()),
+            };
+            GetToponymsByStreetcodeIdQuery query = new(1);
+            this.toponymRepositoryMock.Setup(
+                r => r.FindAll(
+                    It.IsAny<Expression<Func<Toponym, bool>>>()
+                )
+            ).Returns(toponyms);
+
+            // Act
+            var result = await this.handler.Handle(query, CancellationToken.None);
+
+            // Assert
+            result.IsSuccess.Should().BeTrue();
+            result.Value.Should().BeEquivalentTo(expected_toponyms);
+            this.toponymRepositoryMock.Verify(
+                r => r.FindAll(
+                    It.IsAny<Expression<Func<Toponym, bool>>>()
+                ),
+                Times.Once
+            );
+        }
+
+        /// <summary>
+        /// Should return toponyms with unique street name when found by streetcode id.
+        /// </summary>
+        /// <returns>Awaitable task.</returns>
+        [Fact]
+        public async Task Handle_ShouldReturnUniqueToponyms_WhenFound()
+        {
+            // Arrange
+            IQueryable<Toponym> toponyms = new List<Toponym>()
+            {
+                new()
+                {
+                    Id = 1,
+                    StreetName = "Шевченка",
+                    Oblast = "Київська",
+                    Streetcodes = new List<StreetcodeContent>()
+                    {
+                        new()
+                        {
+                            Id = 1,
+                        },
+                        new()
+                        {
+                            Id = 2,
+                        },
+                    },
+                },
+                new()
+                {
+                    Id = 2,
+                    StreetName = "Шевченка",
+                    Oblast = "Львівська",
+                    Streetcodes = new List<StreetcodeContent>()
+                    {
+                        new()
+                        {
+                            Id = 1,
+                        },
+                        new()
+                        {
+                            Id = 2,
+                        },
+                    },
+                },
+            }.AsQueryable();
+            List<ToponymDTO> expected_toponyms = new()
+            {
+                this.mapper.Map<ToponymDTO>(toponyms.First()),
+            };
+            GetToponymsByStreetcodeIdQuery query = new(1);
+            this.toponymRepositoryMock.Setup(
+                r => r.FindAll(
+                    It.IsAny<Expression<Func<Toponym, bool>>>()
+                )
+            ).Returns(toponyms);
+
+            // Act
+            var result = await this.handler.Handle(query, CancellationToken.None);
+
+            // Assert
+            result.IsSuccess.Should().BeTrue();
+            result.Value.Should().BeEquivalentTo(expected_toponyms);
+            this.toponymRepositoryMock.Verify(
+                r => r.FindAll(
+                    It.IsAny<Expression<Func<Toponym, bool>>>()
+                ),
+                Times.Once
+            );
+        }
+
+        /// <summary>
+        /// Should return error and log it when toponyms not found by streetcode id.
+        /// </summary>
+        /// <returns>Awaitable task.</returns>
+        [Fact]
+        public async Task Handle_ShouldReturnError_WhenNotFound()
+        {
+            // Arrange
+            GetToponymsByStreetcodeIdQuery query = new(3);
+            this.toponymRepositoryMock.Setup(
+                r => r.FindAll(
+                    It.IsAny<Expression<Func<Toponym, bool>>>()
+                )
+            ).Returns(Enumerable.Empty<Toponym>().AsQueryable());
+            this.loggerMock.Setup(
+                l => l.LogError(query, It.IsAny<string>())
+            );
+
+            // Act
+            var result = await this.handler.Handle(query, CancellationToken.None);
+
+            // Assert
+            result.IsSuccess.Should().BeFalse();
+            result.Errors.Should().NotBeEmpty();
+            this.toponymRepositoryMock.Verify(
+                r => r.FindAll(
+                    It.IsAny<Expression<Func<Toponym, bool>>>()
+                ),
+                Times.Once
+            );
+            this.loggerMock.Verify(
+                l => l.LogError(query, It.IsAny<string>()),
+                Times.Once
+            );
+        }
+    }
+}
\ No newline at end of file