Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/CalculationGroupCreateExtensions.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/CalculationGroupCreateExtensions.cs	(.../CalculationGroupCreateExtensions.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/CalculationGroupCreateExtensions.cs	(.../CalculationGroupCreateExtensions.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -31,14 +31,14 @@
 using Riskeer.Piping.Data;
 using Riskeer.StabilityPointStructures.Data;
 using Riskeer.StabilityStoneCover.Data;
-using Riskeer.WaveImpactAsphaltCover.Data;
 using Riskeer.Storage.Core.Create.GrassCoverErosionInwards;
 using Riskeer.Storage.Core.Create.GrassCoverErosionOutwards;
 using Riskeer.Storage.Core.Create.MacroStabilityInwards;
 using Riskeer.Storage.Core.Create.Piping;
 using Riskeer.Storage.Core.Create.StabilityStoneCover;
 using Riskeer.Storage.Core.Create.WaveImpactAsphaltCover;
 using Riskeer.Storage.Core.DbContext;
+using Riskeer.WaveImpactAsphaltCover.Data;
 
 namespace Riskeer.Storage.Core.Create
 {
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs	(.../WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs	(.../WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -23,8 +23,8 @@
 using System.Collections.Generic;
 using Core.Common.Util.Extensions;
 using Riskeer.Common.Data.DikeProfiles;
-using Riskeer.WaveImpactAsphaltCover.Data;
 using Riskeer.Storage.Core.DbContext;
+using Riskeer.WaveImpactAsphaltCover.Data;
 
 namespace Riskeer.Storage.Core.Create.WaveImpactAsphaltCover
 {
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs	(.../WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs	(.../WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -20,8 +20,8 @@
 // All rights reserved.
 
 using System;
-using Riskeer.WaveImpactAsphaltCover.Data;
 using Riskeer.Storage.Core.DbContext;
+using Riskeer.WaveImpactAsphaltCover.Data;
 
 namespace Riskeer.Storage.Core.Create.WaveImpactAsphaltCover
 {
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -23,8 +23,8 @@
 using Core.Common.Util.Extensions;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Revetment.Data;
-using Riskeer.WaveImpactAsphaltCover.Data;
 using Riskeer.Storage.Core.DbContext;
+using Riskeer.WaveImpactAsphaltCover.Data;
 
 namespace Riskeer.Storage.Core.Create.WaveImpactAsphaltCover
 {
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/DuneErosion/DuneErosionSectionResultEntityReadExtensions.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/DuneErosion/DuneErosionSectionResultEntityReadExtensions.cs	(.../DuneErosionSectionResultEntityReadExtensions.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/DuneErosion/DuneErosionSectionResultEntityReadExtensions.cs	(.../DuneErosionSectionResultEntityReadExtensions.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -20,9 +20,9 @@
 // All rights reserved.
 
 using System;
+using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Primitives;
 using Riskeer.DuneErosion.Data;
-using Riskeer.AssemblyTool.Data;
 using Riskeer.Storage.Core.DbContext;
 
 namespace Riskeer.Storage.Core.Read.DuneErosion
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -31,13 +31,12 @@
 using Riskeer.GrassCoverErosionInwards.Data;
 using Riskeer.GrassCoverErosionOutwards.Data;
 using Riskeer.HeightStructures.Data;
+using Riskeer.Integration.Data.StandAlone;
+using Riskeer.Integration.Data.StandAlone.SectionResults;
 using Riskeer.MacroStabilityInwards.Data;
 using Riskeer.Piping.Data;
 using Riskeer.StabilityPointStructures.Data;
 using Riskeer.StabilityStoneCover.Data;
-using Riskeer.WaveImpactAsphaltCover.Data;
-using Riskeer.Integration.Data.StandAlone;
-using Riskeer.Integration.Data.StandAlone.SectionResults;
 using Riskeer.Storage.Core.DbContext;
 using Riskeer.Storage.Core.Read.ClosingStructures;
 using Riskeer.Storage.Core.Read.DuneErosion;
@@ -51,6 +50,7 @@
 using Riskeer.Storage.Core.Read.StabilityPointStructures;
 using Riskeer.Storage.Core.Read.StabilityStoneCover;
 using Riskeer.Storage.Core.Read.WaveImpactAsphaltCover;
+using Riskeer.WaveImpactAsphaltCover.Data;
 
 namespace Riskeer.Storage.Core.Read
 {
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsSectionResultEntityReadExtensions.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsSectionResultEntityReadExtensions.cs	(.../GrassCoverErosionOutwardsSectionResultEntityReadExtensions.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsSectionResultEntityReadExtensions.cs	(.../GrassCoverErosionOutwardsSectionResultEntityReadExtensions.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -20,9 +20,9 @@
 // All rights reserved.
 
 using System;
+using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Primitives;
 using Riskeer.GrassCoverErosionOutwards.Data;
-using Riskeer.AssemblyTool.Data;
 using Riskeer.Storage.Core.DbContext;
 
 namespace Riskeer.Storage.Core.Read.GrassCoverErosionOutwards
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/StabilityStoneCover/StabilityStoneCoverSectionResultEntityReadExtensions.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/StabilityStoneCover/StabilityStoneCoverSectionResultEntityReadExtensions.cs	(.../StabilityStoneCoverSectionResultEntityReadExtensions.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/StabilityStoneCover/StabilityStoneCoverSectionResultEntityReadExtensions.cs	(.../StabilityStoneCoverSectionResultEntityReadExtensions.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -20,9 +20,9 @@
 // All rights reserved.
 
 using System;
+using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Primitives;
 using Riskeer.StabilityStoneCover.Data;
-using Riskeer.AssemblyTool.Data;
 using Riskeer.Storage.Core.DbContext;
 
 namespace Riskeer.Storage.Core.Read.StabilityStoneCover
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismMetaEntityReadExtensions.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismMetaEntityReadExtensions.cs	(.../WaveImpactAsphaltCoverFailureMechanismMetaEntityReadExtensions.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismMetaEntityReadExtensions.cs	(.../WaveImpactAsphaltCoverFailureMechanismMetaEntityReadExtensions.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -21,8 +21,8 @@
 
 using System;
 using Core.Common.Base.Data;
-using Riskeer.WaveImpactAsphaltCover.Data;
 using Riskeer.Storage.Core.DbContext;
+using Riskeer.WaveImpactAsphaltCover.Data;
 
 namespace Riskeer.Storage.Core.Read.WaveImpactAsphaltCover
 {
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverSectionResultEntityReadExtensions.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverSectionResultEntityReadExtensions.cs	(.../WaveImpactAsphaltCoverSectionResultEntityReadExtensions.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverSectionResultEntityReadExtensions.cs	(.../WaveImpactAsphaltCoverSectionResultEntityReadExtensions.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -20,10 +20,10 @@
 // All rights reserved.
 
 using System;
-using Riskeer.Common.Primitives;
-using Riskeer.WaveImpactAsphaltCover.Data;
 using Riskeer.AssemblyTool.Data;
+using Riskeer.Common.Primitives;
 using Riskeer.Storage.Core.DbContext;
+using Riskeer.WaveImpactAsphaltCover.Data;
 
 namespace Riskeer.Storage.Core.Read.WaveImpactAsphaltCover
 {
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -26,8 +26,8 @@
 using Riskeer.Common.Data.DikeProfiles;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Revetment.Data;
-using Riskeer.WaveImpactAsphaltCover.Data;
 using Riskeer.Storage.Core.DbContext;
+using Riskeer.WaveImpactAsphaltCover.Data;
 
 namespace Riskeer.Storage.Core.Read.WaveImpactAsphaltCover
 {
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensions.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensions.cs	(.../WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensions.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensions.cs	(.../WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensions.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -21,8 +21,8 @@
 
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Revetment.Data;
-using Riskeer.WaveImpactAsphaltCover.Data;
 using Riskeer.Storage.Core.DbContext;
+using Riskeer.WaveImpactAsphaltCover.Data;
 
 namespace Riskeer.Storage.Core.Read.WaveImpactAsphaltCover
 {
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/BackedUpFileWriterTest.cs
===================================================================
diff -u -r2e55afd890468db1b25c734216956ab5c2126e58 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/BackedUpFileWriterTest.cs	(.../BackedUpFileWriterTest.cs)	(revision 2e55afd890468db1b25c734216956ab5c2126e58)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/BackedUpFileWriterTest.cs	(.../BackedUpFileWriterTest.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -96,7 +96,10 @@
                 Assert.IsTrue(File.Exists(filePath));
 
                 // Call
-                TestDelegate test = () => writer.Perform(() => { throw exception; });
+                TestDelegate test = () => writer.Perform(() =>
+                {
+                    throw exception;
+                });
 
                 Exception actualException = Assert.Throws(exception.GetType(), test);
                 Assert.AreSame(exception, actualException);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/CalculationGroupCreateExtensionsTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/CalculationGroupCreateExtensionsTest.cs	(.../CalculationGroupCreateExtensionsTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/CalculationGroupCreateExtensionsTest.cs	(.../CalculationGroupCreateExtensionsTest.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -32,9 +32,9 @@
 using Riskeer.Piping.Data;
 using Riskeer.StabilityPointStructures.Data;
 using Riskeer.StabilityStoneCover.Data;
-using Riskeer.WaveImpactAsphaltCover.Data;
 using Riskeer.Storage.Core.Create;
 using Riskeer.Storage.Core.DbContext;
+using Riskeer.WaveImpactAsphaltCover.Data;
 
 namespace Riskeer.Storage.Core.Test.Create
 {
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/DuneErosion/DuneErosionFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/DuneErosion/DuneErosionFailureMechanismSectionResultCreateExtensionsTest.cs	(.../DuneErosionFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/DuneErosion/DuneErosionFailureMechanismSectionResultCreateExtensionsTest.cs	(.../DuneErosionFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -22,10 +22,10 @@
 using System;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Primitives;
 using Riskeer.DuneErosion.Data;
-using Riskeer.AssemblyTool.Data;
 using Riskeer.Storage.Core.Create.DuneErosion;
 using Riskeer.Storage.Core.DbContext;
 
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -22,10 +22,10 @@
 using System;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Primitives;
 using Riskeer.GrassCoverErosionOutwards.Data;
-using Riskeer.AssemblyTool.Data;
 using Riskeer.Storage.Core.Create.GrassCoverErosionOutwards;
 using Riskeer.Storage.Core.DbContext;
 
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismSectionResultCreateExtensionsTest.cs	(.../StabilityStoneCoverFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismSectionResultCreateExtensionsTest.cs	(.../StabilityStoneCoverFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -22,10 +22,10 @@
 using System;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Primitives;
 using Riskeer.StabilityStoneCover.Data;
-using Riskeer.AssemblyTool.Data;
 using Riskeer.Storage.Core.Create.StabilityStoneCover;
 using Riskeer.Storage.Core.DbContext;
 
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -25,10 +25,10 @@
 using NUnit.Framework;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.TestUtil;
-using Riskeer.WaveImpactAsphaltCover.Data;
 using Riskeer.Storage.Core.Create;
 using Riskeer.Storage.Core.Create.WaveImpactAsphaltCover;
 using Riskeer.Storage.Core.DbContext;
+using Riskeer.WaveImpactAsphaltCover.Data;
 
 namespace Riskeer.Storage.Core.Test.Create.WaveImpactAsphaltCover
 {
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -22,12 +22,12 @@
 using System;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Primitives;
-using Riskeer.WaveImpactAsphaltCover.Data;
-using Riskeer.AssemblyTool.Data;
 using Riskeer.Storage.Core.Create.WaveImpactAsphaltCover;
 using Riskeer.Storage.Core.DbContext;
+using Riskeer.WaveImpactAsphaltCover.Data;
 
 namespace Riskeer.Storage.Core.Test.Create.WaveImpactAsphaltCover
 {
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -29,10 +29,10 @@
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Revetment.Data;
 using Riskeer.Revetment.Data.TestUtil;
-using Riskeer.WaveImpactAsphaltCover.Data;
 using Riskeer.Storage.Core.Create;
 using Riskeer.Storage.Core.Create.WaveImpactAsphaltCover;
 using Riskeer.Storage.Core.DbContext;
+using Riskeer.WaveImpactAsphaltCover.Data;
 
 namespace Riskeer.Storage.Core.Test.Create.WaveImpactAsphaltCover
 {
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -47,6 +47,9 @@
 using Riskeer.GrassCoverErosionInwards.Data;
 using Riskeer.GrassCoverErosionOutwards.Data;
 using Riskeer.HeightStructures.Data;
+using Riskeer.Integration.Data;
+using Riskeer.Integration.Data.StandAlone;
+using Riskeer.Integration.Data.StandAlone.SectionResults;
 using Riskeer.MacroStabilityInwards.Data;
 using Riskeer.MacroStabilityInwards.Data.SoilProfile;
 using Riskeer.MacroStabilityInwards.Primitives;
@@ -56,13 +59,10 @@
 using Riskeer.Revetment.Data;
 using Riskeer.StabilityPointStructures.Data;
 using Riskeer.StabilityStoneCover.Data;
-using Riskeer.WaveImpactAsphaltCover.Data;
-using Riskeer.Integration.Data;
-using Riskeer.Integration.Data.StandAlone;
-using Riskeer.Integration.Data.StandAlone.SectionResults;
 using Riskeer.Storage.Core.Create;
 using Riskeer.Storage.Core.DbContext;
 using Riskeer.Storage.Core.TestUtil;
+using Riskeer.WaveImpactAsphaltCover.Data;
 
 namespace Riskeer.Storage.Core.Test.IntegrationTests
 {
@@ -2087,7 +2087,7 @@
             Assert.AreEqual(expectedBoundaryDatabase.Version, actualBoundaryDatabase.Version);
             Assert.AreEqual(expectedBoundaryDatabase.FilePath, actualBoundaryDatabase.FilePath);
 
-            AssertHydraulicLocationConfigurationSettings(expectedBoundaryDatabase.HydraulicLocationConfigurationSettings, 
+            AssertHydraulicLocationConfigurationSettings(expectedBoundaryDatabase.HydraulicLocationConfigurationSettings,
                                                          actualBoundaryDatabase.HydraulicLocationConfigurationSettings);
 
             Assert.AreEqual(expectedBoundaryDatabase.Locations.Count, actualBoundaryDatabase.Locations.Count);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -32,9 +32,9 @@
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.GrassCoverErosionOutwards.Data;
-using Riskeer.MacroStabilityInwards.Data;
 using Riskeer.Integration.Data;
 using Riskeer.Integration.Data.StandAlone.Input;
+using Riskeer.MacroStabilityInwards.Data;
 using Riskeer.Storage.Core.DbContext;
 using Riskeer.Storage.Core.Read;
 using Riskeer.Storage.Core.Serializers;
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/CalculationGroupEntityReadExtensionsTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/CalculationGroupEntityReadExtensionsTest.cs	(.../CalculationGroupEntityReadExtensionsTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/CalculationGroupEntityReadExtensionsTest.cs	(.../CalculationGroupEntityReadExtensionsTest.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -32,9 +32,9 @@
 using Riskeer.Piping.Data;
 using Riskeer.StabilityPointStructures.Data;
 using Riskeer.StabilityStoneCover.Data;
-using Riskeer.WaveImpactAsphaltCover.Data;
 using Riskeer.Storage.Core.DbContext;
 using Riskeer.Storage.Core.Read;
+using Riskeer.WaveImpactAsphaltCover.Data;
 
 namespace Riskeer.Storage.Core.Test.Read
 {
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/DuneErosion/DuneErosionSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/DuneErosion/DuneErosionSectionResultEntityReadExtensionsTest.cs	(.../DuneErosionSectionResultEntityReadExtensionsTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/DuneErosion/DuneErosionSectionResultEntityReadExtensionsTest.cs	(.../DuneErosionSectionResultEntityReadExtensionsTest.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -22,10 +22,10 @@
 using System;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Primitives;
 using Riskeer.DuneErosion.Data;
-using Riskeer.AssemblyTool.Data;
 using Riskeer.Storage.Core.DbContext;
 using Riskeer.Storage.Core.Read.DuneErosion;
 
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs	(.../FailureMechanismEntityReadExtensionsTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs	(.../FailureMechanismEntityReadExtensionsTest.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -38,20 +38,20 @@
 using Riskeer.GrassCoverErosionInwards.Data;
 using Riskeer.GrassCoverErosionOutwards.Data;
 using Riskeer.HeightStructures.Data;
+using Riskeer.Integration.Data.StandAlone;
 using Riskeer.MacroStabilityInwards.Data;
 using Riskeer.MacroStabilityInwards.Data.SoilProfile;
 using Riskeer.Piping.Data;
 using Riskeer.Piping.Data.SoilProfile;
 using Riskeer.StabilityPointStructures.Data;
 using Riskeer.StabilityStoneCover.Data;
-using Riskeer.WaveImpactAsphaltCover.Data;
-using Riskeer.Integration.Data.StandAlone;
 using Riskeer.Storage.Core.DbContext;
 using Riskeer.Storage.Core.Read;
 using Riskeer.Storage.Core.Serializers;
 using Riskeer.Storage.Core.TestUtil;
 using Riskeer.Storage.Core.TestUtil.Hydraulics;
 using Riskeer.Storage.Core.TestUtil.MacroStabilityInwards;
+using Riskeer.WaveImpactAsphaltCover.Data;
 
 namespace Riskeer.Storage.Core.Test.Read
 {
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsSectionResultEntityReadExtensionsTest.cs	(.../GrassCoverErosionOutwardsSectionResultEntityReadExtensionsTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsSectionResultEntityReadExtensionsTest.cs	(.../GrassCoverErosionOutwardsSectionResultEntityReadExtensionsTest.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -22,10 +22,10 @@
 using System;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Primitives;
 using Riskeer.GrassCoverErosionOutwards.Data;
-using Riskeer.AssemblyTool.Data;
 using Riskeer.Storage.Core.DbContext;
 using Riskeer.Storage.Core.Read.GrassCoverErosionOutwards;
 
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StabilityStoneCover/StabilityStoneCoverSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StabilityStoneCover/StabilityStoneCoverSectionResultEntityReadExtensionsTest.cs	(.../StabilityStoneCoverSectionResultEntityReadExtensionsTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StabilityStoneCover/StabilityStoneCoverSectionResultEntityReadExtensionsTest.cs	(.../StabilityStoneCoverSectionResultEntityReadExtensionsTest.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -22,10 +22,10 @@
 using System;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Primitives;
 using Riskeer.StabilityStoneCover.Data;
-using Riskeer.AssemblyTool.Data;
 using Riskeer.Storage.Core.DbContext;
 using Riskeer.Storage.Core.Read.StabilityStoneCover;
 
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismMetaEntityReadExtensionsTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismMetaEntityReadExtensionsTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismMetaEntityReadExtensionsTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismMetaEntityReadExtensionsTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismMetaEntityReadExtensionsTest.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -23,9 +23,9 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Riskeer.Common.Data.TestUtil;
-using Riskeer.WaveImpactAsphaltCover.Data;
 using Riskeer.Storage.Core.DbContext;
 using Riskeer.Storage.Core.Read.WaveImpactAsphaltCover;
+using Riskeer.WaveImpactAsphaltCover.Data;
 
 namespace Riskeer.Storage.Core.Test.Read.WaveImpactAsphaltCover
 {
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverSectionResultEntityReadExtensionsTest.cs	(.../WaveImpactAsphaltCoverSectionResultEntityReadExtensionsTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverSectionResultEntityReadExtensionsTest.cs	(.../WaveImpactAsphaltCoverSectionResultEntityReadExtensionsTest.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -22,12 +22,12 @@
 using System;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Primitives;
-using Riskeer.WaveImpactAsphaltCover.Data;
-using Riskeer.AssemblyTool.Data;
 using Riskeer.Storage.Core.DbContext;
 using Riskeer.Storage.Core.Read.WaveImpactAsphaltCover;
+using Riskeer.WaveImpactAsphaltCover.Data;
 
 namespace Riskeer.Storage.Core.Test.Read.WaveImpactAsphaltCover
 {
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -30,12 +30,12 @@
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Revetment.Data;
-using Riskeer.WaveImpactAsphaltCover.Data;
 using Riskeer.Storage.Core.DbContext;
 using Riskeer.Storage.Core.Read;
 using Riskeer.Storage.Core.Read.WaveImpactAsphaltCover;
 using Riskeer.Storage.Core.Serializers;
 using Riskeer.Storage.Core.TestUtil.Hydraulics;
+using Riskeer.WaveImpactAsphaltCover.Data;
 
 namespace Riskeer.Storage.Core.Test.Read.WaveImpactAsphaltCover
 {
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil.Test/RiskeerProjectTestHelperTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil.Test/RiskeerProjectTestHelperTest.cs	(.../RiskeerProjectTestHelperTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil.Test/RiskeerProjectTestHelperTest.cs	(.../RiskeerProjectTestHelperTest.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -35,6 +35,8 @@
 using Riskeer.GrassCoverErosionInwards.Data;
 using Riskeer.GrassCoverErosionOutwards.Data;
 using Riskeer.HeightStructures.Data;
+using Riskeer.Integration.Data;
+using Riskeer.Integration.Data.StandAlone;
 using Riskeer.MacroStabilityInwards.Data;
 using Riskeer.MacroStabilityInwards.Data.SoilProfile;
 using Riskeer.MacroStabilityInwards.Primitives;
@@ -44,8 +46,6 @@
 using Riskeer.StabilityPointStructures.Data;
 using Riskeer.StabilityStoneCover.Data;
 using Riskeer.WaveImpactAsphaltCover.Data;
-using Riskeer.Integration.Data;
-using Riskeer.Integration.Data.StandAlone;
 
 namespace Riskeer.Storage.Core.TestUtil.Test
 {
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -ra979fa8c542476c1b75dbb4c1e5facfae2697079
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision a979fa8c542476c1b75dbb4c1e5facfae2697079)
@@ -27,6 +27,7 @@
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
+using Riskeer.AssemblyTool.Data;
 using Riskeer.ClosingStructures.Data;
 using Riskeer.ClosingStructures.Data.TestUtil;
 using Riskeer.Common.Data.AssessmentSection;
@@ -44,6 +45,9 @@
 using Riskeer.GrassCoverErosionOutwards.Data;
 using Riskeer.HeightStructures.Data;
 using Riskeer.HeightStructures.Data.TestUtil;
+using Riskeer.Integration.Data;
+using Riskeer.Integration.Data.StandAlone;
+using Riskeer.Integration.Data.StandAlone.SectionResults;
 using Riskeer.MacroStabilityInwards.Data;
 using Riskeer.MacroStabilityInwards.Data.SoilProfile;
 using Riskeer.MacroStabilityInwards.Data.TestUtil;
@@ -58,10 +62,6 @@
 using Riskeer.StabilityPointStructures.Data.TestUtil;
 using Riskeer.StabilityStoneCover.Data;
 using Riskeer.WaveImpactAsphaltCover.Data;
-using Riskeer.AssemblyTool.Data;
-using Riskeer.Integration.Data;
-using Riskeer.Integration.Data.StandAlone;
-using Riskeer.Integration.Data.StandAlone.SectionResults;
 
 namespace Riskeer.Storage.Core.TestUtil
 {