diff --git a/GeometryTests/GeometryTests.vbproj b/GeometryTests/GeometryTests.vbproj
index 492ebf7..ac4b4c0 100644
--- a/GeometryTests/GeometryTests.vbproj
+++ b/GeometryTests/GeometryTests.vbproj
@@ -140,7 +140,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="MSTest">
-      <Version>3.9.0</Version>
+      <Version>3.11.0</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
diff --git a/GeometryTests/ThreeDimensional/ConeTests.vb b/GeometryTests/ThreeDimensional/ConeTests.vb
index 9c67772..48ded83 100644
--- a/GeometryTests/ThreeDimensional/ConeTests.vb
+++ b/GeometryTests/ThreeDimensional/ConeTests.vb
@@ -53,19 +53,19 @@ Namespace ThreeDimensional.Tests
         <TestMethod>
         Public Sub Guards_Volume_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Dim unused = Assert.ThrowsException(Of ArgumentException)(Sub() Volume(-1, 2))
+            Dim unused = Assert.ThrowsExactly(Of ArgumentException)(Sub() Volume(-1, 2))
         End Sub
 
         <TestMethod>
         Public Sub Guards_Frustum_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Dim unused = Assert.ThrowsException(Of ArgumentException)(Sub() FrustumVolume(3, 3, 2))
+            Dim unused = Assert.ThrowsExactly(Of ArgumentException)(Sub() FrustumVolume(3, 3, 2))
         End Sub
 
         <TestMethod>
         Public Sub Guards_PointOnLateralSurface_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Dim unused = Assert.ThrowsException(Of ArgumentException)(Sub() PointOnLateralSurface(0, 0, 0, 3, 5, 0, 1.1))
+            Dim unused = Assert.ThrowsExactly(Of ArgumentException)(Sub() PointOnLateralSurface(0, 0, 0, 3, 5, 0, 1.1))
         End Sub
 
     End Class
diff --git a/GeometryTests/ThreeDimensional/CubeTests.vb b/GeometryTests/ThreeDimensional/CubeTests.vb
index 1ea75fd..0376c45 100644
--- a/GeometryTests/ThreeDimensional/CubeTests.vb
+++ b/GeometryTests/ThreeDimensional/CubeTests.vb
@@ -49,11 +49,11 @@ Namespace ThreeDimensional.Tests
         <TestMethod>
         Public Sub Guards_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() Volume(-1))
-            Assert.ThrowsException(Of ArgumentException)(Sub() SideFromVolume(-1))
-            Assert.ThrowsException(Of ArgumentException)(Sub() SideFromSurfaceArea(-1))
-            Assert.ThrowsException(Of ArgumentException)(Sub() SideFromSpaceDiagonal(-1))
-            Assert.ThrowsException(Of ArgumentException)(Sub() VerticesFromCenter(0, 0, 0, -1))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() Volume(-1))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() SideFromVolume(-1))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() SideFromSurfaceArea(-1))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() SideFromSpaceDiagonal(-1))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() VerticesFromCenter(0, 0, 0, -1))
         End Sub
 
     End Class
diff --git a/GeometryTests/ThreeDimensional/CuboidTests.vb b/GeometryTests/ThreeDimensional/CuboidTests.vb
index 0190d63..3bcd368 100644
--- a/GeometryTests/ThreeDimensional/CuboidTests.vb
+++ b/GeometryTests/ThreeDimensional/CuboidTests.vb
@@ -55,19 +55,19 @@ Namespace ThreeDimensional.Tests
         <TestMethod>
         Public Sub Guards_Volume_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() Volume(-1, 2, 3))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() Volume(-1, 2, 3))
         End Sub
 
         <TestMethod>
         Public Sub Guards_EdgeFromVolume_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() EdgeFromVolume(10, 0, 2))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() EdgeFromVolume(10, 0, 2))
         End Sub
 
         <TestMethod>
         Public Sub Guards_IsCube_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() IsCube(1, 1, 1, 0))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() IsCube(1, 1, 1, 0))
         End Sub
 
     End Class
diff --git a/GeometryTests/ThreeDimensional/CylinderTests.vb b/GeometryTests/ThreeDimensional/CylinderTests.vb
index 64538b8..3841c1e 100644
--- a/GeometryTests/ThreeDimensional/CylinderTests.vb
+++ b/GeometryTests/ThreeDimensional/CylinderTests.vb
@@ -51,19 +51,19 @@ Namespace ThreeDimensional.Tests
         <TestMethod>
         Public Sub Guards_Volume_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() Volume(-1, 2))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() Volume(-1, 2))
         End Sub
 
         <TestMethod>
         Public Sub Guards_Hollow_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() HollowVolume(3, 3, 1))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() HollowVolume(3, 3, 1))
         End Sub
 
         <TestMethod>
         Public Sub Guards_PointOnLateralSurface_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() PointOnLateralSurface(0, 0, 0, 2, 5, 0, 6))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() PointOnLateralSurface(0, 0, 0, 2, 5, 0, 6))
         End Sub
 
     End Class
diff --git a/GeometryTests/ThreeDimensional/FrustumTests.vb b/GeometryTests/ThreeDimensional/FrustumTests.vb
index 45f2116..20d8bd7 100644
--- a/GeometryTests/ThreeDimensional/FrustumTests.vb
+++ b/GeometryTests/ThreeDimensional/FrustumTests.vb
@@ -55,23 +55,23 @@ Namespace ThreeDimensional.Tests
         <TestMethod>
         Public Sub Guards_ConeFrustum_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() ConeFrustumVolume(2, 2, 1))
-            Assert.ThrowsException(Of ArgumentException)(Sub() ConeFrustumLateralArea(-1, 0, 1))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() ConeFrustumVolume(2, 2, 1))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() ConeFrustumLateralArea(-1, 0, 1))
         End Sub
 
         <TestMethod>
         Public Sub Guards_PyramidFrustum_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() PyramidFrustumVolume(4, 3, 4, 2, 5))
-            Assert.ThrowsException(Of ArgumentException)(Sub() PyramidFrustumSurfaceArea(4, 3, 1, 0, -1))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() PyramidFrustumVolume(4, 3, 4, 2, 5))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() PyramidFrustumSurfaceArea(4, 3, 1, 0, -1))
         End Sub
 
         <TestMethod>
         Public Sub Guards_PrismFrustum_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() PrismFrustumVolume(-1, 2, 1))
-            Assert.ThrowsException(Of ArgumentException)(Sub() PrismFrustumLateralArea(1, -1, 1))
-            Assert.ThrowsException(Of ArgumentException)(Sub() PrismFrustumSurfaceArea(1, 1, 1, 1, -1))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() PrismFrustumVolume(-1, 2, 1))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() PrismFrustumLateralArea(1, -1, 1))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() PrismFrustumSurfaceArea(1, 1, 1, 1, -1))
         End Sub
 
     End Class
diff --git a/GeometryTests/ThreeDimensional/PrismTests.vb b/GeometryTests/ThreeDimensional/PrismTests.vb
index ed84b35..a53805c 100644
--- a/GeometryTests/ThreeDimensional/PrismTests.vb
+++ b/GeometryTests/ThreeDimensional/PrismTests.vb
@@ -42,24 +42,24 @@ Namespace ThreeDimensional.Tests
         <TestMethod>
         Public Sub Guards_General_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() Volume(-1, 1))
-            Assert.ThrowsException(Of ArgumentException)(Sub() LateralArea(1, -1))
-            Assert.ThrowsException(Of ArgumentException)(Sub() SurfaceArea(1, -1, 1))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() Volume(-1, 1))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() LateralArea(1, -1))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() SurfaceArea(1, -1, 1))
         End Sub
 
         <TestMethod>
         Public Sub Guards_Triangular_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() TriangularBaseArea(1, 2, 3))
-            Assert.ThrowsException(Of ArgumentException)(Sub() TriangularPrismVolume(3, 4, 5, -1))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() TriangularBaseArea(1, 2, 3))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() TriangularPrismVolume(3, 4, 5, -1))
         End Sub
 
         <TestMethod>
         Public Sub Guards_RegularPolygon_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() RegularPolygonBaseArea(1, 2))
-            Assert.ThrowsException(Of ArgumentException)(Sub() RegularPolygonPrismVolume(-1, 6, 1))
-            Assert.ThrowsException(Of ArgumentException)(Sub() RegularPolygonPrismSurfaceArea(1, 6, -1))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() RegularPolygonBaseArea(1, 2))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() RegularPolygonPrismVolume(-1, 6, 1))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() RegularPolygonPrismSurfaceArea(1, 6, -1))
         End Sub
 
     End Class
diff --git a/GeometryTests/ThreeDimensional/PyramidTests.vb b/GeometryTests/ThreeDimensional/PyramidTests.vb
index f017483..1390dbd 100644
--- a/GeometryTests/ThreeDimensional/PyramidTests.vb
+++ b/GeometryTests/ThreeDimensional/PyramidTests.vb
@@ -65,19 +65,19 @@ Namespace ThreeDimensional.Tests
         <TestMethod>
         Public Sub Guards_BaseArea_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() BaseArea(-1, 2))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() BaseArea(-1, 2))
         End Sub
 
         <TestMethod>
         Public Sub Guards_Frustum_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() FrustumVolume(4, 3, 4, 2, 5))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() FrustumVolume(4, 3, 4, 2, 5))
         End Sub
 
         <TestMethod>
         Public Sub Guards_Vertices_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() VerticesFromCenter(0, 0, 0, -1, 1, 1))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() VerticesFromCenter(0, 0, 0, -1, 1, 1))
         End Sub
 
     End Class
diff --git a/GeometryTests/ThreeDimensional/SphereTests.vb b/GeometryTests/ThreeDimensional/SphereTests.vb
index 3097d66..b51c83b 100644
--- a/GeometryTests/ThreeDimensional/SphereTests.vb
+++ b/GeometryTests/ThreeDimensional/SphereTests.vb
@@ -59,19 +59,19 @@ Namespace ThreeDimensional.Tests
         <TestMethod>
         Public Sub Guards_Volume_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() Volume(-1))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() Volume(-1))
         End Sub
 
         <TestMethod>
         Public Sub Guards_SphericalCapVolume_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() SphericalCapVolume(2, 5))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() SphericalCapVolume(2, 5))
         End Sub
 
         <TestMethod>
         Public Sub Guards_PointOnSphere_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() PointOnSphere(0, 0, 0, 2, -0.1, 0))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() PointOnSphere(0, 0, 0, 2, -0.1, 0))
         End Sub
 
     End Class
diff --git a/GeometryTests/TwoDimensional/CircleTests.vb b/GeometryTests/TwoDimensional/CircleTests.vb
index cba4927..d9f9104 100644
--- a/GeometryTests/TwoDimensional/CircleTests.vb
+++ b/GeometryTests/TwoDimensional/CircleTests.vb
@@ -131,10 +131,9 @@ Namespace TwoDimensional.Tests
         End Sub
 
         <TestMethod()>
-        <ExpectedException(GetType(ArgumentException))>
         Public Sub NegativeRadius_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Dim unused = Area(-1.0)
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() Area(-1.0))
         End Sub
 
     End Class
diff --git a/GeometryTests/TwoDimensional/KiteTests.vb b/GeometryTests/TwoDimensional/KiteTests.vb
index dac5e52..1ac579a 100644
--- a/GeometryTests/TwoDimensional/KiteTests.vb
+++ b/GeometryTests/TwoDimensional/KiteTests.vb
@@ -56,19 +56,19 @@ Namespace TwoDimensional.Tests
         <TestMethod>
         Public Sub Guards_AreaFromDiagonals_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() AreaFromDiagonals(-1, 2))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() AreaFromDiagonals(-1, 2))
         End Sub
 
         <TestMethod>
         Public Sub Guards_HeightFromArea_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() HeightFromArea(10, 0))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() HeightFromArea(10, 0))
         End Sub
 
         <TestMethod>
         Public Sub Guards_IsKiteFromVertices_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() IsKiteFromVertices(New PointF() {New PointF(0, 0), New PointF(1, 0), New PointF(1, 1)}))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() IsKiteFromVertices(New PointF() {New PointF(0, 0), New PointF(1, 0), New PointF(1, 1)}))
         End Sub
 
     End Class
diff --git a/GeometryTests/TwoDimensional/ParallelogramTests.vb b/GeometryTests/TwoDimensional/ParallelogramTests.vb
index c9e062f..a7f6f25 100644
--- a/GeometryTests/TwoDimensional/ParallelogramTests.vb
+++ b/GeometryTests/TwoDimensional/ParallelogramTests.vb
@@ -68,31 +68,31 @@ Namespace TwoDimensional.Tests
         <TestMethod>
         Public Sub Guards_Area_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() Area(-1, 2))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() Area(-1, 2))
         End Sub
 
         <TestMethod>
         Public Sub Guards_DiagonalBySidesAndAngle_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() DiagonalBySidesAndAngle(5, 3, 0))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() DiagonalBySidesAndAngle(5, 3, 0))
         End Sub
 
         <TestMethod>
         Public Sub Guards_InteriorAngleFromSidesAndDiagonals_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() InteriorAngleFromSidesAndDiagonals(5, 3, 100, 1))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() InteriorAngleFromSidesAndDiagonals(5, 3, 100, 1))
         End Sub
 
         <TestMethod>
         Public Sub Guards_AreaFromVertices_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() AreaFromVertices(New PointF() {New PointF(0, 0), New PointF(1, 1)}))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() AreaFromVertices(New PointF() {New PointF(0, 0), New PointF(1, 1)}))
         End Sub
 
         <TestMethod>
         Public Sub Guards_IsParallelogramFromVertices_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() IsParallelogramFromVertices(New PointF() {New PointF(0, 0), New PointF(1, 0), New PointF(1, 1)}))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() IsParallelogramFromVertices(New PointF() {New PointF(0, 0), New PointF(1, 0), New PointF(1, 1)}))
         End Sub
 
     End Class
diff --git a/GeometryTests/TwoDimensional/PolygonTests.vb b/GeometryTests/TwoDimensional/PolygonTests.vb
index 2588730..0fcd0e9 100644
--- a/GeometryTests/TwoDimensional/PolygonTests.vb
+++ b/GeometryTests/TwoDimensional/PolygonTests.vb
@@ -115,7 +115,7 @@ Namespace TwoDimensional.Tests
         <TestMethod>
         Public Sub Guards_Area_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() Area(New PointF() {New PointF(0, 0), New PointF(1, 1)}))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() Area(New PointF() {New PointF(0, 0), New PointF(1, 1)}))
         End Sub
 
         <TestMethod>
@@ -127,7 +127,7 @@ Namespace TwoDimensional.Tests
                 New PointF(0, 1)
             }
 
-            Assert.ThrowsException(Of ArgumentException)(Sub() IsConvex(points, 0))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() IsConvex(points, 0))
         End Sub
 
         <TestMethod>
@@ -139,7 +139,7 @@ Namespace TwoDimensional.Tests
                 New PointF(2, 2)
             }
 
-            Assert.ThrowsException(Of ArgumentException)(Sub() Centroid(collinear))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() Centroid(collinear))
         End Sub
 
     End Class
diff --git a/GeometryTests/TwoDimensional/RegularPolygonTests.vb b/GeometryTests/TwoDimensional/RegularPolygonTests.vb
index e323b62..b213c1e 100644
--- a/GeometryTests/TwoDimensional/RegularPolygonTests.vb
+++ b/GeometryTests/TwoDimensional/RegularPolygonTests.vb
@@ -70,14 +70,14 @@ Namespace TwoDimensional.Tests
         <TestMethod>
         Public Sub Guards_Area_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() Area(-1, 5))
-            Assert.ThrowsException(Of ArgumentException)(Sub() Area(1, 2))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() Area(-1, 5))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() Area(1, 2))
         End Sub
 
         <TestMethod>
         Public Sub Guards_IsRegularFromVertices_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() IsRegularFromVertices(New PointF() {New PointF(0, 0), New PointF(1, 0)}))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() IsRegularFromVertices(New PointF() {New PointF(0, 0), New PointF(1, 0)}))
         End Sub
 
     End Class
diff --git a/GeometryTests/TwoDimensional/RhombusTests.vb b/GeometryTests/TwoDimensional/RhombusTests.vb
index 398cad8..d79ca7f 100644
--- a/GeometryTests/TwoDimensional/RhombusTests.vb
+++ b/GeometryTests/TwoDimensional/RhombusTests.vb
@@ -58,19 +58,19 @@ Namespace TwoDimensional.Tests
         <TestMethod>
         Public Sub Guards_AreaFromBaseHeight_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() AreaFromBaseHeight(-1, 2))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() AreaFromBaseHeight(-1, 2))
         End Sub
 
         <TestMethod>
         Public Sub Guards_DiagonalFromSideAndAngle_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() DiagonalFromSideAndAngle(4, 0))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() DiagonalFromSideAndAngle(4, 0))
         End Sub
 
         <TestMethod>
         Public Sub Guards_IsRhombusFromVertices_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() IsRhombusFromVertices(New PointF() {New PointF(0, 0), New PointF(1, 0), New PointF(1, 1)}))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() IsRhombusFromVertices(New PointF() {New PointF(0, 0), New PointF(1, 0), New PointF(1, 1)}))
         End Sub
 
     End Class
diff --git a/GeometryTests/TwoDimensional/SquareTests.vb b/GeometryTests/TwoDimensional/SquareTests.vb
index 2c52365..d0a6ce7 100644
--- a/GeometryTests/TwoDimensional/SquareTests.vb
+++ b/GeometryTests/TwoDimensional/SquareTests.vb
@@ -56,13 +56,13 @@ Namespace TwoDimensional.Tests
         <TestMethod>
         Public Sub Guards_Area_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() Area(-1))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() Area(-1))
         End Sub
 
         <TestMethod>
         Public Sub Guards_IsSquareFromVertices_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() IsSquareFromVertices(New PointF() {New PointF(0, 0), New PointF(1, 0), New PointF(1, 1)}))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() IsSquareFromVertices(New PointF() {New PointF(0, 0), New PointF(1, 0), New PointF(1, 1)}))
         End Sub
 
         <TestMethod>
@@ -74,7 +74,7 @@ Namespace TwoDimensional.Tests
                 New PointF(1, 1),
                 New PointF(0, 1)
             }
-            Assert.ThrowsException(Of ArgumentException)(Sub() IsSquareFromVertices(vertices, 0))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() IsSquareFromVertices(vertices, 0))
         End Sub
 
     End Class
diff --git a/GeometryTests/TwoDimensional/TrapezoidTests.vb b/GeometryTests/TwoDimensional/TrapezoidTests.vb
index 009c8ac..6e04e15 100644
--- a/GeometryTests/TwoDimensional/TrapezoidTests.vb
+++ b/GeometryTests/TwoDimensional/TrapezoidTests.vb
@@ -53,25 +53,25 @@ Namespace TwoDimensional.Tests
         <TestMethod>
         Public Sub Guards_Area_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() Area(-1, 4, 3))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() Area(-1, 4, 3))
         End Sub
 
         <TestMethod>
         Public Sub Guards_HeightFromArea_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() HeightFromArea(10, 0, 0))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() HeightFromArea(10, 0, 0))
         End Sub
 
         <TestMethod>
         Public Sub Guards_IsIsosceles_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() IsIsosceles(5, 5, 0))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() IsIsosceles(5, 5, 0))
         End Sub
 
         <TestMethod>
         Public Sub Guards_AreaFromVertices_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() AreaFromVertices(New PointF() {New PointF(0, 0), New PointF(1, 0), New PointF(1, 1)}))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() AreaFromVertices(New PointF() {New PointF(0, 0), New PointF(1, 0), New PointF(1, 1)}))
         End Sub
 
     End Class
diff --git a/GeometryTests/TwoDimensional/TriangleTests.vb b/GeometryTests/TwoDimensional/TriangleTests.vb
index 5c324f9..664dd19 100644
--- a/GeometryTests/TwoDimensional/TriangleTests.vb
+++ b/GeometryTests/TwoDimensional/TriangleTests.vb
@@ -74,25 +74,25 @@ Namespace TwoDimensional.Tests
         <TestMethod>
         Public Sub Guards_Perimeter_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() Perimeter(1, 2, 3))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() Perimeter(1, 2, 3))
         End Sub
 
         <TestMethod>
         Public Sub Guards_HeightFromArea_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() HeightFromArea(2, 0))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() HeightFromArea(2, 0))
         End Sub
 
         <TestMethod>
         Public Sub Guards_AngleFromSides_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() AngleFromSides(10, 1, 1))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() AngleFromSides(10, 1, 1))
         End Sub
 
         <TestMethod>
         Public Sub Guards_AreaFromVertices_Throws_Test()
             ' Führt den Testfall aus und prüft das erwartete Ergebnis.
-            Assert.ThrowsException(Of ArgumentException)(Sub() AreaFromVertices(New PointF() {New PointF(0, 0), New PointF(1, 1)}))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() AreaFromVertices(New PointF() {New PointF(0, 0), New PointF(1, 1)}))
         End Sub
 
         <TestMethod>
@@ -104,7 +104,7 @@ Namespace TwoDimensional.Tests
                 New PointF(0, 3)
             }
 
-            Assert.ThrowsException(Of ArgumentException)(Sub() IsValidTriangleFromVertices(vertices, 0))
+            Assert.ThrowsExactly(Of ArgumentException)(Sub() IsValidTriangleFromVertices(vertices, 0))
         End Sub
 
     End Class