Index: Core/Common/test/Core.Common.TestUtil/EqualsGuidelinesTestFixture.cs
===================================================================
diff -u -re318f8ad1ae9ff8fabdb362d27e3db320af91ac0 -rd3ce0693ae43ed2434ba16480ff1659fbe49f0a9
--- Core/Common/test/Core.Common.TestUtil/EqualsGuidelinesTestFixture.cs	(.../EqualsGuidelinesTestFixture.cs)	(revision e318f8ad1ae9ff8fabdb362d27e3db320af91ac0)
+++ Core/Common/test/Core.Common.TestUtil/EqualsGuidelinesTestFixture.cs	(.../EqualsGuidelinesTestFixture.cs)	(revision d3ce0693ae43ed2434ba16480ff1659fbe49f0a9)
@@ -72,7 +72,7 @@
         }
 
         [Test]
-        public void Equals_ToItself_ReturnsTrue()
+        public void Equals_ToSameReference_ReturnsTrue()
         {
             // Setup
             T item1 = CreateObject();
@@ -88,6 +88,19 @@
         }
 
         [Test]
+        public void Equals_ToItself_ReturnsTrue()
+        {
+            // Setup
+            T item = CreateObject();
+
+            // Call
+            bool itemEqualToItself = item.Equals(item);
+
+            // Assert
+            Assert.IsTrue(itemEqualToItself);
+        }
+
+        [Test]
         public void Equals_ToDifferentObject_ReturnsFalse()
         {
             // Setup
Index: Core/Common/test/Core.Common.Utils.Test/FileFilterGeneratorTest.cs
===================================================================
diff -u -r677ec9937ae7eff73a09bf937804ad22e0dc5a4b -rd3ce0693ae43ed2434ba16480ff1659fbe49f0a9
--- Core/Common/test/Core.Common.Utils.Test/FileFilterGeneratorTest.cs	(.../FileFilterGeneratorTest.cs)	(revision 677ec9937ae7eff73a09bf937804ad22e0dc5a4b)
+++ Core/Common/test/Core.Common.Utils.Test/FileFilterGeneratorTest.cs	(.../FileFilterGeneratorTest.cs)	(revision d3ce0693ae43ed2434ba16480ff1659fbe49f0a9)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 
@@ -117,91 +118,35 @@
             Assert.AreEqual($"{description} (*.{extension})|*.{extension}", generator.Filter);
         }
 
-        [Test]
-        public void Equals_WithNull_ReturnsFalse()
+        [TestFixture]
+        private class FileFilterGeneratorEqualsTest : EqualsGuidelinesTestFixture<FileFilterGenerator, DerivedFileFilterGenerator>
         {
-            // Setup
-            var generator = new FileFilterGenerator("txt", "descriptionA");
+            private const string description = "description";
+            private const string extension = "txt";
 
-            // Call
-            bool result = generator.Equals(null);
+            protected override FileFilterGenerator CreateObject()
+            {
+                return new FileFilterGenerator(extension, description);
+            }
 
-            // Assert
-            Assert.IsFalse(result);
-        }
+            protected override DerivedFileFilterGenerator CreateDerivedObject()
+            {
+                return new DerivedFileFilterGenerator(extension, description);
+            }
 
-        [Test]
-        public void Equals_DifferentType_ReturnsFalse()
-        {
-            // Setup
-            var generator = new FileFilterGenerator("txt", "descriptionA");
-
-            // Call
-            bool result = generator.Equals(new object());
-
-            // Assert
-            Assert.IsFalse(result);
+            private static IEnumerable<TestCaseData> GetUnequalTestCases()
+            {
+                yield return new TestCaseData(new FileFilterGenerator("ext", description))
+                    .SetName("Extension");
+                yield return new TestCaseData(new FileFilterGenerator(extension, "Different Description"))
+                    .SetName("Description");
+            }
         }
 
-        [Test]
-        [TestCaseSource(nameof(GeneratorCombinations))]
-        public void Equals_DifferentScenarios_ReturnsExpectedResult(FileFilterGenerator generator,
-                                                                    FileFilterGenerator otherGenerator,
-                                                                    bool expectedEqual)
+        private class DerivedFileFilterGenerator : FileFilterGenerator
         {
-            // Call
-            bool areEqualOne = generator.Equals(otherGenerator);
-            bool areEqualTwo = otherGenerator.Equals(generator);
-
-            // Assert
-            Assert.AreEqual(expectedEqual, areEqualOne);
-            Assert.AreEqual(expectedEqual, areEqualTwo);
+            public DerivedFileFilterGenerator(string extension, string description)
+                : base(extension, description) {}
         }
-
-        [Test]
-        public void GetHashCode_FiltersAreEqual_FiltersHashesEqual()
-        {
-            // Setup
-            const string extension = "txt";
-            const string description = "text files";
-
-            var generator = new FileFilterGenerator(extension, description);
-            var otherGenerator = new FileFilterGenerator(extension, description);
-
-            // Call
-            int result = generator.GetHashCode();
-            int otherResult = otherGenerator.GetHashCode();
-
-            // Assert
-            Assert.AreEqual(result, otherResult);
-        }
-
-        private static TestCaseData[] GeneratorCombinations()
-        {
-            var generatorA = new FileFilterGenerator("txt", "descriptionA");
-            var generatorB = new FileFilterGenerator("txt", "descriptionA");
-            var generatorC = new FileFilterGenerator("ext", "descriptionA");
-            var generatorD = new FileFilterGenerator("txt", "descriptionB");
-
-            return new[]
-            {
-                new TestCaseData(generatorA, generatorA, true)
-                {
-                    TestName = "Equals_FileFilterGeneratorAFileFilterGeneratorA_True"
-                },
-                new TestCaseData(generatorA, generatorB, true)
-                {
-                    TestName = "Equals_FileFilterGeneratorAFileFilterGeneratorB_True"
-                },
-                new TestCaseData(generatorB, generatorC, false)
-                {
-                    TestName = "Equals_FileFilterGeneratorBFileFilterGeneratorC_False"
-                },
-                new TestCaseData(generatorA, generatorD, false)
-                {
-                    TestName = "Equals_FileFilterGeneratorAFileFilterGeneratorD_False"
-                }
-            };
-        }
     }
 }
\ No newline at end of file