Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationGroupTest.cs
===================================================================
diff -u -rc7c07db38829afdc5965c331844e1d39123944ff -r314545f25db70366badcc527aeca68d241bfdcdc
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationGroupTest.cs	(.../PipingCalculationGroupTest.cs)	(revision c7c07db38829afdc5965c331844e1d39123944ff)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationGroupTest.cs	(.../PipingCalculationGroupTest.cs)	(revision 314545f25db70366badcc527aeca68d241bfdcdc)
@@ -20,12 +20,10 @@
 // All rights reserved.
 
 using System;
-
 using Core.Common.Base;
-
 using NUnit.Framework;
-
 using Rhino.Mocks;
+using Ringtoets.Common.Data;
 
 namespace Ringtoets.Piping.Data.Test
 {
@@ -39,7 +37,7 @@
             var group = new PipingCalculationGroup();
 
             // Assert
-            Assert.IsInstanceOf<IPipingCalculationItem>(group);
+            Assert.IsInstanceOf<ICalculation>(group);
             Assert.IsInstanceOf<Observable>(group);
             Assert.IsTrue(group.IsNameEditable);
             Assert.AreEqual("Nieuwe map", group.Name);
@@ -59,7 +57,7 @@
             var group = new PipingCalculationGroup(newName, isNameEditable);
 
             // Assert
-            Assert.IsInstanceOf<IPipingCalculationItem>(group);
+            Assert.IsInstanceOf<ICalculation>(group);
             Assert.IsInstanceOf<Observable>(group);
             Assert.AreEqual(isNameEditable, group.IsNameEditable);
             Assert.AreEqual(newName, group.Name);
@@ -157,8 +155,12 @@
             // Assert
             Assert.AreEqual(2, group.Children.Count);
             Assert.AreSame(calculationToInsert, group.Children[index]);
-            CollectionAssert.AreEquivalent(new[]{calculationToInsert,calculation}, group.Children,
-                "Already existing items should have remained in collection and new item should be added.");
+            CollectionAssert.AreEquivalent(new[]
+            {
+                calculationToInsert,
+                calculation
+            }, group.Children,
+                                           "Already existing items should have remained in collection and new item should be added.");
         }
 
         [Test]
@@ -210,8 +212,12 @@
             // Assert
             Assert.AreEqual(2, group.Children.Count);
             Assert.AreSame(groupToInsert, group.Children[index]);
-            CollectionAssert.AreEquivalent(new[] { groupToInsert, existingGroup }, group.Children,
-                "Already existing items should have remained in collection and new item should be added.");
+            CollectionAssert.AreEquivalent(new[]
+            {
+                groupToInsert,
+                existingGroup
+            }, group.Children,
+                                           "Already existing items should have remained in collection and new item should be added.");
         }
 
         [Test]
@@ -235,10 +241,10 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var childWithoutOutput = mocks.Stub<IPipingCalculationItem>();
+            var childWithoutOutput = mocks.Stub<ICalculation>();
             childWithoutOutput.Stub(c => c.HasOutput).Return(false);
 
-            var childWithOutput = mocks.Stub<IPipingCalculationItem>();
+            var childWithOutput = mocks.Stub<ICalculation>();
             childWithOutput.Stub(c => c.HasOutput).Return(true);
             mocks.ReplayAll();
 
@@ -259,10 +265,10 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var child1WithoutOutput = mocks.Stub<IPipingCalculationItem>();
+            var child1WithoutOutput = mocks.Stub<ICalculation>();
             child1WithoutOutput.Stub(c => c.HasOutput).Return(false);
 
-            var child2WithoutOutput = mocks.Stub<IPipingCalculationItem>();
+            var child2WithoutOutput = mocks.Stub<ICalculation>();
             child2WithoutOutput.Stub(c => c.HasOutput).Return(false);
             mocks.ReplayAll();