Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs
===================================================================
diff -u -r6194 -r6217
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs	(.../FillXmlOutputFromDamTests.cs)	(revision 6194)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs	(.../FillXmlOutputFromDamTests.cs)	(revision 6217)
@@ -21,8 +21,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Xml.Serialization;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.General.Results;
 using Deltares.DamEngine.Data.General.TimeSeries;
@@ -307,9 +305,9 @@
                 {
                     DateTime = new DateTime(2012, 12, 31, 1, j * 10, 0),
                     Value = 1 + j * 0.1,
-                    BishopCircleX = 2 + j * 0.2,
-                    BishopCircleZ = 3 + j * 0.3,
-                    BishopRadius = 4 + j * 0.4
+                    BishopCircleCentreX = 2 + j * 0.2,
+                    BishopCircleCentreZ = 3 + j * 0.3,
+                    BishopCircleRadius = 4 + j * 0.4
                 });
             }
         }
@@ -488,10 +486,13 @@
 
     private static void AssertCharacteristicPoint(CharacteristicPoint expected, SurfaceLinePoint actual)
     {
-        Assert.That(actual.X, Is.EqualTo(expected.Point.X));
-        Assert.That(actual.Z, Is.EqualTo(expected.Point.Z));
-        Assert.That(actual.PointType,
-                    Is.EqualTo(ConversionHelper.ConvertToInputPointType(expected.CharacteristicPointType)));
+        Assert.Multiple(() =>
+        {
+            Assert.That(actual.X, Is.EqualTo(expected.Point.X));
+            Assert.That(actual.Z, Is.EqualTo(expected.Point.Z));
+            Assert.That(actual.PointType,
+                        Is.EqualTo(ConversionHelper.ConvertToInputPointType(expected.CharacteristicPointType)));
+        });
     }
 
     private void CompareDamProjectData(DamProjectData actual, DamProjectData expected)