Index: Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_22.1_23.1.sql
===================================================================
diff -u -r522e6cd3146d85f218e3a2b059f16da593127d48 -r15b2841c79d680ae002092ece3e1e3eb71230688
--- Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_22.1_23.1.sql	(.../Migration_22.1_23.1.sql)	(revision 522e6cd3146d85f218e3a2b059f16da593127d48)
+++ Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_22.1_23.1.sql	(.../Migration_22.1_23.1.sql)	(revision 15b2841c79d680ae002092ece3e1e3eb71230688)
@@ -152,10 +152,87 @@
 INSERT INTO HydraulicLocationCalculationEntity SELECT * FROM [SOURCEPROJECT].HydraulicLocationCalculationEntity;
 INSERT INTO HydraulicLocationCalculationForTargetProbabilityCollectionEntity SELECT * FROM [SOURCEPROJECT].HydraulicLocationCalculationForTargetProbabilityCollectionEntity;
 INSERT INTO HydraulicLocationCalculationForTargetProbabilityCollectionHydraulicLocationCalculationEntity SELECT * FROM [SOURCEPROJECT].HydraulicLocationCalculationForTargetProbabilityCollectionHydraulicLocationCalculationEntity;
-INSERT INTO HydraulicLocationOutputEntity SELECT * FROM [SOURCEPROJECT].HydraulicLocationOutputEntity;
 INSERT INTO IllustrationPointResultEntity SELECT * FROM [SOURCEPROJECT].IllustrationPointResultEntity;
 INSERT INTO MacroStabilityInwardsCalculationEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityInwardsCalculationEntity;
-INSERT INTO MacroStabilityInwardsCalculationOutputEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityInwardsCalculationOutputEntity;
+INSERT INTO MacroStabilityInwardsCalculationOutputEntity(
+    [MacroStabilityInwardsCalculationOutputEntityId],
+    [MacroStabilityInwardsCalculationEntityId],
+    [FactorOfStability],
+    [ForbiddenZonesXEntryMin],
+    [ForbiddenZonesXEntryMax],
+    [SlidingCurveLeftSlidingCircleCenterX],
+    [SlidingCurveLeftSlidingCircleCenterY],
+    [SlidingCurveLeftSlidingCircleRadius],
+    [SlidingCurveLeftSlidingCircleIsActive],
+    [SlidingCurveLeftSlidingCircleNonIteratedForce],
+    [SlidingCurveLeftSlidingCircleIteratedForce],
+    [SlidingCurveLeftSlidingCircleDrivingMoment],
+    [SlidingCurveLeftSlidingCircleResistingMoment],
+    [SlidingCurveRightSlidingCircleCenterX],
+    [SlidingCurveRightSlidingCircleCenterY],
+    [SlidingCurveRightSlidingCircleRadius],
+    [SlidingCurveRightSlidingCircleIsActive],
+    [SlidingCurveRightSlidingCircleNonIteratedForce],
+    [SlidingCurveRightSlidingCircleIteratedForce],
+    [SlidingCurveRightSlidingCircleDrivingMoment],
+    [SlidingCurveRightSlidingCircleResistingMoment],
+    [SlidingCurveNonIteratedHorizontalForce],
+    [SlidingCurveIteratedHorizontalForce],
+    [SlidingCurveSliceXML],
+    [SlipPlaneLeftGridXLeft],
+    [SlipPlaneLeftGridXRight],
+    [SlipPlaneLeftGridNrOfHorizontalPoints],
+    [SlipPlaneLeftGridZTop],
+    [SlipPlaneLeftGridZBottom],
+    [SlipPlaneLeftGridNrOfVerticalPoints],
+    [SlipPlaneRightGridXLeft],
+    [SlipPlaneRightGridXRight],
+    [SlipPlaneRightGridNrOfHorizontalPoints],
+    [SlipPlaneRightGridZTop],
+    [SlipPlaneRightGridZBottom],
+    [SlipPlaneRightGridNrOfVerticalPoints],
+    [SlipPlaneTangentLinesXml])
+SELECT
+    [MacroStabilityInwardsCalculationOutputEntityId],
+    [MacroStabilityInwardsCalculationEntityId],
+    [FactorOfStability],
+    [ForbiddenZonesXEntryMin],
+    [ForbiddenZonesXEntryMax],
+    [SlidingCurveLeftSlidingCircleCenterX],
+    [SlidingCurveLeftSlidingCircleCenterY],
+    [SlidingCurveLeftSlidingCircleRadius],
+    [SlidingCurveLeftSlidingCircleIsActive],
+    [SlidingCurveLeftSlidingCircleNonIteratedForce],
+    [SlidingCurveLeftSlidingCircleIteratedForce],
+    [SlidingCurveLeftSlidingCircleDrivingMoment],
+    [SlidingCurveLeftSlidingCircleResistingMoment],
+    [SlidingCurveRightSlidingCircleCenterX],
+    [SlidingCurveRightSlidingCircleCenterY],
+    [SlidingCurveRightSlidingCircleRadius],
+    [SlidingCurveRightSlidingCircleIsActive],
+    [SlidingCurveRightSlidingCircleNonIteratedForce],
+    [SlidingCurveRightSlidingCircleIteratedForce],
+    [SlidingCurveRightSlidingCircleDrivingMoment],
+    [SlidingCurveRightSlidingCircleResistingMoment],
+    [SlidingCurveNonIteratedHorizontalForce],
+    [SlidingCurveIteratedHorizontalForce],
+    [SlidingCurveSliceXML],
+    [SlipPlaneLeftGridXLeft],
+    [SlipPlaneLeftGridXRight],
+    [SlipPlaneLeftGridNrOfHorizontalPoints],
+    [SlipPlaneLeftGridZTop],
+    [SlipPlaneLeftGridZBottom],
+    [SlipPlaneLeftGridNrOfVerticalPoints],
+    [SlipPlaneRightGridXLeft],
+    [SlipPlaneRightGridXRight],
+    [SlipPlaneRightGridNrOfHorizontalPoints],
+    [SlipPlaneRightGridZTop],
+    [SlipPlaneRightGridZBottom],
+    [SlipPlaneRightGridNrOfVerticalPoints],
+    [SlipPlaneTangentLinesXml]
+FROM [SOURCEPROJECT].MacroStabilityInwardsCalculationOutputEntity
+JOIN [SOURCEPROJECT].MacroStabilityInwardsCalculationEntity USING(MacroStabilityInwardsCalculationEntityId)
+WHERE UseAssessmentLevelManualInput = 1;
 INSERT INTO MacroStabilityInwardsCharacteristicPointEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityInwardsCharacteristicPointEntity;
 INSERT INTO MacroStabilityInwardsFailureMechanismMetaEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityInwardsFailureMechanismMetaEntity;
 INSERT INTO MacroStabilityInwardsPreconsolidationStressEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityInwardsPreconsolidationStressEntity;
@@ -173,7 +250,33 @@
 INSERT INTO ProbabilisticPipingCalculationEntity SELECT * FROM [SOURCEPROJECT].ProbabilisticPipingCalculationEntity;
 INSERT INTO ProbabilisticPipingCalculationOutputEntity SELECT * FROM [SOURCEPROJECT].ProbabilisticPipingCalculationOutputEntity;
 INSERT INTO ProjectEntity SELECT * FROM [SOURCEPROJECT].ProjectEntity;
-INSERT INTO SemiProbabilisticPipingCalculationOutputEntity SELECT * FROM [SOURCEPROJECT].SemiProbabilisticPipingCalculationOutputEntity;
+INSERT INTO SemiProbabilisticPipingCalculationOutputEntity(
+    [SemiProbabilisticPipingCalculationOutputEntityId],
+    [SemiProbabilisticPipingCalculationEntityId],
+    [Order],
+    [HeaveFactorOfSafety],
+    [UpliftFactorOfSafety],
+    [SellmeijerFactorOfSafety],
+    [UpliftEffectiveStress],
+    [HeaveGradient],
+    [SellmeijerCreepCoefficient],
+    [SellmeijerCriticalFall],
+    [SellmeijerReducedFall])
+SELECT
+    [SemiProbabilisticPipingCalculationOutputEntityId],
+    [SemiProbabilisticPipingCalculationEntityId],
+    sppcoe.[Order],
+    [HeaveFactorOfSafety],
+    [UpliftFactorOfSafety],
+    [SellmeijerFactorOfSafety],
+    [UpliftEffectiveStress],
+    [HeaveGradient],
+    [SellmeijerCreepCoefficient],
+    [SellmeijerCriticalFall],
+    [SellmeijerReducedFall]
+FROM [SOURCEPROJECT].SemiProbabilisticPipingCalculationOutputEntity sppcoe
+JOIN [SOURCEPROJECT].SemiProbabilisticPipingCalculationEntity USING(SemiProbabilisticPipingCalculationEntityId)
+WHERE UseAssessmentLevelManualInput = 1;
 INSERT INTO SpecificFailureMechanismEntity SELECT * FROM [SOURCEPROJECT].SpecificFailureMechanismEntity;
 INSERT INTO SpecificFailureMechanismFailureMechanismSectionEntity SELECT * FROM [SOURCEPROJECT].SpecificFailureMechanismFailureMechanismSectionEntity;
 INSERT INTO StabilityPointStructureEntity SELECT * FROM [SOURCEPROJECT].StabilityPointStructureEntity;
Index: Riskeer/Migration/test/Riskeer.Migration.Core.Test/test-data/MigrationTestProject221MacroStabilityInwardsNoManualAssessmentLevels.risk
===================================================================
diff -u
Binary files differ
Index: Riskeer/Migration/test/Riskeer.Migration.Core.Test/test-data/MigrationTestProject221PipingNoManualAssessmentLevels.risk
===================================================================
diff -u
Binary files differ
Index: Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo231IntegrationTest.cs
===================================================================
diff -u -r522e6cd3146d85f218e3a2b059f16da593127d48 -r15b2841c79d680ae002092ece3e1e3eb71230688
--- Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo231IntegrationTest.cs	(.../MigrationTo231IntegrationTest.cs)	(revision 522e6cd3146d85f218e3a2b059f16da593127d48)
+++ Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo231IntegrationTest.cs	(.../MigrationTo231IntegrationTest.cs)	(revision 15b2841c79d680ae002092ece3e1e3eb71230688)
@@ -102,6 +102,16 @@
             {
                 "Alle berekende resultaten zijn verwijderd."
             });
+            
+            yield return new TestCaseData("MigrationTestProject221MacroStabilityInwardsNoManualAssessmentLevels.risk", new[]
+            {
+                "Alle berekende resultaten zijn verwijderd."
+            });
+            
+            yield return new TestCaseData("MigrationTestProject221PipingNoManualAssessmentLevels.risk", new[]
+            {
+                "Alle berekende resultaten zijn verwijderd."
+            });
         }
         
         private static void AssertDuneLocation(MigratedDatabaseReader reader, string sourceFilePath)
@@ -359,7 +369,7 @@
                 "SELECT COUNT() " +
                 "FROM SOURCEPROJECT.SemiProbabilisticPipingCalculationOutputEntity " +
                 "JOIN SOURCEPROJECT.SemiProbabilisticPipingCalculationEntity USING(SemiProbabilisticPipingCalculationEntityId) " +
-                "WHERE UseAssessmentLevelManualInput IS 1" +
+                "WHERE UseAssessmentLevelManualInput = 1" +
                 ") " +
                 "FROM SemiProbabilisticPipingCalculationOutputEntity NEW " +
                 "JOIN SOURCEPROJECT.SemiProbabilisticPipingCalculationOutputEntity OLD " +
@@ -500,10 +510,8 @@
                 "HydraulicLocationCalculationEntity",
                 "HydraulicLocationCalculationForTargetProbabilityCollectionEntity",
                 "HydraulicLocationCalculationForTargetProbabilityCollectionHydraulicLocationCalculationEntity",
-                "HydraulicLocationOutputEntity",
                 "IllustrationPointResultEntity",
                 "MacroStabilityInwardsCalculationEntity",
-                "MacroStabilityInwardsCalculationOutputEntity",
                 "MacroStabilityInwardsCharacteristicPointEntity",
                 "MacroStabilityInwardsFailureMechanismMetaEntity",
                 "MacroStabilityInwardsPreconsolidationStressEntity",
@@ -521,7 +529,6 @@
                 "ProbabilisticPipingCalculationEntity",
                 "ProbabilisticPipingCalculationOutputEntity",
                 "ProjectEntity",
-                "SemiProbabilisticPipingCalculationOutputEntity",
                 "SpecificFailureMechanismEntity",
                 "SpecificFailureMechanismFailureMechanismSectionEntity",
                 "StabilityPointStructureEntity",