Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingConfigurationReaderTest.cs
===================================================================
diff -u -ra1c473b1a3abab7f1c53ad5cea01a152741c65b8 -r6e955278e4e469aa7d85d98ca3fed22219abc477
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingConfigurationReaderTest.cs	(.../PipingConfigurationReaderTest.cs)	(revision a1c473b1a3abab7f1c53ad5cea01a152741c65b8)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingConfigurationReaderTest.cs	(.../PipingConfigurationReaderTest.cs)	(revision 6e955278e4e469aa7d85d98ca3fed22219abc477)
@@ -156,24 +156,72 @@
         }
 
         [Test]
-        public void Read_ValidConfigurationWithoutItems_ReturnEmptyReadPipingCalculationItemsCollection()
+        public void Read_ValidConfigurationWithEmptyRoot_ReturnEmptyReadPipingCalculationItemsCollection()
         {
             // Setup
-            string filePath = Path.Combine(testDirectoryPath, "validNoItems.xml");
+            string filePath = Path.Combine(testDirectoryPath, "validEmptyRoot.xml");
             var pipingConfigurationReader = new PipingConfigurationReader(filePath);
 
             // Call
-            IList<IReadPipingCalculationItem> readPipingCalculationItems = pipingConfigurationReader.Read().ToList();
+            IEnumerable<IReadPipingCalculationItem> readPipingCalculationItems = pipingConfigurationReader.Read();
 
             // Assert
             CollectionAssert.IsEmpty(readPipingCalculationItems);
         }
 
         [Test]
+        public void Read_ValidConfigurationWithEmptyFolder_ReturnExpectedReadPipingCalculationGroup()
+        {
+            // Setup
+            string filePath = Path.Combine(testDirectoryPath, "validConfigurationEmptyFolder.xml");
+            var pipingConfigurationReader = new PipingConfigurationReader(filePath);
+
+            // Call
+            IList<IReadPipingCalculationItem> readPipingCalculationItems = pipingConfigurationReader.Read().ToList();
+
+            // Assert
+            Assert.AreEqual(1, readPipingCalculationItems.Count);
+
+            var group = readPipingCalculationItems[0] as ReadPipingCalculationGroup;
+            Assert.IsNotNull(group);
+            Assert.AreEqual("Calculation group", group.Name);
+            CollectionAssert.IsEmpty(group.Items);
+        }
+
+        [Test]
+        public void Read_ValidConfigurationWithEmptyCalculation_ReturnExpectedReadPipingCalculation()
+        {
+            // Setup
+            string filePath = Path.Combine(testDirectoryPath, "validConfigurationEmptyCalculation.xml");
+            var pipingConfigurationReader = new PipingConfigurationReader(filePath);
+
+            // Call
+            IList<IReadPipingCalculationItem> readPipingCalculationItems = pipingConfigurationReader.Read().ToList();
+
+            // Assert
+            Assert.AreEqual(1, readPipingCalculationItems.Count);
+
+            var calculation = readPipingCalculationItems[0] as ReadPipingCalculation;
+            Assert.IsNotNull(calculation);
+            Assert.AreEqual("Calculation", calculation.Name);
+            Assert.IsNull(calculation.AssessmentLevel);
+            Assert.IsNull(calculation.HydraulicBoundaryLocation);
+            Assert.IsNull(calculation.SurfaceLine);
+            Assert.IsNull(calculation.EntryPointL);
+            Assert.IsNull(calculation.ExitPointL);
+            Assert.IsNull(calculation.StochasticSoilModel);
+            Assert.IsNull(calculation.StochasticSoilProfile);
+            Assert.IsNull(calculation.PhreaticLevelExitMean);
+            Assert.IsNull(calculation.PhreaticLevelExitStandardDeviation);
+            Assert.IsNull(calculation.DampingFactorExitMean);
+            Assert.IsNull(calculation.DampingFactorExitStandardDeviation);
+        }
+
+        [Test]
         public void Read_ValidConfigurationWithNesting_ReturnExpectedReadPipingCalculationItems()
         {
             // Setup
-            string filePath = Path.Combine(testDirectoryPath, "validConfigurationWithNesting.xml");
+            string filePath = Path.Combine(testDirectoryPath, "validConfigurationNesting.xml");
             var pipingConfigurationReader = new PipingConfigurationReader(filePath);
 
             // Call
@@ -230,34 +278,5 @@
             Assert.IsNotNull(calculation5);
             Assert.AreEqual("Calculation 5", calculation5.Name);
         }
-
-        [Test]
-        public void Read_ValidConfigurationWithEmptyCalculation_ReturnExpectedReadPipingCalculationItems()
-        {
-            // Setup
-            string filePath = Path.Combine(testDirectoryPath, "validConfigurationWithEmptyCalculation.xml");
-            var pipingConfigurationReader = new PipingConfigurationReader(filePath);
-
-            // Call
-            IList<IReadPipingCalculationItem> readPipingCalculationItems = pipingConfigurationReader.Read().ToList();
-
-            // Assert
-            Assert.AreEqual(1, readPipingCalculationItems.Count);
-
-            var calculation = readPipingCalculationItems[0] as ReadPipingCalculation;
-            Assert.IsNotNull(calculation);
-            Assert.AreEqual("Calculation", calculation.Name);
-            Assert.IsNull(calculation.AssessmentLevel);
-            Assert.IsNull(calculation.HydraulicBoundaryLocation);
-            Assert.IsNull(calculation.SurfaceLine);
-            Assert.IsNull(calculation.EntryPointL);
-            Assert.IsNull(calculation.ExitPointL);
-            Assert.IsNull(calculation.StochasticSoilModel);
-            Assert.IsNull(calculation.StochasticSoilProfile);
-            Assert.IsNull(calculation.PhreaticLevelExitMean);
-            Assert.IsNull(calculation.PhreaticLevelExitStandardDeviation);
-            Assert.IsNull(calculation.DampingFactorExitMean);
-            Assert.IsNull(calculation.DampingFactorExitStandardDeviation);
-        }
     }
 }
\ No newline at end of file
Fisheye: Tag 6e955278e4e469aa7d85d98ca3fed22219abc477 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidNoItems.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validConfigurationEmptyCalculation.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validConfigurationEmptyCalculation.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validConfigurationEmptyCalculation.xml	(revision 6e955278e4e469aa7d85d98ca3fed22219abc477)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <berekening naam="Calculation"/>
+</root>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validConfigurationEmptyFolder.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validConfigurationEmptyFolder.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validConfigurationEmptyFolder.xml	(revision 6e955278e4e469aa7d85d98ca3fed22219abc477)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <folder naam="Calculation group"/>
+</root>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validConfigurationNesting.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validConfigurationNesting.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validConfigurationNesting.xml	(revision 6e955278e4e469aa7d85d98ca3fed22219abc477)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <folder naam="Group 1">
+    <berekening naam="Calculation 3"/>
+  </folder>
+  <berekening naam="Calculation 1"/>
+  <folder naam="Group 2">
+    <folder naam="Group 4">
+      <berekening naam="Calculation 5"/>
+    </folder>
+    <berekening naam="Calculation 4"/>  
+  </folder>
+  <berekening naam="Calculation 2"/>
+  <folder naam="Group 3"/>
+</root>
\ No newline at end of file
Fisheye: Tag 6e955278e4e469aa7d85d98ca3fed22219abc477 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validConfigurationWithEmptyCalculation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6e955278e4e469aa7d85d98ca3fed22219abc477 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validConfigurationWithNesting.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validEmptyRoot.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validEmptyRoot.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validEmptyRoot.xml	(revision 6e955278e4e469aa7d85d98ca3fed22219abc477)
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+</root>
\ No newline at end of file
Fisheye: Tag 6e955278e4e469aa7d85d98ca3fed22219abc477 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validNoItems.xml'.
Fisheye: No comparison available.  Pass `N' to diff?