diff --git a/server.tests/v1/integrationTests/SeasonsControllerIntegrationTests.cs b/server.tests/v1/integrationTests/SeasonsControllerIntegrationTests.cs
index fe5f403..d4917c6 100644
--- a/server.tests/v1/integrationTests/SeasonsControllerIntegrationTests.cs
+++ b/server.tests/v1/integrationTests/SeasonsControllerIntegrationTests.cs
@@ -7,7 +7,7 @@ using server.tests.Options;
 using System.Net;
 using System.Text.Json;
 
-namespace server.tests.v1.integrationTests
+namespace server.tests.v1.IntegrationTests
 {
     public class SeasonsControllerIntegrationTests
     {
diff --git a/server.tests/v1/unitTests/CharactersControllerUnitTests.cs b/server.tests/v1/unitTests/CharactersControllerUnitTests.cs
index 6f3d0cd..43dcab7 100644
--- a/server.tests/v1/unitTests/CharactersControllerUnitTests.cs
+++ b/server.tests/v1/unitTests/CharactersControllerUnitTests.cs
@@ -90,6 +90,30 @@ namespace server.tests.v1.UnitTests
             character.Should().BeOfType<Character>();
         }
 
+        [Fact]
+        public async Task GetCharacterByIdAsync_ValidCharacterIdForNonExistentCharacter_Returns404StatusCodeWithProblemDetails()
+        {
+            var characterId = "62b7d5506c1b407771829926";
+
+            _mockRepo
+                .Setup(repo => repo.GetCharacterByIdAsync(characterId))
+                .ReturnsAsync(null as Character);
+
+            var response = await _controller.GetCharacterByIdAsync(characterId) as ObjectResult;
+
+            var details = response.Value;
+
+            _mockRepo.Verify(repo => repo.GetCharacterByIdAsync(It.IsAny<string>()), Times.Once());
+
+            response.Should().NotBeNull();
+            response.Should().BeOfType<ObjectResult>();
+            response.StatusCode.Should().Be((int)HttpStatusCode.NotFound);
+
+            details.Should().NotBeNull();
+            details.Should().BeOfType<ProblemDetails>();
+        }
+
+
         [Fact]
         public async Task GetCharacterByIdAsync_RepoThrowsException_Returns500StatusCodeWithProblemDetails()
         {
diff --git a/server.tests/v1/unitTests/QuotesControllerUnitTests.cs b/server.tests/v1/unitTests/QuotesControllerUnitTests.cs
index 8d02a3f..d38ef20 100644
--- a/server.tests/v1/unitTests/QuotesControllerUnitTests.cs
+++ b/server.tests/v1/unitTests/QuotesControllerUnitTests.cs
@@ -1,8 +1,12 @@
-using Moq;
+using FluentAssertions;
+using Microsoft.AspNetCore.Mvc;
+using Moq;
 using server.Controllers.v1;
+using server.Models;
 using server.Persistence.Repositories;
+using System.Net;
 
-namespace server.tests.v1.unitTests
+namespace server.tests.v1.UnitTests
 {
     public class QuotesControllerUnitTests
     {
@@ -14,5 +18,123 @@ namespace server.tests.v1.unitTests
             _mockRepo = new Mock<IQuoteRepository>();
             _controller = new QuotesController(_mockRepo.Object);
         }
+
+        [Fact]
+        public async Task GetQuotesAsync_AllQuotes_Returns200StatusCodeWithQuotesCollection()
+        {
+            var filter = new QuoteFilter();
+
+            var quotes = new List<Quote> { new Quote(), new Quote() };
+
+            _mockRepo
+                .Setup(repo => repo.GetQuotesAsync(filter))
+                .ReturnsAsync(quotes);
+
+            var response = await _controller.GetQuotesAsync(filter) as ObjectResult;
+
+            var data = response.Value as List<Quote>;
+
+            _mockRepo.Verify(repo => repo.GetQuotesAsync(It.IsAny<QuoteFilter>()), Times.Once());
+
+            response.Should().NotBeNull();
+            response.Should().BeOfType<OkObjectResult>();
+            response.StatusCode.Should().Be((int)HttpStatusCode.OK);
+
+            data.Should().NotBeNull();
+            data.Should().BeOfType<List<Quote>>();
+            data.Should().HaveCount(2);
+        }
+
+        [Fact]
+        public async Task GetQuotesAsync_RepoThrowsException_Returns500StatusCodeWithProblemDetails()
+        {
+            var filter = new QuoteFilter();
+
+            _mockRepo
+                .Setup(repo => repo.GetQuotesAsync(filter))
+                .Throws(new Exception());
+
+            var response = await _controller.GetQuotesAsync(filter) as ObjectResult;
+
+            var details = response.Value;
+
+            _mockRepo.Verify(repo => repo.GetQuotesAsync(It.IsAny<QuoteFilter>()), Times.Once());
+
+            response.Should().NotBeNull();
+            response.Should().BeOfType<ObjectResult>();
+            response.StatusCode.Should().Be((int)HttpStatusCode.InternalServerError);
+
+            details.Should().NotBeNull();
+            details.Should().BeOfType<ProblemDetails>();
+        }
+
+
+        [Fact]
+        public async Task GetQuoteByIdAsync_ValidId_Returns200StatusCodeWithQuote()
+        {
+            var quoteId = "62b7d5506c1b407771829926";
+
+            _mockRepo
+                .Setup(repo => repo.GetQuoteByIdAsync(quoteId))
+                .ReturnsAsync(new Quote());
+
+            var response = await _controller.GetQuoteByIdAsync(quoteId) as ObjectResult;
+
+            var character = response.Value;
+
+            _mockRepo.Verify(repo => repo.GetQuoteByIdAsync(It.IsAny<string>()), Times.Once());
+
+            response.Should().NotBeNull();
+            response.Should().BeOfType<OkObjectResult>();
+            response.StatusCode.Should().Be((int)HttpStatusCode.OK);
+
+            character.Should().NotBeNull();
+            character.Should().BeOfType<Quote>();
+        }
+
+        public async Task GetQuoteByIdAsync_ValidIdForNonExistentQuote_Returns404StatusCodeWithProblemDetails()
+        {
+            var quoteId = "62b7d5506c1b407771829926";
+
+            _mockRepo
+                .Setup(repo => repo.GetQuoteByIdAsync(quoteId))
+                .ReturnsAsync(null as Quote);
+
+            var response = await _controller.GetQuoteByIdAsync(quoteId) as ObjectResult;
+
+            var quote = response.Value;
+
+            _mockRepo.Verify(repo => repo.GetQuoteByIdAsync(It.IsAny<String>()), Times.Once());
+
+            response.Should().NotBeNull();
+            response.Should().BeOfType<OkObjectResult>();
+            response.StatusCode.Should().Be((int)HttpStatusCode.NotFound);
+
+            quote.Should().NotBeNull();
+            quote.Should().BeOfType<Quote>();
+        }
+
+        [Fact]
+        public async Task GetQuoteByIdAsync_RepoThrowsException_Returns500StatusCodeWithProblemDetails()
+        {
+            var quoteId = "62b7d5506c1b407771829926";
+
+            _mockRepo
+                .Setup(repo => repo.GetQuoteByIdAsync(quoteId))
+                .Throws(new Exception());
+
+            var response = await _controller.GetQuoteByIdAsync(quoteId) as ObjectResult;
+
+            var details = response.Value;
+
+            _mockRepo.Verify(repo => repo.GetQuoteByIdAsync(It.IsAny<string>()), Times.Once());
+
+            response.Should().NotBeNull();
+            response.Should().BeOfType<ObjectResult>();
+            response.StatusCode.Should().Be((int)HttpStatusCode.InternalServerError);
+
+            details.Should().NotBeNull();
+            details.Should().BeOfType<ProblemDetails>();
+        }
     }
 }
diff --git a/server.tests/v1/unitTests/SeasonsControllerUnitTests.cs b/server.tests/v1/unitTests/SeasonsControllerUnitTests.cs
index aa288f5..e5373a2 100644
--- a/server.tests/v1/unitTests/SeasonsControllerUnitTests.cs
+++ b/server.tests/v1/unitTests/SeasonsControllerUnitTests.cs
@@ -6,7 +6,7 @@ using server.Models;
 using server.Persistence.Repositories;
 using System.Net;
 
-namespace server.tests.v1.unitTests
+namespace server.tests.v1.UnitTests
 {
     public class SeasonsControllerUnitTests
     {