Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineSlopeAdapterTest.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineSlopeAdapterTest.cs	(.../SurfaceLineSlopeAdapterTest.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineSlopeAdapterTest.cs	(.../SurfaceLineSlopeAdapterTest.cs)	(revision 3875)
@@ -38,7 +38,7 @@
         /// <summary>
         /// Tests the fixture tear down.
         /// </summary>
-        [TestFixtureTearDown]
+        [TearDown]
         public void TestFixtureTearDown()
         {
         }
@@ -292,12 +292,11 @@
         #region ConstructWithSlopeTangent
 
         [Test]
-        [ExpectedException(typeof(SurfaceLineAdapterException))]
         public void IsExceptionThrownIfSlopeDoesNotIntersectSurfaceLine()
         {
             var surfaceLine = CreateSimpleDike();
             var surfaceLineAdapter = new SurfaceLineSlopeAdapter(surfaceLine, location, 0);
-            surfaceLineAdapter.ConstructNewSurfaceLineBySlope(0);
+            Assert.That(() => surfaceLineAdapter.ConstructNewSurfaceLineBySlope(0), Throws.InstanceOf<SurfaceLineAdapterException>());
         }
 
         [Test]
@@ -408,7 +407,6 @@
         }
 
         [Test]
-        [ExpectedException(typeof(SurfaceLineAdapterException))]
         public void IsExceptionThrownWhenSlopeDoesNotFit()
         {
             var surfaceLine = new SurfaceLine2
@@ -436,7 +434,7 @@
             surfaceLine.EnsurePointOfType(pointSurfaceLevelInside.X, pointSurfaceLevelInside.Z, CharacteristicPointType.SurfaceLevelInside);
             var surfaceLineAdapter = new SurfaceLineSlopeAdapter(surfaceLine, location, 0);
             const double slopeTangent = 1.0 / 4.0;
-            surfaceLineAdapter.ConstructNewSurfaceLineBySlope(slopeTangent);
+            Assert.That(() => surfaceLineAdapter.ConstructNewSurfaceLineBySlope(slopeTangent), Throws.InstanceOf<SurfaceLineAdapterException>());
         }
 
         [Test]