diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/RgbWorkingSpace.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/RgbWorkingSpace.cs
index 8283201b5..a7b63d657 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/RgbWorkingSpace.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/RgbWorkingSpace.cs
@@ -6,10 +6,10 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSap
     /// <summary>
     /// Trivial implementation of <see cref="IRgbWorkingSpace"/>
     /// </summary>
-    internal struct RgbWorkingSpace : IRgbWorkingSpace
+    internal class RgbWorkingSpace : IRgbWorkingSpace
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="RgbWorkingSpace"/> struct.
+        /// Initializes a new instance of the <see cref="RgbWorkingSpace"/> class.
         /// </summary>
         /// <param name="referenceWhite">The reference white point.</param>
         /// <param name="companding">The function pair for converting to <see cref="CieXyz"/> and back.</param>
@@ -84,11 +84,10 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSap
         /// <inheritdoc/>
         public bool Equals(IRgbWorkingSpace other)
         {
+            // This should be refactored as separate classes with different companding implementations.
             return this.WhitePoint.Equals(other.WhitePoint)
-                && this.ChromaticityCoordinates.Equals(other.ChromaticityCoordinates);
-
-            // TODO: This should be refactored as separate classes with different companding implementations.
-            // && Equals(this.Companding, other.Companding);
+                && this.ChromaticityCoordinates.Equals(other.ChromaticityCoordinates)
+                && Equals(this.Companding, other.Companding);
         }
 
         /// <inheritdoc/>
diff --git a/tests/ImageSharp.Tests/Colorspaces/RgbAndCieXyzConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/RgbAndCieXyzConversionTest.cs
index 24958e375..0293811fb 100644
--- a/tests/ImageSharp.Tests/Colorspaces/RgbAndCieXyzConversionTest.cs
+++ b/tests/ImageSharp.Tests/Colorspaces/RgbAndCieXyzConversionTest.cs
@@ -40,8 +40,7 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces
             Rgb output = converter.ToRgb(input);
 
             // Assert
-            // TODO: Enable next line
-            // Assert.Equal(Rgb.DefaultWorkingSpace, output.WorkingSpace);
+            Assert.Equal(Rgb.DefaultWorkingSpace, output.WorkingSpace);
             Assert.Equal(r, output.R, FloatRoundingComparer);
             Assert.Equal(g, output.G, FloatRoundingComparer);
             Assert.Equal(b, output.B, FloatRoundingComparer);
diff --git a/tests/ImageSharp.Tests/Colorspaces/RgbAndCmykConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/RgbAndCmykConversionTest.cs
index b08071dc7..6c3d579b4 100644
--- a/tests/ImageSharp.Tests/Colorspaces/RgbAndCmykConversionTest.cs
+++ b/tests/ImageSharp.Tests/Colorspaces/RgbAndCmykConversionTest.cs
@@ -38,8 +38,7 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces
             Rgb output = Converter.ToRgb(input);
 
             // Assert
-            // TODO: Enable next line
-            // Assert.Equal(Rgb.DefaultWorkingSpace, output.WorkingSpace);
+            Assert.Equal(Rgb.DefaultWorkingSpace, output.WorkingSpace);
             Assert.Equal(r, output.R, FloatRoundingComparer);
             Assert.Equal(g, output.G, FloatRoundingComparer);
             Assert.Equal(b, output.B, FloatRoundingComparer);
diff --git a/tests/ImageSharp.Tests/Colorspaces/RgbAndHslConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/RgbAndHslConversionTest.cs
index e1f32e5c5..a7071e883 100644
--- a/tests/ImageSharp.Tests/Colorspaces/RgbAndHslConversionTest.cs
+++ b/tests/ImageSharp.Tests/Colorspaces/RgbAndHslConversionTest.cs
@@ -41,8 +41,7 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces
             Rgb output = Converter.ToRgb(input);
 
             // Assert
-            // TODO: Enable next line
-            // Assert.Equal(Rgb.DefaultWorkingSpace, output.WorkingSpace);
+            Assert.Equal(Rgb.DefaultWorkingSpace, output.WorkingSpace);
             Assert.Equal(r, output.R, FloatRoundingComparer);
             Assert.Equal(g, output.G, FloatRoundingComparer);
             Assert.Equal(b, output.B, FloatRoundingComparer);
diff --git a/tests/ImageSharp.Tests/Colorspaces/RgbAndHsvConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/RgbAndHsvConversionTest.cs
index 2d9f2fa0f..0dc58a0a3 100644
--- a/tests/ImageSharp.Tests/Colorspaces/RgbAndHsvConversionTest.cs
+++ b/tests/ImageSharp.Tests/Colorspaces/RgbAndHsvConversionTest.cs
@@ -40,8 +40,7 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces
             Rgb output = Converter.ToRgb(input);
 
             // Assert
-            // TODO: Enable next line
-            // Assert.Equal(Rgb.DefaultWorkingSpace, output.WorkingSpace);
+            Assert.Equal(Rgb.DefaultWorkingSpace, output.WorkingSpace);
             Assert.Equal(r, output.R, FloatRoundingComparer);
             Assert.Equal(g, output.G, FloatRoundingComparer);
             Assert.Equal(b, output.B, FloatRoundingComparer);
diff --git a/tests/ImageSharp.Tests/Colorspaces/RgbAndYCbCrConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/RgbAndYCbCrConversionTest.cs
index eb29c6b1e..0eb1f620b 100644
--- a/tests/ImageSharp.Tests/Colorspaces/RgbAndYCbCrConversionTest.cs
+++ b/tests/ImageSharp.Tests/Colorspaces/RgbAndYCbCrConversionTest.cs
@@ -36,8 +36,7 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces
             Rgb output = Converter.ToRgb(input);
 
             // Assert
-            // TODO: Enable next line
-            // Assert.Equal(Rgb.DefaultWorkingSpace, output.WorkingSpace);
+            Assert.Equal(Rgb.DefaultWorkingSpace, output.WorkingSpace);
             Assert.Equal(r, output.R, FloatRoundingComparer);
             Assert.Equal(g, output.G, FloatRoundingComparer);
             Assert.Equal(b, output.B, FloatRoundingComparer);