Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -ra01c8d560f9fc30520fc717d83888a3bf6974cc9 -rfcaefe32db71396013a5bad171e953921d2d0c29
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision a01c8d560f9fc30520fc717d83888a3bf6974cc9)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision fcaefe32db71396013a5bad171e953921d2d0c29)
@@ -71,11 +71,6 @@
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
     <Compile Include="DbContext\RingtoetsEntities.Context.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -140,12 +135,6 @@
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Fisheye: Tag fcaefe32db71396013a5bad171e953921d2d0c29 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Properties/Resources.Designer.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag fcaefe32db71396013a5bad171e953921d2d0c29 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Properties/Resources.resx'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs
===================================================================
diff -u -ra01c8d560f9fc30520fc717d83888a3bf6974cc9 -rfcaefe32db71396013a5bad171e953921d2d0c29
--- Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs	(.../StorageSqLite.cs)	(revision a01c8d560f9fc30520fc717d83888a3bf6974cc9)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs	(.../StorageSqLite.cs)	(revision fcaefe32db71396013a5bad171e953921d2d0c29)
@@ -50,11 +50,6 @@
         /// <returns>Returns <c>true</c> if a valid connection can be made, <c>false</c> otherwise.</returns>
         public bool TestConnection()
         {
-            if (string.IsNullOrWhiteSpace(connectionString))
-            {
-                return false;
-            }
-
             using (var dbContext = new RingtoetsEntities(connectionString))
             {
                 try
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
===================================================================
diff -u -r3a8bff057967bdb42389382472f6ce55789a0ced -rfcaefe32db71396013a5bad171e953921d2d0c29
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision 3a8bff057967bdb42389382472f6ce55789a0ced)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision fcaefe32db71396013a5bad171e953921d2d0c29)
@@ -72,6 +72,9 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Converter\ProjectEntityConverterTest.cs" />
+    <Compile Include="DbContext\ProjectEntityTest.cs" />
+    <Compile Include="Exceptions\InvalidFileException.cs" />
+    <Compile Include="Exceptions\EntityNotFoundExceptionTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SqLiteStorageConnectionTest.cs" />
     <Compile Include="StorageSQLiteTest.cs" />
@@ -100,6 +103,7 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\..\..\packages\System.Data.SQLite.Core.1.0.99.0\build\net40\System.Data.SQLite.Core.targets" Condition="Exists('..\..\..\..\packages\System.Data.SQLite.Core.1.0.99.0\build\net40\System.Data.SQLite.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/DbContext/ProjectEntityTest.cs
===================================================================
diff -u
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/DbContext/ProjectEntityTest.cs	(revision 0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/DbContext/ProjectEntityTest.cs	(revision fcaefe32db71396013a5bad171e953921d2d0c29)
@@ -0,0 +1,58 @@
+using Application.Ringtoets.Storage.DbContext;
+using NUnit.Framework;
+
+namespace Application.Ringtoets.Storage.Test.DbContext
+{
+    [TestFixture]
+    public class ProjectEntityTest
+    {
+        [Test]
+        public void DefaultConstructor_Always_ExpectedValues()
+        {
+            // Call
+            var projectEntity = new ProjectEntity();
+
+            // Assert
+            Assert.AreEqual(new long(), projectEntity.ProjectEntityId);
+            Assert.IsNull(projectEntity.LastUpdated);
+        }
+
+        [Test]
+        public void GetProperties_WithData_ReturnExpectedValues()
+        {
+            // Setup
+            const long expectedId = 1024;
+            const string expectedName = "<some name>";
+            const string someDescription = "<some description>";
+            const long someTimestamp = 123456789;
+
+            var projectEntity = new ProjectEntity
+            {
+                Name = expectedName,
+                ProjectEntityId = expectedId,
+                Description = someDescription,
+                LastUpdated = someTimestamp
+            };
+
+            // Call & Assert
+            Assert.AreEqual(expectedName, projectEntity.Name);
+            Assert.AreEqual(someDescription, projectEntity.Description);
+            Assert.AreEqual(expectedId, projectEntity.ProjectEntityId);
+            Assert.AreEqual(someTimestamp, projectEntity.LastUpdated);
+        }
+
+        [Test]
+        public void GetProperties_WithNullableData_ReturnExpectedValues()
+        {
+            // Setup
+            long? someTimestamp = null;
+            var projectEntity = new ProjectEntity
+            {
+                LastUpdated = someTimestamp
+            };
+
+            // Call & Assert
+            Assert.AreEqual(someTimestamp, projectEntity.LastUpdated);
+        }
+    }
+}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Exceptions/EntityNotFoundExceptionTest.cs
===================================================================
diff -u
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Exceptions/EntityNotFoundExceptionTest.cs	(revision 0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Exceptions/EntityNotFoundExceptionTest.cs	(revision fcaefe32db71396013a5bad171e953921d2d0c29)
@@ -0,0 +1,53 @@
+using System;
+using Application.Ringtoets.Storage.Exceptions;
+using NUnit.Framework;
+
+namespace Application.Ringtoets.Storage.Test.Exceptions
+{
+    [TestFixture]
+    public class EntityNotFoundExceptionTest
+    {
+        [Test]
+        public void DefaultConstructor_InnerExceptionNullAndMessageDefault()
+        {
+            // Setup
+            var expectedMessage = String.Format("Exception of type '{0}' was thrown.", typeof(EntityNotFoundException).FullName);
+
+            // Call
+            var exception = new EntityNotFoundException();
+
+            // Assert
+            Assert.IsNull(exception.InnerException);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+
+        [Test]
+        public void Constructor_WithCustomMessage_InnerExceptionNullAndMessageSetToCustom()
+        {
+            // Setup
+            var expectedMessage ="Some exception message";
+
+            // Call
+            var exception = new EntityNotFoundException(expectedMessage);
+
+            // Assert
+            Assert.IsNull(exception.InnerException);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+
+        [Test]
+        public void Constructor_WithCustomMessageAndInnerException_InnerExceptionSetAndMessageSetToCustom()
+        {
+            // Setup
+            var expectedMessage = "Some exception message";
+            var expectedInnerException = new Exception();
+
+            // Call
+            var exception = new EntityNotFoundException(expectedMessage, expectedInnerException);
+
+            // Assert
+            Assert.AreSame(expectedInnerException, exception.InnerException);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+    }
+}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Exceptions/InvalidFileException.cs
===================================================================
diff -u
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Exceptions/InvalidFileException.cs	(revision 0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Exceptions/InvalidFileException.cs	(revision fcaefe32db71396013a5bad171e953921d2d0c29)
@@ -0,0 +1,53 @@
+using System;
+using Application.Ringtoets.Storage.Exceptions;
+using NUnit.Framework;
+
+namespace Application.Ringtoets.Storage.Test.Exceptions
+{
+    [TestFixture]
+    public class InvalidFileExceptionTest
+    {
+        [Test]
+        public void DefaultConstructor_InnerExceptionNullAndMessageDefault()
+        {
+            // Setup
+            var expectedMessage = String.Format("Exception of type '{0}' was thrown.", typeof(InvalidFileException).FullName);
+
+            // Call
+            var exception = new InvalidFileException();
+
+            // Assert
+            Assert.IsNull(exception.InnerException);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+
+        [Test]
+        public void Constructor_WithCustomMessage_InnerExceptionNullAndMessageSetToCustom()
+        {
+            // Setup
+            var expectedMessage ="Some exception message";
+
+            // Call
+            var exception = new InvalidFileException(expectedMessage);
+
+            // Assert
+            Assert.IsNull(exception.InnerException);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+
+        [Test]
+        public void Constructor_WithCustomMessageAndInnerException_InnerExceptionSetAndMessageSetToCustom()
+        {
+            // Setup
+            var expectedMessage = "Some exception message";
+            var expectedInnerException = new Exception();
+
+            // Call
+            var exception = new InvalidFileException(expectedMessage, expectedInnerException);
+
+            // Assert
+            Assert.AreSame(expectedInnerException, exception.InnerException);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+    }
+}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSQLiteTest.cs
===================================================================
diff -u -r654d3a712eedbdeea718dc0448c5544f09e053cd -rfcaefe32db71396013a5bad171e953921d2d0c29
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSQLiteTest.cs	(.../StorageSQLiteTest.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSQLiteTest.cs	(.../StorageSQLiteTest.cs)	(revision fcaefe32db71396013a5bad171e953921d2d0c29)
@@ -73,36 +73,37 @@
         }
 
         [Test]
-        [TestCase("ValidRingtoetsDatabase.rt")]
-        public void LoadProject_validDatabase_ReturnsProject(string validPath)
+        [TestCase("empty.rt")]
+        public void TestConnection_invalidConnection_ReturnsFalse(string invalidPath)
         {
             // Setup
-            var dbFile = Path.Combine(testDataPath, validPath);
+            var dbFile = Path.Combine(testDataPath, invalidPath);
 
             // Precondition
             Assert.IsTrue(File.Exists(dbFile), "Precondition: file must exist.");
 
             // Call
             var storage = new StorageSqLite(dbFile);
-            Assert.True(storage.TestConnection(), "Precondition: file must be a valid Ringtoets database.");
-
-            var loadedProject = storage.LoadProject();
-            Assert.IsInstanceOf<Project>(loadedProject);
+            Assert.False(storage.TestConnection());
         }
 
         [Test]
-        [TestCase("empty.rt")]
-        public void TestConnection_invalidConnection_ReturnsFalse(string invalidPath)
+        [TestCase("ValidRingtoetsDatabase.rt")]
+        public void LoadProject_validDatabase_ReturnsProject(string validPath)
         {
             // Setup
-            var dbFile = Path.Combine(testDataPath, invalidPath);
+            var dbFile = Path.Combine(testDataPath, validPath);
 
             // Precondition
             Assert.IsTrue(File.Exists(dbFile), "Precondition: file must exist.");
 
             // Call
             var storage = new StorageSqLite(dbFile);
-            Assert.False(storage.TestConnection());
+            Assert.True(storage.TestConnection(), "Precondition: file must be a valid Ringtoets database.");
+
+            var loadedProject = storage.LoadProject();
+            Assert.IsInstanceOf<Project>(loadedProject);
         }
+    
     }
 }
\ No newline at end of file