diff --git a/EternalArrowBackup.sln b/EternalArrowBackup.sln
index 3013c6d..af6262d 100644
--- a/EternalArrowBackup.sln
+++ b/EternalArrowBackup.sln
@@ -59,7 +59,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TargetBinaryStorage", "Targ
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EternalArrowBackup.TargetBinaryStorage.InMemoryBinaryStorage.Tests", "Tests\TargetBinaryStorage\InMemoryBinaryStorage\EternalArrowBackup.TargetBinaryStorage.InMemoryBinaryStorage.Tests.csproj", "{3D95405C-C305-4D73-9B2C-938156FD9B2E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EternalArrowBackup.TargetMetadataStorage.InMemoryMetadataStorage", "Source\TargetMetadataStorage\InMemoryMetadataStorage\EternalArrowBackup.TargetMetadataStorage.InMemoryMetadataStorage.csproj", "{AC7EA3E8-6469-4102-940F-31EF831E823F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EternalArrowBackup.TargetMetadataStorage.InMemoryMetadataStorage", "Source\TargetMetadataStorage\InMemoryMetadataStorage\EternalArrowBackup.TargetMetadataStorage.InMemoryMetadataStorage.csproj", "{AC7EA3E8-6469-4102-940F-31EF831E823F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TargetMetadataStorage", "TargetMetadataStorage", "{F22F46A0-75BD-49CB-96F2-4E230B59601A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EternalArrowBackup.TargetBinaryStorage.InMemoryBinaryStorage.Tests", "Tests\TargetMetadataStorage\InMemoryMetadataStorage\EternalArrowBackup.TargetBinaryStorage.InMemoryBinaryStorage.Tests.csproj", "{A2661315-0A4E-47AA-B0D8-200E98461004}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -131,6 +135,10 @@ Global
 		{AC7EA3E8-6469-4102-940F-31EF831E823F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AC7EA3E8-6469-4102-940F-31EF831E823F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AC7EA3E8-6469-4102-940F-31EF831E823F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A2661315-0A4E-47AA-B0D8-200E98461004}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A2661315-0A4E-47AA-B0D8-200E98461004}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A2661315-0A4E-47AA-B0D8-200E98461004}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A2661315-0A4E-47AA-B0D8-200E98461004}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -163,5 +171,7 @@ Global
 		{61CADBF4-3D45-4980-81E5-5268199E615A} = {884B8E01-303A-40CF-8884-D62115F98683}
 		{3D95405C-C305-4D73-9B2C-938156FD9B2E} = {61CADBF4-3D45-4980-81E5-5268199E615A}
 		{AC7EA3E8-6469-4102-940F-31EF831E823F} = {99C42B64-99CF-4FB3-B270-079476B43FF7}
+		{F22F46A0-75BD-49CB-96F2-4E230B59601A} = {884B8E01-303A-40CF-8884-D62115F98683}
+		{A2661315-0A4E-47AA-B0D8-200E98461004} = {F22F46A0-75BD-49CB-96F2-4E230B59601A}
 	EndGlobalSection
 EndGlobal
diff --git a/Tests/TargetMetadataStorage/InMemoryMetadataStorage/EternalArrowBackup.TargetBinaryStorage.InMemoryBinaryStorage.Tests.csproj b/Tests/TargetMetadataStorage/InMemoryMetadataStorage/EternalArrowBackup.TargetBinaryStorage.InMemoryBinaryStorage.Tests.csproj
new file mode 100644
index 0000000..21df20b
--- /dev/null
+++ b/Tests/TargetMetadataStorage/InMemoryMetadataStorage/EternalArrowBackup.TargetBinaryStorage.InMemoryBinaryStorage.Tests.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="xunit" Version="2.2.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Source\TargetMetadataStorage\Contracts\EternalArrowBackup.TargetMetadataStorage.Contracts.csproj" />
+    <ProjectReference Include="..\..\..\Source\TargetMetadataStorage\InMemoryMetadataStorage\EternalArrowBackup.TargetMetadataStorage.InMemoryMetadataStorage.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/Tests/TargetMetadataStorage/InMemoryMetadataStorage/StorageTests.cs b/Tests/TargetMetadataStorage/InMemoryMetadataStorage/StorageTests.cs
new file mode 100644
index 0000000..6981e6b
--- /dev/null
+++ b/Tests/TargetMetadataStorage/InMemoryMetadataStorage/StorageTests.cs
@@ -0,0 +1,21 @@
+namespace EternalArrowBackup.TargetBinaryStorage.InMemoryBinaryStorage.Tests
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Collections.Immutable;
+    using System.Linq;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using System.Threading.Tasks.Dataflow;
+    using Xunit;
+
+    public static class StorageTests
+    {
+        [Fact]
+        [Trait("Category", "Simple")]
+        public static void CheckStorage()
+        {
+            Assert.True(true);
+        }
+    }
+}