Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilDatabaseQueryBuilderTest.cs
===================================================================
diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r5906f61fff270a7526253bea07dfecdf680898ed
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilDatabaseQueryBuilderTest.cs	(.../SoilDatabaseQueryBuilderTest.cs)	(revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilDatabaseQueryBuilderTest.cs	(.../SoilDatabaseQueryBuilderTest.cs)	(revision 5906f61fff270a7526253bea07dfecdf680898ed)
@@ -30,40 +30,41 @@
         [Test]
         public void GetStochasticSoilModelOfMechanismQuery_Always_ReturnsExpectedValues()
         {
-            // Setup
+            // Call
+            string query = SoilDatabaseQueryBuilder.GetStochasticSoilModelOfMechanismQuery();
+
+            // Assert
             const string expectedQuery = "SELECT SP.XWorld, SP.YWorld, S.SE_Name, SSM.SSM_Name, SSM.SSM_ID " +
                                          "FROM Mechanism M " +
                                          "INNER JOIN Segment S USING(ME_ID) " +
                                          "INNER JOIN StochasticSoilModel SSM USING(SSM_ID) " +
                                          "INNER JOIN SegmentPoints SP USING(SE_ID) " +
                                          "WHERE M.ME_Name = @ME_Name ORDER BY SSM.SSM_ID;";
 
-            // Call
-            string query = SoilDatabaseQueryBuilder.GetStochasticSoilModelOfMechanismQuery();
-
-            // Assert
             Assert.AreEqual(expectedQuery, query);
         }
 
         [Test]
         public void GetAllStochasticSoilProfileQuery_Always_ReturnsExpectedValues()
         {
-            // Setup
-            const string expectedQuery = "SELECT SSM_ID, Probability, SP1D_ID, SP2D_ID " +
-                                         "FROM StochasticSoilProfile " +
-                                         "ORDER BY SSM_ID;";
-
             // Call
             string query = SoilDatabaseQueryBuilder.GetAllStochasticSoilProfileQuery();
 
             // Assert
+            const string expectedQuery = "SELECT SSM_ID, Probability, SP1D_ID, SP2D_ID " +
+                                         "FROM StochasticSoilProfile " +
+                                         "ORDER BY SSM_ID;";
             Assert.AreEqual(expectedQuery, query);
         }
 
         [Test]
         public void GetPipingSoilProfileCountQuery_Always_ReturnsExpectedValues()
         {
-            // Setup
+
+            // Call
+            string query = SoilDatabaseQueryBuilder.GetPipingSoilProfileCountQuery();
+
+            // Assert
             const string expectedQuery = "SELECT (" +
                                          "SELECT COUNT(DISTINCT sl1D.SP1D_ID) " +
                                          "FROM Mechanism m " +
@@ -80,75 +81,62 @@
                                          "JOIN MechanismPointLocation mpl USING(ME_ID, SP2D_ID) " +
                                          "WHERE m.ME_Name = @ME_Name" +
                                          ") AS nrOfRows;";
-
-            // Call
-            string query = SoilDatabaseQueryBuilder.GetPipingSoilProfileCountQuery();
-
-            // Assert
             Assert.AreEqual(expectedQuery, query);
         }
 
         [Test]
         public void GetStochasticSoilModelOfMechanismCountQuery_Always_ReturnsExpectedValues()
         {
-            // Setup
+            // Call
+            string query = SoilDatabaseQueryBuilder.GetStochasticSoilModelOfMechanismCountQuery();
+
+            // Assert
             const string expectedQuery = "SELECT COUNT('1') AS nrOfRows FROM (" +
                                          "SELECT '1' FROM Mechanism M " +
                                          "INNER JOIN Segment S USING(ME_ID) " +
                                          "INNER JOIN StochasticSoilModel SSM USING(SSM_ID) " +
                                          "INNER JOIN SegmentPoints SP USING(SE_ID) " +
                                          "WHERE M.ME_Name = @ME_Name GROUP BY SSM_ID);";
-
-            // Call
-            string query = SoilDatabaseQueryBuilder.GetStochasticSoilModelOfMechanismCountQuery();
-
-            // Assert
             Assert.AreEqual(expectedQuery, query);
         }
 
         [Test]
         public void GetCheckVersionQuery_Always_ReturnsExpectedValues()
         {
-            // Setup
-            const string expectedQuery = "SELECT Value " +
-                                         "FROM _MetaData " +
-                                         "WHERE Key = 'VERSION' AND Value = @Value;";
-
             // Call
             string query = SoilDatabaseQueryBuilder.GetCheckVersionQuery();
 
             // Assert
+            const string expectedQuery = "SELECT Value " +
+                                         "FROM _MetaData " +
+                                         "WHERE Key = 'VERSION' AND Value = @Value;";
             Assert.AreEqual(expectedQuery, query);
         }
 
         [Test]
         public void GetSoilModelNamesUniqueQuery_Always_ReturnsExpectedValues()
         {
-            // Setup
-            const string expectedQuery =
-                "SELECT [All].nameCount == [Distinct].nameCount as AreSegmentsUnique " +
-                "FROM(SELECT COUNT(SSM_Name) nameCount FROM StochasticSoilModel) AS [All] " +
-                "JOIN(SELECT COUNT(DISTINCT SSM_Name) nameCount FROM StochasticSoilModel) AS [Distinct];";
-
             // Call
             string query = SoilDatabaseQueryBuilder.GetSoilModelNamesUniqueQuery();
 
             // Assert
+            const string expectedQuery =
+                "SELECT [All].nameCount == [Distinct].nameCount as AreSegmentsUnique " +
+                "FROM(SELECT COUNT(SSM_Name) nameCount FROM StochasticSoilModel) AS [All] " +
+                "JOIN(SELECT COUNT(DISTINCT SSM_Name) nameCount FROM StochasticSoilModel) AS [Distinct];";
             Assert.AreEqual(expectedQuery, query);
         }
 
         [Test]
         public void GetStochasticSoilProfileProbabilitiesDefinedQuery_Always_ReturnsExpectedValues()
         {
-            // Setup
-            const string expectedQuery = "SELECT COUNT(Probability) == 0 as HasNoInvalidProbabilities " +
-                                         "FROM StochasticSoilProfile " +
-                                         "WHERE Probability NOT BETWEEN 0 AND 1 OR Probability ISNULL;";
-
             // Call
             string query = SoilDatabaseQueryBuilder.GetStochasticSoilProfileProbabilitiesValidQuery();
 
             // Assert
+            const string expectedQuery = "SELECT COUNT(Probability) == 0 as HasNoInvalidProbabilities " +
+                                         "FROM StochasticSoilProfile " +
+                                         "WHERE Probability NOT BETWEEN 0 AND 1 OR Probability ISNULL;";
             Assert.AreEqual(expectedQuery, query);
         }
     }