diff --git a/src/FakeXrmEasy.Core/FileStorage/Db/IInMemoryFileDbInternal.cs b/src/FakeXrmEasy.Core/FileStorage/Db/IInMemoryFileDbInternal.cs
index 9ab54a2b..81fb53b9 100644
--- a/src/FakeXrmEasy.Core/FileStorage/Db/IInMemoryFileDbInternal.cs
+++ b/src/FakeXrmEasy.Core/FileStorage/Db/IInMemoryFileDbInternal.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using FakeXrmEasy.Abstractions.FileStorage;
 using Microsoft.Xrm.Sdk;
 
@@ -6,7 +7,10 @@ namespace FakeXrmEasy.Core.FileStorage.Db
 {
     internal interface IInMemoryFileDbInternal
     {
+        IFileAttachment GetFileById(string fileId);
         List<IFileAttachment> GetAllFiles();
+        IQueryable<IFileAttachment> CreateQuery();
+        
         void AddFile(IFileAttachment fileAttachment);
         void DeleteFile(string fileId);
         List<IFileAttachment> GetFilesForTarget(EntityReference target);
diff --git a/src/FakeXrmEasy.Core/FileStorage/Db/InMemoryFileDb.cs b/src/FakeXrmEasy.Core/FileStorage/Db/InMemoryFileDb.cs
index 52a63042..513fb859 100644
--- a/src/FakeXrmEasy.Core/FileStorage/Db/InMemoryFileDb.cs
+++ b/src/FakeXrmEasy.Core/FileStorage/Db/InMemoryFileDb.cs
@@ -76,6 +76,12 @@ public List<FileUploadSession> GetAllFileUploadSessions()
         }
 
         #region Internal File Manipulation
+        public IFileAttachment GetFileById(string fileId)
+        {
+            _files.TryGetValue(fileId, out var file);
+            return file;
+        }
+        
         public List<IFileAttachment> GetAllFiles()
         {
             return _files.Values.ToList();
@@ -234,7 +240,7 @@ public bool IsMimeTypeAllowed(string mimeType, OrganizationFileSettings fileSett
         
         
         /// <summary>
-        /// 
+        /// Creates a query to query files by ay criteria
         /// </summary>
         /// <returns></returns>
         public IQueryable<IFileAttachment> CreateQuery()
diff --git a/tests/FakeXrmEasy.Core.Tests/FileStorage/Db/Files/InitializeFilesTests.cs b/tests/FakeXrmEasy.Core.Tests/FileStorage/Db/Files/InitializeFilesTests.cs
index 2dacec10..94c84720 100644
--- a/tests/FakeXrmEasy.Core.Tests/FileStorage/Db/Files/InitializeFilesTests.cs
+++ b/tests/FakeXrmEasy.Core.Tests/FileStorage/Db/Files/InitializeFilesTests.cs
@@ -90,6 +90,9 @@ public void Should_init_file()
 
             var allFiles = _fileDb.GetAllFiles();
             Assert.Single(allFiles);
+
+            var singleFile = _fileDb.GetFileById(_file.Id);
+            Assert.NotNull(singleFile);
         }
         
         [Fact]