diff --git a/FileProcessor.BusinessLogic/Common/FileLineProcessingDiagnostics.cs b/FileProcessor.BusinessLogic/Common/FileLineProcessingDiagnostics.cs
index c5a6467..0cba6d4 100644
--- a/FileProcessor.BusinessLogic/Common/FileLineProcessingDiagnostics.cs
+++ b/FileProcessor.BusinessLogic/Common/FileLineProcessingDiagnostics.cs
@@ -46,6 +46,7 @@ public FileLineProcessingContext(FileCommands.ProcessTransactionForFileLineComma
     public Boolean TransactionDispatchSucceeded { get; set; }
 
     public String TransactionDispatchFailureType { get; set; }
+    public String TransactionDispatchFailureResult { get; set; }
 
     public Guid EstateId { get; set; }
 
diff --git a/FileProcessor.Client/FileProcessorClient.cs b/FileProcessor.Client/FileProcessorClient.cs
index fb9ef84..49b3cbe 100644
--- a/FileProcessor.Client/FileProcessorClient.cs
+++ b/FileProcessor.Client/FileProcessorClient.cs
@@ -1,7 +1,5 @@
 using System.Linq;
 using System.Security.Cryptography;
-using System.Net.Http.Headers;
-using System.Text;
 using Shared.Results;
 
 namespace FileProcessor.Client {
@@ -19,54 +17,89 @@ namespace FileProcessor.Client {
     using FileProcessor.Models;
     using SimpleResults;
 
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <seealso cref="ClientProxyBase" />
-    /// <seealso cref="FileProcessor.Client.IFileProcessorClient" />
-    public class FileProcessorClient : ClientProxyBase, IFileProcessorClient {
-        #region Fields
+    public enum SortDirection {
+        Ascending,
+        Descending,
+    }
+    public record PagingRequest(Int32 PageNumber, Int32 PageSize, SortDirection Direction);
 
-        /// <summary>
-        /// The base address resolver
-        /// </summary>
-        private readonly Func<String, String> BaseAddressResolver;
+    public interface IFileProcessorClient {
 
-        private readonly HttpClient HttpClient;
+        Task<Result<List<FileProfile>>> GetFileProfiles(String accessToken,
+                                                        CancellationToken cancellationToken);
 
-        private readonly Func<Object, String> Serialise;
+        Task<Result<FileProfile>> GetFileProfile(String accessToken,
+                                                 Guid fileProfileId,
+                                                 CancellationToken cancellationToken);
 
-        private readonly Func<String, Type, Object> Deserialise;
+        Task<Result<List<FileProfile>>> GetFileProfileVersions(String accessToken,
+                                                               Guid fileProfileId,
+                                                               CancellationToken cancellationToken);
 
-        #endregion
+        Task<Result<FileProfile>> GetFileProfileVersion(String accessToken,
+                                                        Guid fileProfileId,
+                                                        Guid fileProfileVersionId,
+                                                        CancellationToken cancellationToken);
+
+        Task<Result<FileProfile>> CreateFileProfile(String accessToken,
+                                                    DataTransferObjects.Requests.CreateFileProfileRequest request,
+                                                    CancellationToken cancellationToken);
+
+        Task<Result<FileProfile>> UpdateFileProfile(String accessToken,
+                                                    Guid fileProfileId,
+                                                    DataTransferObjects.Requests.UpdateFileProfileRequest request,
+                                                    CancellationToken cancellationToken);
 
-        #region Constructors
+        Task<Result> ArchiveFileProfile(String accessToken,
+                                        Guid fileProfileId,
+                                        CancellationToken cancellationToken);
+
+        Task<Result<ApiFileDetails>> GetFile(String accessToken,
+                                             Guid estateId,
+                                             Guid fileId,
+                                             CancellationToken cancellationToken);
+
+        /// <returns></returns>
+        Task<Result<ApiFileImportLog>> GetFileImportLog(String accessToken,
+                                                        Guid fileImportLogId,
+                                                        Guid estateId,
+                                                        Guid? merchantId,
+                                                        CancellationToken cancellationToken);
+
+        Task<Result<FileImportLogList>> GetFileImportLogs(String accessToken,
+                                                          Guid estateId,
+                                                          DateOnly startDate,
+                                                          DateOnly endDate,
+                                                          Guid? merchantId,
+                                                          PagingRequest pagingRequest,
+                                                          CancellationToken cancellationToken);
+
+        Task<Result<Guid>> UploadFile(String accessToken,
+                                      String fileName,
+                                      Byte[] fileData,
+                                      UploadFileRequest uploadFileRequest,
+                                      CancellationToken cancellationToken);
+
+    }
+
+    public class FileProcessorClient : ClientProxyBase, IFileProcessorClient {
+
+        private readonly Func<String, String> BaseAddressResolver;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FileProcessorClient"/> class.
-        /// </summary>
-        /// <param name="baseAddressResolver">The base address resolver.</param>
-        /// <param name="httpClient">The HTTP client.</param>
         public FileProcessorClient(Func<String, String> baseAddressResolver,
                                    HttpClient httpClient,
                                    Func<object, string> serialise,
-                                   Func<string, Type, object> deserialise) : base(httpClient, serialise, deserialise)
-        {
+                                   Func<string, Type, object> deserialise) : base(httpClient, serialise, deserialise) {
             this.BaseAddressResolver = baseAddressResolver;
-            this.HttpClient = httpClient;
-            this.Serialise = serialise;
-            this.Deserialise = deserialise;
         }
 
-        #endregion
-
         #region Methods
 
         public async Task<Result<List<FileProfile>>> GetFileProfiles(String accessToken,
                                                                      CancellationToken cancellationToken)
         {
             String requestUri = this.BuildRequestUrl("/api/file-profiles");
-            return await this.SendRequest<List<FileProfile>>(HttpMethod.Get, requestUri, accessToken, null, cancellationToken);
+            return await this.Get<List<FileProfile>>(requestUri, accessToken, null, cancellationToken);
         }
 
         public async Task<Result<FileProfile>> GetFileProfile(String accessToken,
@@ -74,7 +107,7 @@ public async Task<Result<FileProfile>> GetFileProfile(String accessToken,
                                                               CancellationToken cancellationToken)
         {
             String requestUri = this.BuildRequestUrl($"/api/file-profiles/{fileProfileId}");
-            return await this.SendRequest<FileProfile>(HttpMethod.Get, requestUri, accessToken, null, cancellationToken);
+            return await this.Get<FileProfile>(requestUri, accessToken, null, cancellationToken);
         }
 
         public async Task<Result<List<FileProfile>>> GetFileProfileVersions(String accessToken,
@@ -82,7 +115,7 @@ public async Task<Result<List<FileProfile>>> GetFileProfileVersions(String acces
                                                                              CancellationToken cancellationToken)
         {
             String requestUri = this.BuildRequestUrl($"/api/file-profiles/{fileProfileId}/versions");
-            return await this.SendRequest<List<FileProfile>>(HttpMethod.Get, requestUri, accessToken, null, cancellationToken);
+            return await this.Get<List<FileProfile>>(requestUri, accessToken, null, cancellationToken);
         }
 
         public async Task<Result<FileProfile>> GetFileProfileVersion(String accessToken,
@@ -91,7 +124,7 @@ public async Task<Result<FileProfile>> GetFileProfileVersion(String accessToken,
                                                                       CancellationToken cancellationToken)
         {
             String requestUri = this.BuildRequestUrl($"/api/file-profiles/{fileProfileId}/versions/{fileProfileVersionId}");
-            return await this.SendRequest<FileProfile>(HttpMethod.Get, requestUri, accessToken, null, cancellationToken);
+            return await this.Get<FileProfile>(requestUri, accessToken, null, cancellationToken);
         }
 
         public async Task<Result<FileProfile>> CreateFileProfile(String accessToken,
@@ -99,7 +132,7 @@ public async Task<Result<FileProfile>> CreateFileProfile(String accessToken,
                                                                  CancellationToken cancellationToken)
         {
             String requestUri = this.BuildRequestUrl("/api/file-profiles");
-            return await this.SendRequest<FileProfile>(HttpMethod.Post, requestUri, accessToken, request, cancellationToken);
+            return await this.Post<CreateFileProfileRequest, FileProfile>(requestUri, request, accessToken, cancellationToken);
         }
 
         public async Task<Result<FileProfile>> UpdateFileProfile(String accessToken,
@@ -108,7 +141,7 @@ public async Task<Result<FileProfile>> UpdateFileProfile(String accessToken,
                                                                  CancellationToken cancellationToken)
         {
             String requestUri = this.BuildRequestUrl($"/api/file-profiles/{fileProfileId}");
-            return await this.SendRequest<FileProfile>(HttpMethod.Patch, requestUri, accessToken, request, cancellationToken);
+            return await this.Patch<UpdateFileProfileRequest>(requestUri, request, accessToken, cancellationToken);
         }
 
         public async Task<Result> ArchiveFileProfile(String accessToken,
@@ -116,7 +149,7 @@ public async Task<Result> ArchiveFileProfile(String accessToken,
                                                      CancellationToken cancellationToken)
         {
             String requestUri = this.BuildRequestUrl($"/api/file-profiles/{fileProfileId}");
-            Result<FileProfile> result = await this.SendRequest<FileProfile>(HttpMethod.Delete, requestUri, accessToken, null, cancellationToken);
+            Result<FileProfile> result = await this.Delete(requestUri, accessToken, cancellationToken);
 
             if (result.IsFailed)
             {
@@ -126,14 +159,6 @@ public async Task<Result> ArchiveFileProfile(String accessToken,
             return Result.Success();
         }
 
-        /// <summary>
-        /// Gets the file.
-        /// </summary>
-        /// <param name="accessToken">The access token.</param>
-        /// <param name="estateId">The estate identifier.</param>
-        /// <param name="fileId">The file identifier.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns></returns>
         public async Task<Result<ApiFileDetails>> GetFile(String accessToken,
                                                           Guid estateId,
                                                           Guid fileId,
@@ -156,15 +181,6 @@ public async Task<Result<ApiFileDetails>> GetFile(String accessToken,
             }
         }
 
-        /// <summary>
-        /// Gets the file import log.
-        /// </summary>
-        /// <param name="accessToken">The access token.</param>
-        /// <param name="fileImportLogId">The file import log identifier.</param>
-        /// <param name="estateId">The estate identifier.</param>
-        /// <param name="merchantId">The merchant identifier.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns></returns>
         public async Task<Result<ApiFileImportLog>> GetFileImportLog(String accessToken,
                                                                      Guid fileImportLogId,
                                                                      Guid estateId,
@@ -192,27 +208,21 @@ public async Task<Result<ApiFileImportLog>> GetFileImportLog(String accessToken,
             }
         }
 
-        /// <summary>
-        /// Gets the file import logs.
-        /// </summary>
-        /// <param name="accessToken">The access token.</param>
-        /// <param name="estateId">The estate identifier.</param>
-        /// <param name="startDate">The first calendar date.</param>
-        /// <param name="endDate">The last calendar date.</param>
-        /// <param name="merchantId">The merchant identifier.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns></returns>
         public async Task<Result<FileImportLogList>> GetFileImportLogs(String accessToken,
                                                                Guid estateId,
                                                                DateOnly startDate,
                                                                DateOnly endDate,
                                                                Guid? merchantId,
-                                                               Int32 pageNumber,
-                                                               Int32 pageSize,
-                                                               Boolean descending,
+                                                               PagingRequest pagingRequest,
                                                                CancellationToken cancellationToken) {
+
+            Boolean descending = pagingRequest.Direction switch {
+                                     SortDirection.Ascending => false,
+                                     _ => true
+                                 };
+
             String requestUri = this.BuildRequestUrl(
-                $"/api/fileImportLogs?estateId={estateId}&startDate={startDate:yyyy-MM-dd}&endDate={endDate:yyyy-MM-dd}&pageNumber={pageNumber}&pageSize={pageSize}&descending={descending}");
+                $"/api/fileImportLogs?estateId={estateId}&startDate={startDate:yyyy-MM-dd}&endDate={endDate:yyyy-MM-dd}&pageNumber={pagingRequest.PageNumber}&pageSize={pagingRequest.PageSize}&descending={descending}");
 
             if (merchantId.HasValue)
                 requestUri += $"&merchantId={merchantId}";
@@ -221,15 +231,6 @@ public async Task<Result<FileImportLogList>> GetFileImportLogs(String accessToke
             return result.IsFailed ? ResultHelpers.CreateFailure(result) : result;
         }
 
-        /// <summary>
-        /// Uploads the file.
-        /// </summary>
-        /// <param name="accessToken">The access token.</param>
-        /// <param name="fileName">Name of the file.</param>
-        /// <param name="fileData">The file data.</param>
-        /// <param name="uploadFileRequest">The upload file request.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns></returns>
         public async Task<Result<Guid>> UploadFile(String accessToken,
                                                    String fileName,
                                                    Byte[] fileData,
@@ -276,11 +277,6 @@ private Guid CreateGuidFromFileData(Byte[] fileContents)
             }
         }
 
-        /// <summary>
-        /// Builds the request URL.
-        /// </summary>
-        /// <param name="route">The route.</param>
-        /// <returns></returns>
         private String BuildRequestUrl(String route) {
             String baseAddress = this.BaseAddressResolver("FileProcessorApi");
 
@@ -289,43 +285,6 @@ private String BuildRequestUrl(String route) {
             return requestUri;
         }
 
-        private async Task<Result<T>> SendRequest<T>(HttpMethod method,
-                                                     String requestUri,
-                                                     String accessToken,
-                                                     Object body,
-                                                     CancellationToken cancellationToken)
-        {
-            using HttpRequestMessage request = new(method, requestUri);
-            request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
-
-            if (body != null)
-            {
-                String payload = this.Serialise(body);
-                request.Content = new StringContent(payload, Encoding.UTF8, "application/json");
-            }
-
-            HttpResponseMessage response = await this.HttpClient.SendAsync(request, cancellationToken);
-            String responseContent = response.Content == null ? null : await response.Content.ReadAsStringAsync(cancellationToken);
-
-            if (response.IsSuccessStatusCode == false)
-            {
-                String message = String.IsNullOrWhiteSpace(responseContent)
-                    ? $"Request failed with status code {(Int32)response.StatusCode}"
-                    : responseContent;
-
-                return response.StatusCode == System.Net.HttpStatusCode.NotFound
-                    ? Result.NotFound(message)
-                    : Result.Failure(message);
-            }
-
-            if (String.IsNullOrWhiteSpace(responseContent))
-            {
-                return Result.Success(default(T));
-            }
-
-            Object deserialised = this.Deserialise(responseContent, typeof(T));
-            return Result.Success((T)deserialised);
-        }
 
         #endregion
     }
diff --git a/FileProcessor.Client/IFileProcessorClient.cs b/FileProcessor.Client/IFileProcessorClient.cs
deleted file mode 100644
index caa0d19..0000000
--- a/FileProcessor.Client/IFileProcessorClient.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-using SimpleResults;
-
-namespace FileProcessor.Client
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using DataTransferObjects;
-    using ApiFileDetails = DataTransferObjects.Responses.FileDetails;
-    using ApiFileImportLog = DataTransferObjects.Responses.FileImportLog;
-    using DataTransferObjects.Responses;
-    using FileProcessor.Models;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public interface IFileProcessorClient
-    {
-        #region Methods
-
-        Task<Result<List<FileProfile>>> GetFileProfiles(String accessToken,
-                                                        CancellationToken cancellationToken);
-
-        Task<Result<FileProfile>> GetFileProfile(String accessToken,
-                                                 Guid fileProfileId,
-                                                 CancellationToken cancellationToken);
-
-        Task<Result<List<FileProfile>>> GetFileProfileVersions(String accessToken,
-                                                               Guid fileProfileId,
-                                                               CancellationToken cancellationToken);
-
-        Task<Result<FileProfile>> GetFileProfileVersion(String accessToken,
-                                                        Guid fileProfileId,
-                                                        Guid fileProfileVersionId,
-                                                        CancellationToken cancellationToken);
-
-        Task<Result<FileProfile>> CreateFileProfile(String accessToken,
-                                                    DataTransferObjects.Requests.CreateFileProfileRequest request,
-                                                    CancellationToken cancellationToken);
-
-        Task<Result<FileProfile>> UpdateFileProfile(String accessToken,
-                                                    Guid fileProfileId,
-                                                    DataTransferObjects.Requests.UpdateFileProfileRequest request,
-                                                    CancellationToken cancellationToken);
-
-        Task<Result> ArchiveFileProfile(String accessToken,
-                                        Guid fileProfileId,
-                                        CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Gets the file.
-        /// </summary>
-        /// <param name="accessToken">The access token.</param>
-        /// <param name="estateId">The estate identifier.</param>
-        /// <param name="fileId">The file identifier.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns></returns>
-        Task<Result<ApiFileDetails>> GetFile(String accessToken,
-                                              Guid estateId,
-                                              Guid fileId,
-                                              CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Gets the file import log.
-        /// </summary>
-        /// <param name="accessToken">The access token.</param>
-        /// <param name="fileImportLogId">The file import log identifier.</param>
-        /// <param name="estateId">The estate identifier.</param>
-        /// <param name="merchantId">The merchant identifier.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns></returns>
-        Task<Result<ApiFileImportLog>> GetFileImportLog(String accessToken,
-                                                        Guid fileImportLogId,
-                                                        Guid estateId,
-                                                        Guid? merchantId,
-                                                        CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Gets the file import logs.
-        /// </summary>
-        /// <param name="accessToken">The access token.</param>
-        /// <param name="estateId">The estate identifier.</param>
-        /// <param name="startDate">The first calendar date.</param>
-        /// <param name="endDate">The last calendar date.</param>
-        /// <param name="merchantId">The merchant identifier.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns></returns>
-        Task<Result<FileImportLogList>> GetFileImportLogs(String accessToken,
-                                                  Guid estateId,
-                                                  DateOnly startDate,
-                                                  DateOnly endDate,
-                                                  Guid? merchantId,
-                                                  Int32 pageNumber,
-                                                  Int32 pageSize,
-                                                  Boolean descending,
-                                                  CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Uploads the file.
-        /// </summary>
-        /// <param name="accessToken">The access token.</param>
-        /// <param name="fileName">Name of the file.</param>
-        /// <param name="fileData">The file data.</param>
-        /// <param name="uploadFileRequest">The upload file request.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns></returns>
-        Task<Result<Guid>> UploadFile(String accessToken,
-                              String fileName,
-                              Byte[] fileData,
-                              UploadFileRequest uploadFileRequest,
-                              CancellationToken cancellationToken);
-
-        #endregion
-    }
-}
diff --git a/FileProcessor.IntegrationTesting.Helpers/FileProcessorSteps.cs b/FileProcessor.IntegrationTesting.Helpers/FileProcessorSteps.cs
index 7eb6673..be6bbef 100644
--- a/FileProcessor.IntegrationTesting.Helpers/FileProcessorSteps.cs
+++ b/FileProcessor.IntegrationTesting.Helpers/FileProcessorSteps.cs
@@ -40,7 +40,7 @@ public async Task<Guid> GivenIUploadThisFileForProcessing(String accessToken, St
                                                                 uploadFileRequest,
                                                                 CancellationToken.None);
         uploadFileResult.IsSuccess.ShouldBeTrue();
-        var fileId = uploadFileResult.Data;
+        Guid fileId = uploadFileResult.Data;
         fileId.ShouldNotBe(Guid.Empty);
 
         estateDetails.AddUploadedFile(new FileImportLogFile
@@ -124,7 +124,7 @@ public async Task GivenIUploadThisFileForProcessingAnErrorShouldBeReturnedIndica
                                                                                                             String filePath,
                                                                                                             Byte[] fileData,
                                                                                                             UploadFileRequest uploadFileRequest) {
-        var result = await this.FileProcessorClient.UploadFile(accessToken, Path.GetFileName(filePath), fileData, uploadFileRequest, CancellationToken.None);
+        Result<Guid> result = await this.FileProcessorClient.UploadFile(accessToken, Path.GetFileName(filePath), fileData, uploadFileRequest, CancellationToken.None);
         result.IsFailed.ShouldBeTrue();
     }
 
@@ -135,15 +135,15 @@ public async Task WhenIGetTheImportLogsBetweenAndTheFollowingDataIsReturned(Stri
         EstateDetails1 estate = estateDetailsList.SingleOrDefault(e => e.EstateDetails.EstateName == estateName);
         estate.ShouldNotBeNull();
 
+        PagingRequest pagingRequest = new(1, 50, Client.SortDirection.Descending);
+
         await Retry.For(async () => {
-                            var getFileImportLogsResult = await this.FileProcessorClient.GetFileImportLogs(accessToken,
+                            Result<FileImportLogList> getFileImportLogsResult = await this.FileProcessorClient.GetFileImportLogs(accessToken,
                                                                                                                estate.EstateDetails.EstateId,
                                                                                                                DateOnly.FromDateTime(queryStartDate),
                                                                                                                DateOnly.FromDateTime(queryEndDate),
                                                                                                                null,
-                                                                                                               1,
-                                                                                                               50,
-                                                                                                               false,
+                                                                                                               pagingRequest,
                                                                                                                CancellationToken.None);
                             getFileImportLogsResult.IsSuccess.ShouldBeTrue();
                             FileImportLogList importLogList = getFileImportLogsResult.Data;
@@ -165,23 +165,23 @@ public async Task WhenIGetTheImportLogForTheFollowingFileInformationIsReturned(S
         EstateDetails1 estate = estateDetailsList.SingleOrDefault(e => e.EstateDetails.EstateName == estateName);
         estate.ShouldNotBeNull();
 
+        PagingRequest pagingRequest = new(1, 50, Client.SortDirection.Descending);
+
         DateTime queryStartDate = ReqnrollTableHelper.GetDateForDateString(startDate, DateTime.Now);
-        var importLogListResult = await this.FileProcessorClient.GetFileImportLogs(accessToken,
+        Result<FileImportLogList> importLogListResult = await this.FileProcessorClient.GetFileImportLogs(accessToken,
                                                                                            estate.EstateDetails.EstateId,
                                                                                            DateOnly.FromDateTime(queryStartDate),
                                                                                            DateOnly.FromDateTime(queryStartDate),
                                                                                            null,
-                                                                                           1,
-                                                                                           50,
-                                                                                           false,
+                                                                                           pagingRequest,
                                                                                            CancellationToken.None);
         importLogListResult.IsSuccess.ShouldBeTrue();
-        var importLogList = importLogListResult.Data;
+        FileImportLogList importLogList = importLogListResult.Data;
         importLogList.ShouldNotBeNull();
         importLogList.FileImportLogs.ShouldHaveSingleItem();
 
         Guid fileImportLogId = importLogList.FileImportLogs.Single().FileImportLogId;
-        var getImportLogResult = await this.FileProcessorClient.GetFileImportLog(accessToken,
+        Result<FileImportLog> getImportLogResult = await this.FileProcessorClient.GetFileImportLog(accessToken,
                                                                                       fileImportLogId,
                                                                                       estate.EstateDetails.EstateId,
                                                                                       null,
@@ -209,14 +209,13 @@ public async Task WhenIGetTheImportLogForEstateTheDateOnTheImportLogIs(String ac
 
         DateTime expectedDate = ReqnrollTableHelper.GetDateForDateString(expectedDateString, DateTime.Now);
 
-        var getFileImportLogsResult = await this.FileProcessorClient.GetFileImportLogs(accessToken,
+        PagingRequest pagingRequest = new(1, 50, Client.SortDirection.Descending);
+        Result<FileImportLogList> getFileImportLogsResult = await this.FileProcessorClient.GetFileImportLogs(accessToken,
                                                                                          estate.EstateDetails.EstateId,
                                                                                          DateOnly.FromDateTime(expectedDate.AddDays(-1)),
                                                                                          DateOnly.FromDateTime(DateTime.Now),
                                                                                          null,
-                                                                                         1,
-                                                                                         50,
-                                                                                         false,
+                                                                                         pagingRequest,
                                                                                          CancellationToken.None);
 
         getFileImportLogsResult.IsSuccess.ShouldBeTrue();
@@ -234,9 +233,9 @@ public async Task WhenIGetTheFileForEstateTheFollowingFileInformationIsReturned(
 
         await Retry.For(async () =>
                         {
-                            var getFileResult = await this.FileProcessorClient.GetFile(accessToken, estate.EstateDetails.EstateId, fileId, CancellationToken.None);
+                            Result<FileDetails> getFileResult = await this.FileProcessorClient.GetFile(accessToken, estate.EstateDetails.EstateId, fileId, CancellationToken.None);
                             getFileResult.IsSuccess.ShouldBeTrue();
-                            var fileDetails = getFileResult.Data;
+                            FileDetails fileDetails = getFileResult.Data;
                             fileDetails.ShouldNotBeNull();
 
                             fileDetails.ProcessingCompleted.ShouldBe(fileSummary.ProcessingCompleted);
@@ -256,9 +255,9 @@ public async Task WhenIGetTheFileForEstateTheFollowingFileLinesAreReturned(Strin
         Guid fileId = estate.GetFileId(fileName);
 
         await Retry.For(async () => {
-                            var getFileResult = await this.FileProcessorClient.GetFile(accessToken, estate.EstateDetails.EstateId, fileId, CancellationToken.None);
+                            Result<FileDetails> getFileResult = await this.FileProcessorClient.GetFile(accessToken, estate.EstateDetails.EstateId, fileId, CancellationToken.None);
                             getFileResult.IsSuccess.ShouldBeTrue();
-                            var fileDetails = getFileResult.Data;
+                            FileDetails fileDetails = getFileResult.Data;
                             fileDetails.ShouldNotBeNull();
 
                             foreach (ReqnrollExtensions.FileLineDetails fileLineDetail in fileLineDetails){
@@ -285,9 +284,9 @@ public async Task WhenIGetTheFileForEstateItIsRejectedForExceedingTheDetailRowLi
 
         await Retry.For(async () =>
                         {
-                            var getFileResult = await this.FileProcessorClient.GetFile(accessToken, estate.EstateDetails.EstateId, fileId, CancellationToken.None);
+                            Result<FileDetails> getFileResult = await this.FileProcessorClient.GetFile(accessToken, estate.EstateDetails.EstateId, fileId, CancellationToken.None);
                             getFileResult.IsSuccess.ShouldBeTrue();
-                            var fileDetails = getFileResult.Data;
+                            FileDetails fileDetails = getFileResult.Data;
                             fileDetails.ShouldNotBeNull();
                             fileDetails.IsRejected.ShouldBeTrue();
                             fileDetails.RejectionCode.ShouldBe("MaximumDetailRecordsExceeded");
diff --git a/FileProcessor.IntegrationTests/Features/FileProfile.feature.cs b/FileProcessor.IntegrationTests/Features/FileProfile.feature.cs
index c1d7bc3..9463186 100644
--- a/FileProcessor.IntegrationTests/Features/FileProfile.feature.cs
+++ b/FileProcessor.IntegrationTests/Features/FileProfile.feature.cs
@@ -390,6 +390,15 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                             "Operator",
                             "1",
                             "UnsupportedFileFormatHandler"});
+                table10.AddRow(new string[] {
+                            "Invalid Profile",
+                            "55555555-5555-5555-5555-555555555555",
+                            "Invalid Profile",
+                            "/home/txnproc/bulkfiles/invalid",
+                            "Profile A",
+                            "Operator",
+                            "1",
+                            "UnsupportedFileFormatHandler"});
 #line 48
  await testRunner.WhenAsync("I try to create the following invalid file profiles", ((string)(null)), table10, "When ");
 #line hidden
diff --git a/FileProcessor.IntegrationTests/Features/FileProfileSteps.cs b/FileProcessor.IntegrationTests/Features/FileProfileSteps.cs
index 47a89ed..67762e3 100644
--- a/FileProcessor.IntegrationTests/Features/FileProfileSteps.cs
+++ b/FileProcessor.IntegrationTests/Features/FileProfileSteps.cs
@@ -109,8 +109,8 @@ public async Task WhenITryToCreateTheFollowingInvalidFileProfiles(DataTable tabl
                 CancellationToken.None);
 
             result.IsFailed.ShouldBeTrue(result.Message);
-            result.Message.ShouldContain("Unsupported request type");
-            result.Message.ShouldContain("Unsupported file format handler");
+            result.Errors.Any(error => error.Contains("Unsupported request type")).ShouldBeTrue();
+            result.Errors.Any(error => error.Contains("Unsupported file format handler")).ShouldBeTrue();
         }
     }
 
@@ -218,7 +218,6 @@ private async Task UpdateProfile(string alias, UpdateFileProfileRequest request)
         Result<FileProfile> updateResult = await this.FileProcessorSteps.UpdateFileProfile(this.TestingContext.AccessToken, fileProfileId, request, CancellationToken.None);
 
         updateResult.IsSuccess.ShouldBeTrue(updateResult.Message);
-        updateResult.Data.ShouldNotBeNull();
     }
 
     private async Task<FileProfile> GetProfileByAlias(string alias)