diff --git a/Source/AssertHelper.Test.cs b/Source/AssertHelper.Test.cs
index 0b3c4d9..6800050 100644
--- a/Source/AssertHelper.Test.cs
+++ b/Source/AssertHelper.Test.cs
@@ -64,7 +64,7 @@ namespace Nuclex.Support {
     [Test]
     public void TestAlmostEqualWithDoubles() {
       AssertHelper.AreAlmostEqual(exactDouble, minusOneDouble, 1);
-      AssertHelper.AreAlmostEqual(exactDouble, minusOneDouble, 1);
+      AssertHelper.AreAlmostEqual(exactDouble, plusOneDouble, 1);
     }
 
     /// <summary>
diff --git a/Source/Shared.Test.cs b/Source/Shared.Test.cs
index a1e94e5..17b59e4 100644
--- a/Source/Shared.Test.cs
+++ b/Source/Shared.Test.cs
@@ -58,9 +58,7 @@ namespace Nuclex.Support {
       //
       // Maybe this really is a defect in Shared<> and the class should be equipped with
       // a method such as Discard() or Dispose() to get rid of the instance?
-      Assert.IsTrue(
-        ReferenceEquals(dummyInstance, otherDummyInstance)
-      );
+      Assert.AreSame(dummyInstance, otherDummyInstance);
     }
 
   }
diff --git a/Source/WeakReference.cs b/Source/WeakReference.cs
index 520c8dd..a8f3aba 100644
--- a/Source/WeakReference.cs
+++ b/Source/WeakReference.cs
@@ -33,7 +33,7 @@ namespace Nuclex.Support {
     where ReferencedType : class {
 
     /// <summary>
-    ///   Initializes a new instance of the System.WeakReference class, referencing
+    ///   Initializes a new instance of the WeakReference class, referencing
     ///   the specified object.
     /// </summary>
     /// <param name="target">The object to track or null.</param>
@@ -41,7 +41,7 @@ namespace Nuclex.Support {
       : base(target) { }
 
     /// <summary>
-    ///   Initializes a new instance of the System.WeakReference class, referencing
+    ///   Initializes a new instance of the WeakReference class, referencing
     ///   the specified object optionally using resurrection tracking.
     /// </summary>
     /// <param name="target">An object to track.</param>
@@ -53,7 +53,7 @@ namespace Nuclex.Support {
       : base(target, trackResurrection) { }
 
     /// <summary>
-    ///   Initializes a new instance of the System.WeakReference class, using deserialized
+    ///   Initializes a new instance of the WeakReference class, using deserialized
     ///   data from the specified serialization and stream objects.
     /// </summary>
     /// <param name="info">
@@ -71,7 +71,7 @@ namespace Nuclex.Support {
       : base(info, context) { }
 
     /// <summary>
-    ///   Gets or sets the object (the target) referenced by the current System.WeakReference
+    ///   Gets or sets the object (the target) referenced by the current WeakReference
     ///   object.
     /// </summary>
     /// <remarks>