diff --git a/src/UnitTests/LinearAlgebraTests/Complex/VectorArithmeticTheory.cs b/src/UnitTests/LinearAlgebraTests/Complex/VectorArithmeticTheory.cs
index b2379410..5b24e634 100644
--- a/src/UnitTests/LinearAlgebraTests/Complex/VectorArithmeticTheory.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/VectorArithmeticTheory.cs
@@ -47,7 +47,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 
             Assert.That(vector.GetHashCode(), Is.EqualTo(hash));
             Assert.That(result, Is.Not.SameAs(vector));
-            Assert.That(result, Is.EqualTo(vector));
+            Assert.That(result.Equals(vector));
         }
 
         [Theory, Timeout(100)]
@@ -59,11 +59,11 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 
             Assert.That(vector.GetHashCode(), Is.EqualTo(hash));
             Assert.That(result, Is.Not.SameAs(vector));
-            Assert.That(-result, Is.EqualTo(vector));
+            Assert.That((-result).Equals(vector));
 
             for (var i = 0; i < Math.Min(vector.Count, 20); i++)
             {
-                Assert.That(result[i], Is.EqualTo(-vector[i]));
+                Assert.That(result[i], Is.EqualTo(-vector[i]), i.ToString());
             }
         }
 
@@ -84,7 +84,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 
             for (var i = 0; i < Math.Min(a.Count, 20); i++)
             {
-                Assert.That(result[i], Is.EqualTo(a[i] + b[i]));
+                Assert.That(result[i], Is.EqualTo(a[i] + b[i]), i.ToString());
             }
         }
 
@@ -106,7 +106,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 
             for (var i = 0; i < Math.Min(a.Count, 20); i++)
             {
-                Assert.That(result[i], Is.EqualTo(a[i] + b[i]));
+                Assert.That(result[i], Is.EqualTo(a[i] + b[i]), i.ToString());
             }
         }
 
@@ -127,7 +127,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 
             for (var i = 0; i < Math.Min(a.Count, 20); i++)
             {
-                Assert.That(result[i], Is.EqualTo(a[i] - b[i]));
+                Assert.That(result[i], Is.EqualTo(a[i] - b[i]), i.ToString());
             }
         }
 
@@ -149,7 +149,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 
             for (var i = 0; i < Math.Min(a.Count, 20); i++)
             {
-                Assert.That(result[i], Is.EqualTo(a[i] - b[i]));
+                Assert.That(result[i], Is.EqualTo(a[i] - b[i]), i.ToString());
             }
         }
     }
diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/VectorArithmeticTheory.cs b/src/UnitTests/LinearAlgebraTests/Complex32/VectorArithmeticTheory.cs
index 4f102e3d..3f1def91 100644
--- a/src/UnitTests/LinearAlgebraTests/Complex32/VectorArithmeticTheory.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex32/VectorArithmeticTheory.cs
@@ -47,7 +47,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
 
             Assert.That(vector.GetHashCode(), Is.EqualTo(hash));
             Assert.That(result, Is.Not.SameAs(vector));
-            Assert.That(result, Is.EqualTo(vector));
+            Assert.That(result.Equals(vector));
         }
 
         [Theory, Timeout(100)]
@@ -59,11 +59,11 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
 
             Assert.That(vector.GetHashCode(), Is.EqualTo(hash));
             Assert.That(result, Is.Not.SameAs(vector));
-            Assert.That(-result, Is.EqualTo(vector));
+            Assert.That((-result).Equals(vector));
 
             for (var i = 0; i < Math.Min(vector.Count, 20); i++)
             {
-                Assert.That(result[i], Is.EqualTo(-vector[i]));
+                Assert.That(result[i], Is.EqualTo(-vector[i]), i.ToString());
             }
         }
 
@@ -84,7 +84,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
 
             for (var i = 0; i < Math.Min(a.Count, 20); i++)
             {
-                Assert.That(result[i], Is.EqualTo(a[i] + b[i]));
+                Assert.That(result[i], Is.EqualTo(a[i] + b[i]), i.ToString());
             }
         }
 
@@ -106,7 +106,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
 
             for (var i = 0; i < Math.Min(a.Count, 20); i++)
             {
-                Assert.That(result[i], Is.EqualTo(a[i] + b[i]));
+                Assert.That(result[i], Is.EqualTo(a[i] + b[i]), i.ToString());
             }
         }
 
@@ -127,7 +127,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
 
             for (var i = 0; i < Math.Min(a.Count, 20); i++)
             {
-                Assert.That(result[i], Is.EqualTo(a[i] - b[i]));
+                Assert.That(result[i], Is.EqualTo(a[i] - b[i]), i.ToString());
             }
         }
 
@@ -149,7 +149,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
 
             for (var i = 0; i < Math.Min(a.Count, 20); i++)
             {
-                Assert.That(result[i], Is.EqualTo(a[i] - b[i]));
+                Assert.That(result[i], Is.EqualTo(a[i] - b[i]), i.ToString());
             }
         }
     }
diff --git a/src/UnitTests/LinearAlgebraTests/Double/VectorArithmeticTheory.cs b/src/UnitTests/LinearAlgebraTests/Double/VectorArithmeticTheory.cs
index e96d7fbd..4af0b317 100644
--- a/src/UnitTests/LinearAlgebraTests/Double/VectorArithmeticTheory.cs
+++ b/src/UnitTests/LinearAlgebraTests/Double/VectorArithmeticTheory.cs
@@ -37,7 +37,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
     [TestFixture]
     public abstract class VectorArithmeticTheory
     {
-        [Theory, Timeout(100)]
+        [Theory] //, Timeout(100)]
         public void CanCallUnaryPlusOperatorOnVector(Vector<double> vector)
         {
             var hash = vector.GetHashCode();
@@ -46,7 +46,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
 
             Assert.That(vector.GetHashCode(), Is.EqualTo(hash));
             Assert.That(result, Is.Not.SameAs(vector));
-            Assert.That(result, Is.EqualTo(vector));
+            Assert.That(result.Equals(vector));
         }
 
         [Theory, Timeout(100)]
@@ -58,11 +58,11 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
 
             Assert.That(vector.GetHashCode(), Is.EqualTo(hash));
             Assert.That(result, Is.Not.SameAs(vector));
-            Assert.That(-result, Is.EqualTo(vector));
+            Assert.That((-result).Equals(vector));
 
             for (var i = 0; i < Math.Min(vector.Count, 20); i++)
             {
-                Assert.That(result[i], Is.EqualTo(-vector[i]));
+                Assert.That(result[i], Is.EqualTo(-vector[i]), i.ToString());
             }
         }
 
@@ -83,7 +83,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
 
             for (var i = 0; i < Math.Min(a.Count, 20); i++)
             {
-                Assert.That(result[i], Is.EqualTo(a[i] + b[i]));
+                Assert.That(result[i], Is.EqualTo(a[i] + b[i]), i.ToString());
             }
         }
 
@@ -105,7 +105,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
 
             for (var i = 0; i < Math.Min(a.Count, 20); i++)
             {
-                Assert.That(result[i], Is.EqualTo(a[i] + b[i]));
+                Assert.That(result[i], Is.EqualTo(a[i] + b[i]), i.ToString());
             }
         }
 
@@ -126,7 +126,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
 
             for (var i = 0; i < Math.Min(a.Count, 20); i++)
             {
-                Assert.That(result[i], Is.EqualTo(a[i] - b[i]));
+                Assert.That(result[i], Is.EqualTo(a[i] - b[i]), i.ToString());
             }
         }
 
@@ -148,7 +148,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
 
             for (var i = 0; i < Math.Min(a.Count, 20); i++)
             {
-                Assert.That(result[i], Is.EqualTo(a[i] - b[i]));
+                Assert.That(result[i], Is.EqualTo(a[i] - b[i]), i.ToString());
             }
         }
     }
diff --git a/src/UnitTests/LinearAlgebraTests/Single/VectorArithmeticTheory.cs b/src/UnitTests/LinearAlgebraTests/Single/VectorArithmeticTheory.cs
index f46d6d0e..56c4f8c5 100644
--- a/src/UnitTests/LinearAlgebraTests/Single/VectorArithmeticTheory.cs
+++ b/src/UnitTests/LinearAlgebraTests/Single/VectorArithmeticTheory.cs
@@ -46,7 +46,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single
 
             Assert.That(vector.GetHashCode(), Is.EqualTo(hash));
             Assert.That(result, Is.Not.SameAs(vector));
-            Assert.That(result, Is.EqualTo(vector));
+            Assert.That(result.Equals(vector));
         }
 
         [Theory, Timeout(100)]
@@ -58,11 +58,11 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single
 
             Assert.That(vector.GetHashCode(), Is.EqualTo(hash));
             Assert.That(result, Is.Not.SameAs(vector));
-            Assert.That(-result, Is.EqualTo(vector));
+            Assert.That((-result).Equals(vector));
 
             for (var i = 0; i < Math.Min(vector.Count, 20); i++)
             {
-                Assert.That(result[i], Is.EqualTo(-vector[i]));
+                Assert.That(result[i], Is.EqualTo(-vector[i]), i.ToString());
             }
         }
 
@@ -83,7 +83,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single
 
             for (var i = 0; i < Math.Min(a.Count, 20); i++)
             {
-                Assert.That(result[i], Is.EqualTo(a[i] + b[i]));
+                Assert.That(result[i], Is.EqualTo(a[i] + b[i]), i.ToString());
             }
         }
 
@@ -105,7 +105,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single
 
             for (var i = 0; i < Math.Min(a.Count, 20); i++)
             {
-                Assert.That(result[i], Is.EqualTo(a[i] + b[i]));
+                Assert.That(result[i], Is.EqualTo(a[i] + b[i]), i.ToString());
             }
         }
 
@@ -126,7 +126,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single
 
             for (var i = 0; i < Math.Min(a.Count, 20); i++)
             {
-                Assert.That(result[i], Is.EqualTo(a[i] - b[i]));
+                Assert.That(result[i], Is.EqualTo(a[i] - b[i]), i.ToString());
             }
         }
 
@@ -148,7 +148,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single
 
             for (var i = 0; i < Math.Min(a.Count, 20); i++)
             {
-                Assert.That(result[i], Is.EqualTo(a[i] - b[i]));
+                Assert.That(result[i], Is.EqualTo(a[i] - b[i]), i.ToString());
             }
         }
     }