Index: Application/Ringtoets/src/Application.Ringtoets.Storage/App.config
===================================================================
diff -u -rc4ec466640c331e3dbf5c4fc31c8f048ab3d8651 -r0155f2f233aefc7951782b302e1398e02c00f298
--- Application/Ringtoets/src/Application.Ringtoets.Storage/App.config	(.../App.config)	(revision c4ec466640c331e3dbf5c4fc31c8f048ab3d8651)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/App.config	(.../App.config)	(revision 0155f2f233aefc7951782b302e1398e02c00f298)
@@ -19,6 +19,6 @@
     </DbProviderFactories>
   </system.data>
   <connectionStrings>
-    <add name="RingtoetsEntities" connectionString="metadata=res://*/RingtoetsDBContext.csdl|res://*/RingtoetsDBContext.ssdl|res://*/RingtoetsDBContext.msl;provider=System.Data.SQLite.EF6;provider connection string=&quot;data source=Application\Ringtoets\src\Application.Ringtoets.Storage\Ringtoets.sqlite&quot;" providerName="System.Data.EntityClient" />
+    <add name="RingtoetsEntities" connectionString="metadata=res://*/RingtoetsDBContext.csdl|res://*/RingtoetsDBContext.ssdl|res://*/RingtoetsDBContext.msl;provider=System.Data.SQLite.EF6;provider connection string=&quot;data source=Application\Ringtoets\src\Application.Ringtoets.Storage\Ringtoets.rt&quot;" providerName="System.Data.EntityClient" />
   </connectionStrings>
 </configuration>
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -rc4ec466640c331e3dbf5c4fc31c8f048ab3d8651 -r0155f2f233aefc7951782b302e1398e02c00f298
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision c4ec466640c331e3dbf5c4fc31c8f048ab3d8651)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision 0155f2f233aefc7951782b302e1398e02c00f298)
@@ -41,7 +41,6 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.SQLite, Version=1.0.99.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\System.Data.SQLite.Core.1.0.99.0\lib\net40\System.Data.SQLite.dll</HintPath>
@@ -64,7 +63,7 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="IRingtoetsDBContext.cs" />
-    <Compile Include="IStoreProject.cs" />
+    <Compile Include="Converter\ProjectEntityConverter.cs" />
     <Compile Include="ProjectEntity.cs">
       <DependentUpon>RingtoetsDBContext.tt</DependentUpon>
     </Compile>
@@ -105,7 +104,7 @@
       <Generator>EntityModelCodeGenerator</Generator>
       <LastGenOutput>RingtoetsDBContext.Designer.cs</LastGenOutput>
     </EntityDeploy>
-    <None Include="Ringtoets.sqlite">
+    <None Include="Ringtoets.rt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="RingtoetsDBContext.Context.tt">
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Converter/ProjectEntityConverter.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Converter/ProjectEntityConverter.cs	(revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Converter/ProjectEntityConverter.cs	(revision 0155f2f233aefc7951782b302e1398e02c00f298)
@@ -0,0 +1,66 @@
+using System;
+using System.Data.Entity;
+using System.Linq;
+using Core.Common.Base.Data;
+
+namespace Application.Ringtoets.Storage.Converter
+{
+    /// <summary>
+    /// Converter for ProjectEntity.
+    /// </summary>
+    public static class ProjectEntityConverter
+    {
+        /// <summary>
+        /// Gets a new <see cref="Project"/>, based on the <see cref="ProjectEntity"/> found in the database.
+        /// </summary>
+        /// <param name="dbSet">Database set of <see cref="ProjectEntity"/>.</param>
+        /// <param name="projectId">Unique identifier to find the <see cref="ProjectEntity"/>.</param>
+        /// <returns>A new <see cref="Project"/> or null when not found.</returns>
+        public static Project GetProject(IDbSet<ProjectEntity> dbSet, long projectId)
+        {
+            var entry = dbSet.SingleOrDefault(db => db.ProjectEntityId == projectId);
+            return entry == null ? null : ProjectEntityToProject(entry);
+        }
+
+        /// <summary>
+        /// Updates the <see cref="ProjectEntity"/>, based upon the <paramref name="project"/>, in the database.
+        /// </summary>
+        /// <param name="dbSet">Database set of <see cref="ProjectEntity"/>.</param>
+        /// <param name="project"><see cref="Project"/> to be saved in the database.</param>
+        public static void UpdateProjectEntity(IDbSet<ProjectEntity> dbSet, Project project)
+        {
+            var entry = dbSet.SingleOrDefault(db => db.ProjectEntityId == project.StorageId);
+            ProjectToProjectEntity(project, entry);
+        }
+
+        /// <summary>
+        /// Converts <paramref name="projectEntity"/> to a new instance of <see cref="Project"/>.
+        /// </summary>
+        /// <param name="projectEntity"><see cref="ProjectEntity"/> to convert.</param>
+        /// <returns>A new instance of <see cref="Project"/>, based on the properties of <paramref name="projectEntity"/>.</returns>
+        public static Project ProjectEntityToProject( ProjectEntity projectEntity )
+        {
+            var project = new Project
+            {
+                StorageId = projectEntity.ProjectEntityId,
+                Name = projectEntity.Name,
+                Description = projectEntity.Description
+            };
+
+            return project;
+        }
+
+        /// <summary>
+        /// Converts <paramref name="project"/> to <paramref name="projectEntity"/>.
+        /// </summary>
+        /// <param name="project">The <see cref="Project"/> to convert.</param>
+        /// <param name="projectEntity">A reference to the <see cref="ProjectEntity"/> to be saved.</param>
+        public static void ProjectToProjectEntity(Project project, ProjectEntity projectEntity)
+        {
+            projectEntity.Name = project.Name;
+            projectEntity.Description = project.Description;
+            projectEntity.LastUpdated = new DateTime().Ticks;
+        }
+
+    }
+}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/IRingtoetsDBContext.cs
===================================================================
diff -u -rc4ec466640c331e3dbf5c4fc31c8f048ab3d8651 -r0155f2f233aefc7951782b302e1398e02c00f298
--- Application/Ringtoets/src/Application.Ringtoets.Storage/IRingtoetsDBContext.cs	(.../IRingtoetsDBContext.cs)	(revision c4ec466640c331e3dbf5c4fc31c8f048ab3d8651)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/IRingtoetsDBContext.cs	(.../IRingtoetsDBContext.cs)	(revision 0155f2f233aefc7951782b302e1398e02c00f298)
@@ -1,9 +1,22 @@
 using System.Data.Entity;
+using System.Data.Entity.Core.Objects;
 
 namespace Application.Ringtoets.Storage
 {
+    /// <summary>
+    /// Interface that describes the properties and methods that must be implemented on classes that use a database context.
+    /// </summary>
     public interface IRingtoetsDbContext
     {
-        DbSet<ProjectEntity> ProjectEntities { get; set; }
+        /// <summary>
+        /// <see cref="IDbSet{TEntity}"/> of <see cref="ProjectEntity"/>
+        /// </summary>
+        IDbSet<ProjectEntity> ProjectEntities { get; set; }
+
+        /// <summary> 
+        /// <see cref="ObjectContext.SaveChanges()"/>
+        /// </summary>
+        /// <returns>The number of objects in an Added, Modified, or Deleted state when SaveChanges was called.</returns>
+        int SaveChanges();
     }
-}
+}
\ No newline at end of file
Fisheye: Tag 0155f2f233aefc7951782b302e1398e02c00f298 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/IStoreProject.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/ProjectEntity.cs
===================================================================
diff -u -rc4ec466640c331e3dbf5c4fc31c8f048ab3d8651 -r0155f2f233aefc7951782b302e1398e02c00f298
--- Application/Ringtoets/src/Application.Ringtoets.Storage/ProjectEntity.cs	(.../ProjectEntity.cs)	(revision c4ec466640c331e3dbf5c4fc31c8f048ab3d8651)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/ProjectEntity.cs	(.../ProjectEntity.cs)	(revision 0155f2f233aefc7951782b302e1398e02c00f298)
@@ -17,6 +17,6 @@
         public long ProjectEntityId { get; set; }
         public string Name { get; set; }
         public string Description { get; set; }
-        public Nullable<decimal> LastUpdated { get; set; }
+        public long LastUpdated { get; set; }
     }
 }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rt
===================================================================
diff -u
Binary files differ
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.sqlite
===================================================================
diff -u -rc4ec466640c331e3dbf5c4fc31c8f048ab3d8651 -r0155f2f233aefc7951782b302e1398e02c00f298
Binary files differ
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/RingtoetsDBContext.Context.cs
===================================================================
diff -u -rc4ec466640c331e3dbf5c4fc31c8f048ab3d8651 -r0155f2f233aefc7951782b302e1398e02c00f298
--- Application/Ringtoets/src/Application.Ringtoets.Storage/RingtoetsDBContext.Context.cs	(.../RingtoetsDBContext.Context.cs)	(revision c4ec466640c331e3dbf5c4fc31c8f048ab3d8651)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/RingtoetsDBContext.Context.cs	(.../RingtoetsDBContext.Context.cs)	(revision 0155f2f233aefc7951782b302e1398e02c00f298)
@@ -26,6 +26,6 @@
             throw new UnintentionalCodeFirstException();
         }
     
-        public virtual DbSet<ProjectEntity> ProjectEntities { get; set; }
+        public virtual IDbSet<ProjectEntity> ProjectEntities { get; set; }
     }
 }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/RingtoetsDBContext.Context.tt
===================================================================
diff -u -rc4ec466640c331e3dbf5c4fc31c8f048ab3d8651 -r0155f2f233aefc7951782b302e1398e02c00f298
--- Application/Ringtoets/src/Application.Ringtoets.Storage/RingtoetsDBContext.Context.tt	(.../RingtoetsDBContext.Context.tt)	(revision c4ec466640c331e3dbf5c4fc31c8f048ab3d8651)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/RingtoetsDBContext.Context.tt	(.../RingtoetsDBContext.Context.tt)	(revision 0155f2f233aefc7951782b302e1398e02c00f298)
@@ -308,7 +308,7 @@
     {
         return string.Format(
             CultureInfo.InvariantCulture,
-            "{0} virtual DbSet<{1}> {2} {{ get; set; }}",
+            "{0} virtual IDbSet<{1}> {2} {{ get; set; }}",
             Accessibility.ForReadOnlyProperty(entitySet),
             _typeMapper.GetTypeName(entitySet.ElementType),
             _code.Escape(entitySet));
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/RingtoetsDBContext.edmx
===================================================================
diff -u -rc4ec466640c331e3dbf5c4fc31c8f048ab3d8651 -r0155f2f233aefc7951782b302e1398e02c00f298
--- Application/Ringtoets/src/Application.Ringtoets.Storage/RingtoetsDBContext.edmx	(.../RingtoetsDBContext.edmx)	(revision c4ec466640c331e3dbf5c4fc31c8f048ab3d8651)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/RingtoetsDBContext.edmx	(.../RingtoetsDBContext.edmx)	(revision 0155f2f233aefc7951782b302e1398e02c00f298)
@@ -4,15 +4,15 @@
   <edmx:Runtime>
     <!-- SSDL content -->
     <edmx:StorageModels>
-    <Schema Namespace="RingtoetsEntityModel.Store" Provider="System.Data.SQLite.EF6" ProviderManifestToken="data source=build\Ringtoets.sqlite" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
+    <Schema Namespace="RingtoetsEntityModel.Store" Provider="System.Data.SQLite.EF6" ProviderManifestToken="data source=Application\Ringtoets\src\Application.Ringtoets.Storage\Ringtoets.rt" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
         <EntityType Name="ProjectEntity">
           <Key>
             <PropertyRef Name="ProjectEntityId" />
           </Key>
           <Property Name="ProjectEntityId" Type="integer" StoreGeneratedPattern="Identity" Nullable="false" />
           <Property Name="Name" Type="varchar" MaxLength="1024" />
           <Property Name="Description" Type="varchar" MaxLength="1024" />
-          <Property Name="LastUpdated" Type="decimal" Precision="53" Scale="0" />
+          <Property Name="LastUpdated" Type="integer" Nullable="false" />
         </EntityType>
         <EntityContainer Name="RingtoetsEntityModelStoreContainer">
           <EntitySet Name="ProjectEntity" EntityType="Self.ProjectEntity" store:Type="Tables" />
@@ -23,15 +23,15 @@
       <Schema Namespace="RingtoetsEntityModel" Alias="Self" annotation:UseStrongSpatialTypes="false" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm">
         <EntityContainer Name="RingtoetsEntities" annotation:LazyLoadingEnabled="false">
           <EntitySet Name="ProjectEntities" EntityType="RingtoetsEntityModel.ProjectEntity" />
-          </EntityContainer>
+        </EntityContainer>
         <EntityType Name="ProjectEntity">
           <Key>
             <PropertyRef Name="ProjectEntityId" />
           </Key>
           <Property Name="ProjectEntityId" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
           <Property Name="Name" Type="String" MaxLength="1024" FixedLength="false" Unicode="false" />
           <Property Name="Description" Type="String" MaxLength="1024" FixedLength="false" Unicode="false" />
-          <Property Name="LastUpdated" Type="Decimal" Precision="53" Scale="0" />
+          <Property Name="LastUpdated" Type="Int64" Nullable="false" />
         </EntityType>
         </Schema>
     </edmx:ConceptualModels>
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/RingtoetsDBContext.edmx.diagram
===================================================================
diff -u -rc4ec466640c331e3dbf5c4fc31c8f048ab3d8651 -r0155f2f233aefc7951782b302e1398e02c00f298
--- Application/Ringtoets/src/Application.Ringtoets.Storage/RingtoetsDBContext.edmx.diagram	(.../RingtoetsDBContext.edmx.diagram)	(revision c4ec466640c331e3dbf5c4fc31c8f048ab3d8651)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/RingtoetsDBContext.edmx.diagram	(.../RingtoetsDBContext.edmx.diagram)	(revision 0155f2f233aefc7951782b302e1398e02c00f298)
@@ -5,7 +5,7 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="26a0f7861edd4ba59e8393e1f2494b81" Name="Diagram1" ZoomLevel="82">
-        <EntityTypeShape EntityType="RingtoetsEntityModel.ProjectEntity" Width="2.25" PointX="0.75" PointY="1.375" />
+        <EntityTypeShape EntityType="RingtoetsEntityModel.ProjectEntity" Width="2.125" PointX="0.75" PointY="0.75" />
       </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs
===================================================================
diff -u -r7980edee4d818aa3759b179c8af269f4f1f23597 -r0155f2f233aefc7951782b302e1398e02c00f298
--- Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs	(.../StorageSqLite.cs)	(revision 7980edee4d818aa3759b179c8af269f4f1f23597)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs	(.../StorageSqLite.cs)	(revision 0155f2f233aefc7951782b302e1398e02c00f298)
@@ -1,25 +1,21 @@
-using System;
-using System.Linq;
+using Application.Ringtoets.Storage.Converter;
 using Core.Common.Base.Data;
 
 namespace Application.Ringtoets.Storage
 {
-    public class StorageSqLite : IStoreProject
+    public class StorageSqLite
     {
+        /// <summary>
+        /// Saves the <paramref name="project"/> at the default location.
+        /// </summary>
+        /// <param name="project"><see cref="Project"/> to save.</param>
+        /// <returns>Returns the number of changes, see <see cref="IRingtoetsDbContext.SaveChanges()"/>.</returns>
         public int SaveProject(Project project)
         {
             using (var dbContext = new RingtoetsEntities())
             {
-                var entry = dbContext.ProjectEntities.SingleOrDefault(db => db.ProjectEntityId == project.StorageId);
-                if (entry == null)
-                {
-                    return 0;
-                }
+                ProjectEntityConverter.UpdateProjectEntity(dbContext.ProjectEntities, project);
 
-                entry.Name = project.Name;
-                entry.Description = project.Description;
-                entry.LastUpdated = new DateTime().Ticks;
-
                 return dbContext.SaveChanges();
             }
         }
@@ -33,22 +29,8 @@
         {
             using (var dbContext = new RingtoetsEntities())
             {
-                var entry = dbContext.ProjectEntities.SingleOrDefault(db => db.ProjectEntityId == projectId);
-                if (entry == null)
-                {
-                    return null;
-                }
-
-                var project = new Project
-                {
-                    StorageId = entry.ProjectEntityId,
-                    Name = entry.Name,
-                    Description = entry.Description
-                };
-
-                return project;
+                return ProjectEntityConverter.GetProject(dbContext.ProjectEntities, projectId);
             }
         }
-    
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets/app.config
===================================================================
diff -u -rc4ec466640c331e3dbf5c4fc31c8f048ab3d8651 -r0155f2f233aefc7951782b302e1398e02c00f298
--- Application/Ringtoets/src/Application.Ringtoets/app.config	(.../app.config)	(revision c4ec466640c331e3dbf5c4fc31c8f048ab3d8651)
+++ Application/Ringtoets/src/Application.Ringtoets/app.config	(.../app.config)	(revision 0155f2f233aefc7951782b302e1398e02c00f298)
@@ -120,6 +120,6 @@
     </DbProviderFactories>
   </system.data>
   <connectionStrings>
-    <add name="RingtoetsEntities" connectionString="metadata=res://*/RingtoetsDBContext.csdl|res://*/RingtoetsDBContext.ssdl|res://*/RingtoetsDBContext.msl;provider=System.Data.SQLite.EF6;provider connection string=&quot;data source=Ringtoets.sqlite&quot;" providerName="System.Data.EntityClient" />
+    <add name="RingtoetsEntities" connectionString="metadata=res://*/RingtoetsDBContext.csdl|res://*/RingtoetsDBContext.ssdl|res://*/RingtoetsDBContext.msl;provider=System.Data.SQLite.EF6;provider connection string=&quot;data source=Ringtoets.rt&quot;" providerName="System.Data.EntityClient" />
   </connectionStrings>
 </configuration>
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/App.config
===================================================================
diff -u -rc4ec466640c331e3dbf5c4fc31c8f048ab3d8651 -r0155f2f233aefc7951782b302e1398e02c00f298
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/App.config	(.../App.config)	(revision c4ec466640c331e3dbf5c4fc31c8f048ab3d8651)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/App.config	(.../App.config)	(revision 0155f2f233aefc7951782b302e1398e02c00f298)
@@ -2,16 +2,23 @@
 <configuration>
   <configSections>
     <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
+      requirePermission="false"/>
   </configSections>
   <entityFramework>
-    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
-      <parameters>
-        <parameter value="mssqllocaldb" />
-      </parameters>
-    </defaultConnectionFactory>
+    <defaultConnectionFactory type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6"></defaultConnectionFactory>
     <providers>
-      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+      <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6"/>
     </providers>
   </entityFramework>
+  <system.data>
+    <DbProviderFactories>
+      <remove invariant="System.Data.SQLite.EF6"/>
+      <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6"
+        description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6"/>
+    </DbProviderFactories>
+  </system.data>
+  <connectionStrings>
+    <add name="RingtoetsEntities" connectionString="metadata=res://*/RingtoetsDBContext.csdl|res://*/RingtoetsDBContext.ssdl|res://*/RingtoetsDBContext.msl;provider=System.Data.SQLite.EF6;provider connection string=&quot;data source=Ringtoets.rt&quot;" providerName="System.Data.EntityClient" />
+  </connectionStrings>
 </configuration>
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
===================================================================
diff -u -rc4ec466640c331e3dbf5c4fc31c8f048ab3d8651 -r0155f2f233aefc7951782b302e1398e02c00f298
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision c4ec466640c331e3dbf5c4fc31c8f048ab3d8651)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision 0155f2f233aefc7951782b302e1398e02c00f298)
@@ -19,7 +19,7 @@
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-	<PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
@@ -35,7 +35,7 @@
     <Optimize>true</Optimize>
     <PlatformTarget>x86</PlatformTarget>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-	<PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <DebugType>pdbonly</DebugType>
   </PropertyGroup>
   <ItemGroup>
@@ -65,6 +65,10 @@
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Data.SQLite.EF6, Version=1.0.99.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\System.Data.SQLite.EF6.1.0.99.0\lib\net40\System.Data.SQLite.EF6.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -75,13 +79,19 @@
       <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Application.Ringtoets.Storage\Application.Ringtoets.Storage.csproj">
       <Project>{50963f12-448c-41ba-a62c-cdb0ab8d21e0}</Project>
       <Name>Application.Ringtoets.Storage</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSQLiteTest.cs
===================================================================
diff -u -rc4ec466640c331e3dbf5c4fc31c8f048ab3d8651 -r0155f2f233aefc7951782b302e1398e02c00f298
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSQLiteTest.cs	(.../StorageSQLiteTest.cs)	(revision c4ec466640c331e3dbf5c4fc31c8f048ab3d8651)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSQLiteTest.cs	(.../StorageSQLiteTest.cs)	(revision 0155f2f233aefc7951782b302e1398e02c00f298)
@@ -1,8 +1,86 @@
-using NUnit.Framework;
+using System.Collections.Generic;
+using System.Data.Entity;
+using System.Linq;
+using Application.Ringtoets.Storage.Converter;
+using Core.Common.Base.Data;
+using NUnit.Framework;
+using Rhino.Mocks;
 
 namespace Application.Ringtoets.Storage.Test
 {
+    [TestFixture]
     public class StorageSqLiteTest
     {
+
+        [Test]
+        public void ProjectEntityMapping_ProjectEntity_Project()
+        {
+            // Setup
+            const long projectId = 1;
+            var projectEntity = new ProjectEntity()
+            {
+                ProjectEntityId = projectId,
+                Name = "test",
+                Description = "description"
+            };
+
+            var projectEntities = GetDbSetTest(new List<ProjectEntity> { projectEntity });
+
+            // Call
+            var project = ProjectEntityConverter.GetProject(projectEntities, projectId);
+
+            // Assert
+            Assert.IsInstanceOf<Project>(project);
+            Assert.AreEqual(project.StorageId, projectId);
+            Assert.That(project.Name == projectEntity.Name);
+            Assert.That(project.Description == projectEntity.Description);
+            Assert.IsEmpty(project.Items);
+        }
+
+        [Test]
+        public void ProjectEntityMapping_Project_ProjectEntity()
+        {
+            // Setup
+            const long projectId = 1;
+            var project = new Project
+            {
+                StorageId = projectId,
+                Name = "test",
+                Description = "description"
+            };
+            var projectEnties = new List<ProjectEntity>
+            {
+                new ProjectEntity()
+                {
+                    ProjectEntityId = projectId
+                }
+            };
+            var projectEntities = GetDbSetTest(projectEnties);
+
+            // Call
+            ProjectEntityConverter.UpdateProjectEntity(projectEntities, project);
+
+            // Assert
+            Assert.IsInstanceOf<Project>(project);
+            var projectEntitiesArray = projectEntities.ToList();
+            Assert.AreEqual(projectEntitiesArray.Count, 1);
+            Assert.AreEqual(project.StorageId, projectEntitiesArray[0].ProjectEntityId);
+            Assert.AreEqual(project.Name, projectEntitiesArray[0].Name);
+            Assert.AreEqual(project.Description, projectEntitiesArray[0].Description);
+        }
+
+        private static IDbSet<T> GetDbSetTest<T>(IList<T> data) where T : class
+        {
+            IQueryable<T> queryable = data.AsQueryable();
+
+            IDbSet<T> dbSet = MockRepository.GenerateMock<IDbSet<T>, IQueryable>();
+
+            dbSet.Stub(m => m.Provider).Return(queryable.Provider);
+            dbSet.Stub(m => m.Expression).Return(queryable.Expression);
+            dbSet.Stub(m => m.ElementType).Return(queryable.ElementType);
+            dbSet.Stub(m => m.GetEnumerator()).Return(queryable.GetEnumerator());
+
+            return dbSet;
+        }
     }
-}
+}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/packages.config
===================================================================
diff -u -rc4ec466640c331e3dbf5c4fc31c8f048ab3d8651 -r0155f2f233aefc7951782b302e1398e02c00f298
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/packages.config	(.../packages.config)	(revision c4ec466640c331e3dbf5c4fc31c8f048ab3d8651)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/packages.config	(.../packages.config)	(revision 0155f2f233aefc7951782b302e1398e02c00f298)
@@ -4,4 +4,5 @@
   <package id="NUnit" version="2.6.4" targetFramework="net40" />
   <package id="RhinoMocks" version="3.6.1" targetFramework="net40" />
   <package id="System.Data.SQLite.Core" version="1.0.99.0" targetFramework="net40" />
+  <package id="System.Data.SQLite.EF6" version="1.0.99.0" targetFramework="net40" />
 </packages>
\ No newline at end of file
Index: Core/Common/src/Core.Common.Base/IStorable.cs
===================================================================
diff -u -r7980edee4d818aa3759b179c8af269f4f1f23597 -r0155f2f233aefc7951782b302e1398e02c00f298
--- Core/Common/src/Core.Common.Base/IStorable.cs	(.../IStorable.cs)	(revision 7980edee4d818aa3759b179c8af269f4f1f23597)
+++ Core/Common/src/Core.Common.Base/IStorable.cs	(.../IStorable.cs)	(revision 0155f2f233aefc7951782b302e1398e02c00f298)
@@ -1,7 +1,13 @@
 namespace Core.Common.Base
 {
-    interface IStorable
+    /// <summary>
+    /// Interface that describes the methods that need to be implemented on classes that are stored in the storage.
+    /// </summary>
+    public interface IStorable
     {
-        long StorageId { get; set; }
+        /// <summary>
+        /// Gets or sets the unique identifier for the storage of the class.
+        /// </summary>
+        long StorageId { get; }
     }
 }