diff --git a/UnitsNet.Tests/LinearQuantityExtensionsTest.cs b/UnitsNet.Tests/LinearQuantityExtensionsTest.cs
index 55305f4c7d..0f24f1b316 100644
--- a/UnitsNet.Tests/LinearQuantityExtensionsTest.cs
+++ b/UnitsNet.Tests/LinearQuantityExtensionsTest.cs
@@ -73,7 +73,7 @@ public void Equals_WithNullOther_ReturnsFalse()
         Assert.False(result);
     }
     
-    [Fact(Skip = "Currently throws a NotImplementedException")]
+    [Fact(Skip = "Currently throws a StackOverflowException")]
     public void Equals_TQuantity_WithUnknownUnits_ThrowsUnitNotFoundException()
     {
         var quantity = Length.FromMeters(1);
@@ -83,7 +83,7 @@ public void Equals_TQuantity_WithUnknownUnits_ThrowsUnitNotFoundException()
         Assert.Throws<UnitNotFoundException>(() => quantity.Equals(quantity, invalidQuantity));
     }
 
-    [Fact(Skip = "Currently throws a NotImplementedException")]
+    [Fact(Skip = "Currently throws a StackOverflowException")]
     public void Equals_IQuantity_WithUnknownUnits_ThrowsUnitNotFoundException()
     {
         var quantity = Length.FromMeters(1);
diff --git a/UnitsNet.Tests/LogarithmicQuantityExtensionsTest.cs b/UnitsNet.Tests/LogarithmicQuantityExtensionsTest.cs
index a77ae31b8c..3407d45ea0 100644
--- a/UnitsNet.Tests/LogarithmicQuantityExtensionsTest.cs
+++ b/UnitsNet.Tests/LogarithmicQuantityExtensionsTest.cs
@@ -52,7 +52,7 @@ public void Equals_NullQuantity_ReturnsFalse()
         Assert.False(quantity.Equals(null, tolerance));
     }
     
-    [Fact(Skip = "Currently throws a NotImplementedException")]
+    [Fact(Skip = "Currently throws a StackOverflowException")]
     public void Equals_TQuantity_WithUnknownUnits_ThrowsUnitNotFoundException()
     {
         var quantity = PowerRatio.FromDecibelWatts(1);
@@ -62,7 +62,7 @@ public void Equals_TQuantity_WithUnknownUnits_ThrowsUnitNotFoundException()
         Assert.Throws<UnitNotFoundException>(() => quantity.Equals(quantity, invalidQuantity));
     }
     
-    [Fact(Skip = "Currently throws a NotImplementedException")]
+    [Fact(Skip = "Currently throws a StackOverflowException")]
     public void Equals_IQuantity_WithUnknownUnits_ThrowsUnitNotFoundException()
     {
         var quantity = PowerRatio.FromDecibelWatts(1);
diff --git a/UnitsNet/ExceptionHelper.cs b/UnitsNet/Exceptions/ExceptionHelper.cs
similarity index 100%
rename from UnitsNet/ExceptionHelper.cs
rename to UnitsNet/Exceptions/ExceptionHelper.cs