diff --git a/src/ImageSharp/Colors/Spaces/YCbCr.cs b/src/ImageSharp/Colors/Spaces/YCbCr.cs
index f5bf2bdf9..ef9f4462b 100644
--- a/src/ImageSharp/Colors/Spaces/YCbCr.cs
+++ b/src/ImageSharp/Colors/Spaces/YCbCr.cs
@@ -51,19 +51,19 @@ namespace ImageSharp.Colors.Spaces
         /// Gets the Y luminance component.
         /// <remarks>A value ranging between 0 and 255.</remarks>
         /// </summary>
-        public float Y => this.backingVector.X;
+        public byte Y => (byte)this.backingVector.X;
 
         /// <summary>
         /// Gets the Cb chroma component.
         /// <remarks>A value ranging between 0 and 255.</remarks>
         /// </summary>
-        public float Cb => this.backingVector.Y;
+        public byte Cb => (byte)this.backingVector.Y;
 
         /// <summary>
         /// Gets the Cr chroma component.
         /// <remarks>A value ranging between 0 and 255.</remarks>
         /// </summary>
-        public float Cr => this.backingVector.Z;
+        public byte Cr => (byte)this.backingVector.Z;
 
         /// <summary>
         /// Gets a value indicating whether this <see cref="YCbCr"/> is empty.
diff --git a/tests/ImageSharp.Tests/Colors/ColorConversionTests.cs b/tests/ImageSharp.Tests/Colors/ColorConversionTests.cs
index 488455752..9ed1c67a7 100644
--- a/tests/ImageSharp.Tests/Colors/ColorConversionTests.cs
+++ b/tests/ImageSharp.Tests/Colors/ColorConversionTests.cs
@@ -48,24 +48,6 @@ namespace ImageSharp.Tests
             Assert.Equal(128, yCbCr3.Y);
             Assert.Equal(128, yCbCr3.Cb);
             Assert.Equal(128, yCbCr3.Cr);
-
-            //Assert.Equal(255, yCbCr.Y, 0);
-            //Assert.Equal(128, yCbCr.Cb, 0);
-            //Assert.Equal(128, yCbCr.Cr, 0);
-
-            //// Black
-            //Color color2 = Color.Black;
-            //YCbCr yCbCr2 = color2;
-            //Assert.Equal(0, yCbCr2.Y, 0);
-            //Assert.Equal(128, yCbCr2.Cb, 0);
-            //Assert.Equal(128, yCbCr2.Cr, 0);
-
-            //// Gray
-            //Color color3 = Color.Gray;
-            //YCbCr yCbCr3 = color3;
-            //Assert.Equal(128, yCbCr3.Y, 0);
-            //Assert.Equal(128, yCbCr3.Cb, 0);
-            //Assert.Equal(128, yCbCr3.Cr, 0);
         }
 
         /// <summary>
@@ -106,7 +88,7 @@ namespace ImageSharp.Tests
 
         /// <summary>
         /// Tests the implicit conversion from <see cref="Color"/> to <see cref="CieXyz"/>.
-        /// Comparison values obtained from 
+        /// Comparison values obtained from
         /// http://colormine.org/convert/rgb-to-xyz
         /// </summary>
         [Fact]
@@ -144,7 +126,7 @@ namespace ImageSharp.Tests
 
         /// <summary>
         /// Tests the implicit conversion from <see cref="CieXyz"/> to <see cref="Color"/>.
-        /// Comparison values obtained from 
+        /// Comparison values obtained from
         /// http://colormine.org/convert/rgb-to-xyz
         /// </summary>
         [Fact]
@@ -430,7 +412,7 @@ namespace ImageSharp.Tests
 
         /// <summary>
         /// Tests the implicit conversion from <see cref="Color"/> to <see cref="CieLab"/>.
-        /// Comparison values obtained from 
+        /// Comparison values obtained from
         /// http://colormine.org/convert/rgb-to-lab
         /// </summary>
         [Fact]
@@ -469,7 +451,7 @@ namespace ImageSharp.Tests
         /// <summary>
         /// Tests the implicit conversion from <see cref="CieLab"/> to <see cref="Color"/>.
         /// </summary>
-        /// Comparison values obtained from 
+        /// Comparison values obtained from
         /// http://colormine.org/convert/rgb-to-lab
         [Fact]
         public void CieLabToColor()