Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/StorageSqLiteTest.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r5f6f2816c73defb67faa54eae99c4fe6bc9943de
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/StorageSqLiteTest.cs	(.../StorageSqLiteTest.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/StorageSqLiteTest.cs	(.../StorageSqLiteTest.cs)	(revision 5f6f2816c73defb67faa54eae99c4fe6bc9943de)
@@ -28,7 +28,6 @@
 using Core.Common.TestUtil;
 using Core.Common.Util.Extensions;
 using NUnit.Framework;
-using Rhino.Mocks;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Util;
 using Riskeer.Integration.Data;
@@ -119,7 +118,7 @@
             void Call() => new StorageSqLite().LoadProject(tempProjectFilePath);
 
             // Assert
-            string expectedMessage = $@"Fout bij het lezen van bestand '{tempProjectFilePath}': het bestand is geen geldig Riskeer bestand.";
+            var expectedMessage = $@"Fout bij het lezen van bestand '{tempProjectFilePath}': het bestand is geen geldig Riskeer bestand.";
 
             var exception = Assert.Throws<StorageException>(Call);
             Assert.IsInstanceOf<Exception>(exception);
@@ -262,9 +261,9 @@
             // Setup
             string tempProjectFilePath = Path.Combine(workingDirectory, nameof(LoadProject_ReadProjectThrowsEntityReadException_ThrowsStorageException));
             var storage = new StorageSqLite();
-            var mockRepository = new MockRepository();
-            var project = mockRepository.StrictMock<RiskeerProject>(CreateAssessmentSection());
 
+            RiskeerProject project = CreateProject();
+
             // Precondition
             void Precondition()
             {
@@ -293,8 +292,8 @@
             string tempProjectFilePath = Path.Combine(workingDirectory, nameof(LoadProject_ValidDatabase_ReturnsProject));
             string projectName = Path.GetFileNameWithoutExtension(tempProjectFilePath);
             var storage = new StorageSqLite();
-            var mockRepository = new MockRepository();
-            var project = mockRepository.StrictMock<RiskeerProject>(CreateAssessmentSection());
+
+            RiskeerProject project = CreateProject();
             project.Description = "<some description>";
 
             // Precondition
@@ -546,12 +545,11 @@
         public void HasStagedProjectChanges_SavedToEmptyDatabaseFile_ReturnsFalse()
         {
             // Setup
-            var mockRepository = new MockRepository();
-            var project = mockRepository.StrictMock<RiskeerProject>(CreateAssessmentSection());
-            mockRepository.ReplayAll();
             var storage = new StorageSqLite();
             string tempProjectFilePath = Path.Combine(workingDirectory, nameof(HasStagedProjectChanges_SavedToEmptyDatabaseFile_ReturnsFalse));
 
+            RiskeerProject project = CreateProject();
+
             // Precondition, required to set the connection string
             storage.StageProject(project);
             void Precondition() => storage.SaveProjectAs(tempProjectFilePath);
@@ -564,8 +562,6 @@
 
             // Assert
             Assert.IsFalse(hasChanges);
-
-            mockRepository.VerifyAll();
         }
 
         private static RiskeerProject CreateProject()