diff --git a/src/ImageSharp/Formats/Png/PngChunkType.cs b/src/ImageSharp/Formats/Png/PngChunkType.cs
index e41b49066..015f6984d 100644
--- a/src/ImageSharp/Formats/Png/PngChunkType.cs
+++ b/src/ImageSharp/Formats/Png/PngChunkType.cs
@@ -73,6 +73,58 @@ namespace SixLabors.ImageSharp.Formats.Png
         /// either alpha values associated with palette entries (for indexed-color images)
         /// or a single transparent color (for grayscale and true color images).
         /// </summary>
-        Transparency = 0x74524E53U
+        Transparency = 0x74524E53U,
+
+        /// <summary>
+        /// The tIME chunk gives the time of the last image modification (not the time of initial image creation).
+        /// </summary>
+        Time = 0x74494d45,
+
+        /// <summary>
+        /// The bKGD chunk specifies a default background colour to present the image against.
+        /// If there is any other preferred background, either user-specified or part of a larger page (as in a browser),
+        /// the bKGD chunk should be ignored.
+        /// </summary>
+        Background = 0x624b4744,
+
+        /// <summary>
+        /// The iCCP chunk contains a embedded color profile. If the iCCP chunk is present,
+        /// the image samples conform to the colour space represented by the embedded ICC profile as defined by the International Color Consortium.
+        /// </summary>
+        EmbeddedColorProfile = 0x69434350,
+
+        /// <summary>
+        /// The sBIT chunk defines the original number of significant bits (which can be less than or equal to the sample depth).
+        /// This allows PNG decoders to recover the original data losslessly even if the data had a sample depth not directly supported by PNG.
+        /// </summary>
+        SignificantBits = 0x73424954,
+
+        /// <summary>
+        /// If the sRGB chunk is present, the image samples conform to the sRGB colour space [IEC 61966-2-1] and should be displayed
+        /// using the specified rendering intent defined by the International Color Consortium.
+        /// </summary>
+        StandardRgbColourSpace = 0x73524742,
+
+        /// <summary>
+        /// The hIST chunk gives the approximate usage frequency of each colour in the palette.
+        /// </summary>
+        Histogram = 0x68495354,
+
+        /// <summary>
+        /// The sPLT chunk contains the suggested palette.
+        /// </summary>
+        SuggestedPalette = 0x73504c54,
+
+        /// <summary>
+        /// The cHRM chunk may be used to specify the 1931 CIE x,y chromaticities of the red,
+        /// green, and blue display primaries used in the image, and the referenced white point.
+        /// </summary>
+        Chroma = 0x6348524d,
+
+        /// <summary>
+        /// Malformed chunk named CgBI produced by apple, which is not conform to the specification.
+        /// Related issue is here https://github.com/SixLabors/ImageSharp/issues/410
+        /// </summary>
+        ProprietaryApple = 0x43674249
     }
 }
diff --git a/src/ImageSharp/Formats/Png/PngDecoderCore.cs b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
index 272f93d10..0247dba35 100644
--- a/src/ImageSharp/Formats/Png/PngDecoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
@@ -9,7 +9,7 @@ using System.IO.Compression;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text;
-using SixLabors.ImageSharp.Advanced;
+
 using SixLabors.ImageSharp.Formats.Png.Chunks;
 using SixLabors.ImageSharp.Formats.Png.Filters;
 using SixLabors.ImageSharp.Formats.Png.Zlib;
@@ -215,6 +215,9 @@ namespace SixLabors.ImageSharp.Formats.Png
                             case PngChunkType.End:
                                 this.isEndChunkReached = true;
                                 break;
+                            case PngChunkType.ProprietaryApple:
+                                PngThrowHelper.ThrowInvalidChunkType("Proprietary Apple PNG detected! This PNG file is not conform to the specification and cannot be decoded.");
+                                break;
                         }
                     }
                     finally
@@ -1039,7 +1042,7 @@ namespace SixLabors.ImageSharp.Formats.Png
 
                 var uncompressedBytes = new List<byte>();
 
-                // Note: this uses the a buffer which is only 4 bytes long to read the stream, maybe allocating a larger buffer makes sense here.
+                // Note: this uses a buffer which is only 4 bytes long to read the stream, maybe allocating a larger buffer makes sense here.
                 int bytesRead = inflateStream.CompressedStream.Read(this.buffer, 0, this.buffer.Length);
                 while (bytesRead != 0)
                 {
diff --git a/src/ImageSharp/Formats/Png/PngThrowHelper.cs b/src/ImageSharp/Formats/Png/PngThrowHelper.cs
index dcb643d03..b0a2571ea 100644
--- a/src/ImageSharp/Formats/Png/PngThrowHelper.cs
+++ b/src/ImageSharp/Formats/Png/PngThrowHelper.cs
@@ -20,11 +20,14 @@ namespace SixLabors.ImageSharp.Formats.Png
         [MethodImpl(InliningOptions.ColdPath)]
         public static void ThrowInvalidChunkType() => throw new InvalidImageContentException("Invalid PNG data.");
 
+        [MethodImpl(InliningOptions.ColdPath)]
+        public static void ThrowInvalidChunkType(string message) => throw new InvalidImageContentException(message);
+
         [MethodImpl(InliningOptions.ColdPath)]
         public static void ThrowInvalidChunkCrc(string chunkTypeName) => throw new InvalidImageContentException($"CRC Error. PNG {chunkTypeName} chunk is corrupt!");
 
         [MethodImpl(InliningOptions.ColdPath)]
-        public static void ThrowNotSupportedColor() => new NotSupportedException("Unsupported PNG color type");
+        public static void ThrowNotSupportedColor() => throw new NotSupportedException("Unsupported PNG color type");
 
         [MethodImpl(InliningOptions.ColdPath)]
         public static void ThrowUnknownFilter() => throw new InvalidImageContentException("Unknown filter type.");
diff --git a/src/ImageSharp/Metadata/Profiles/IPTC/IptcProfile.cs b/src/ImageSharp/Metadata/Profiles/IPTC/IptcProfile.cs
index 9206e4377..f138cc650 100644
--- a/src/ImageSharp/Metadata/Profiles/IPTC/IptcProfile.cs
+++ b/src/ImageSharp/Metadata/Profiles/IPTC/IptcProfile.cs
@@ -81,7 +81,7 @@ namespace SixLabors.ImageSharp.Metadata.Profiles.Iptc
         public IptcProfile DeepClone() => new IptcProfile(this);
 
         /// <summary>
-        /// Returns all value with the specified tag.
+        /// Returns all values with the specified tag.
         /// </summary>
         /// <param name="tag">The tag of the iptc value.</param>
         /// <returns>The values found with the specified tag.</returns>
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs
index bb79abf54..6cbdb83fc 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs
@@ -1,10 +1,14 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using System.Collections.Generic;
 using System.IO;
 using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.Metadata;
+using SixLabors.ImageSharp.Metadata.Profiles.Exif;
+using SixLabors.ImageSharp.Metadata.Profiles.Icc;
+using SixLabors.ImageSharp.Metadata.Profiles.Iptc;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
@@ -215,5 +219,70 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 }
             }
         }
+
+        [Fact]
+        public void Encode_PreservesIptcProfile()
+        {
+            // arrange
+            using var input = new Image<Rgba32>(1, 1);
+            input.Metadata.IptcProfile = new IptcProfile();
+            input.Metadata.IptcProfile.SetValue(IptcTag.Byline, "unit_test");
+            var encoder = new JpegEncoder();
+
+            // act
+            using var memStream = new MemoryStream();
+            input.Save(memStream, encoder);
+
+            // assert
+            memStream.Position = 0;
+            using var output = Image.Load<Rgba32>(memStream);
+            IptcProfile actual = output.Metadata.IptcProfile;
+            Assert.NotNull(actual);
+            IEnumerable<IptcValue> values = input.Metadata.IptcProfile.Values;
+            Assert.Equal(values, actual.Values);
+        }
+
+        [Fact]
+        public void Encode_PreservesExifProfile()
+        {
+            // arrange
+            using var input = new Image<Rgba32>(1, 1);
+            input.Metadata.ExifProfile = new ExifProfile();
+            input.Metadata.ExifProfile.SetValue(ExifTag.Software, "unit_test");
+            var encoder = new JpegEncoder();
+
+            // act
+            using var memStream = new MemoryStream();
+            input.Save(memStream, encoder);
+
+            // assert
+            memStream.Position = 0;
+            using var output = Image.Load<Rgba32>(memStream);
+            ExifProfile actual = output.Metadata.ExifProfile;
+            Assert.NotNull(actual);
+            IReadOnlyList<IExifValue> values = input.Metadata.ExifProfile.Values;
+            Assert.Equal(values, actual.Values);
+        }
+
+        [Fact]
+        public void Encode_PreservesIccProfile()
+        {
+            // arrange
+            using var input = new Image<Rgba32>(1, 1);
+            input.Metadata.IccProfile = new IccProfile(IccTestDataProfiles.Profile_Random_Array);
+            var encoder = new JpegEncoder();
+
+            // act
+            using var memStream = new MemoryStream();
+            input.Save(memStream, encoder);
+
+            // assert
+            memStream.Position = 0;
+            using var output = Image.Load<Rgba32>(memStream);
+            IccProfile actual = output.Metadata.IccProfile;
+            Assert.NotNull(actual);
+            IccProfile values = input.Metadata.IccProfile;
+            Assert.Equal(values.Entries, actual.Entries);
+        }
     }
 }
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngChunkTypeTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngChunkTypeTests.cs
index 2e8c0de27..3a207722b 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngChunkTypeTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngChunkTypeTests.cs
@@ -13,15 +13,26 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
         [Fact]
         public void ChunkTypeIdsAreCorrect()
         {
-            Assert.Equal(PngChunkType.Header,       GetType("IHDR"));
-            Assert.Equal(PngChunkType.Palette,      GetType("PLTE"));
-            Assert.Equal(PngChunkType.Data,         GetType("IDAT"));
-            Assert.Equal(PngChunkType.End,          GetType("IEND"));
+            Assert.Equal(PngChunkType.Header, GetType("IHDR"));
+            Assert.Equal(PngChunkType.Palette, GetType("PLTE"));
+            Assert.Equal(PngChunkType.Data, GetType("IDAT"));
+            Assert.Equal(PngChunkType.End, GetType("IEND"));
             Assert.Equal(PngChunkType.Transparency, GetType("tRNS"));
-            Assert.Equal(PngChunkType.Text,         GetType("tEXt"));
-            Assert.Equal(PngChunkType.Gamma,        GetType("gAMA"));
-            Assert.Equal(PngChunkType.Physical,     GetType("pHYs"));
-            Assert.Equal(PngChunkType.Exif,         GetType("eXIf"));
+            Assert.Equal(PngChunkType.Text, GetType("tEXt"));
+            Assert.Equal(PngChunkType.InternationalText, GetType("iTXt"));
+            Assert.Equal(PngChunkType.CompressedText, GetType("zTXt"));
+            Assert.Equal(PngChunkType.Chroma, GetType("cHRM"));
+            Assert.Equal(PngChunkType.Gamma, GetType("gAMA"));
+            Assert.Equal(PngChunkType.Physical, GetType("pHYs"));
+            Assert.Equal(PngChunkType.Exif, GetType("eXIf"));
+            Assert.Equal(PngChunkType.Time, GetType("tIME"));
+            Assert.Equal(PngChunkType.Background, GetType("bKGD"));
+            Assert.Equal(PngChunkType.EmbeddedColorProfile, GetType("iCCP"));
+            Assert.Equal(PngChunkType.StandardRgbColourSpace, GetType("sRGB"));
+            Assert.Equal(PngChunkType.SignificantBits, GetType("sBIT"));
+            Assert.Equal(PngChunkType.Histogram, GetType("hIST"));
+            Assert.Equal(PngChunkType.SuggestedPalette, GetType("sPLT"));
+            Assert.Equal(PngChunkType.ProprietaryApple, GetType("CgBI"));
         }
 
         private static PngChunkType GetType(string text)
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.Chunks.cs b/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.Chunks.cs
index 297512fa6..6cefff95d 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.Chunks.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.Chunks.cs
@@ -6,6 +6,7 @@ using System.IO;
 using System.Text;
 
 using SixLabors.ImageSharp.Formats.Png;
+using SixLabors.ImageSharp.Formats.Png.Zlib;
 using SixLabors.ImageSharp.PixelFormats;
 
 using Xunit;
@@ -78,6 +79,20 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
             }
         }
 
+        [Fact]
+        public void CalculateCrc_Works()
+        {
+            // arrange
+            var data = new byte[] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 };
+            var crc = new Crc32();
+
+            // act
+            crc.Update(data);
+
+            // assert
+            Assert.Equal(0x88AA689F, crc.Value);
+        }
+
         private static string GetChunkTypeName(uint value)
         {
             var data = new byte[4];
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs
index b08025f53..6eb6e93db 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs
@@ -4,7 +4,6 @@
 using System.IO;
 using Microsoft.DotNet.RemoteExecutor;
 
-using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Formats.Png;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
@@ -26,62 +25,21 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
         public static readonly string[] CommonTestImages =
         {
             TestImages.Png.Splash,
-            TestImages.Png.Indexed,
             TestImages.Png.FilterVar,
-            TestImages.Png.Bad.ChunkLength1,
-            TestImages.Png.Bad.CorruptedChunk,
 
             TestImages.Png.VimImage1,
+            TestImages.Png.VimImage2,
             TestImages.Png.VersioningImage1,
             TestImages.Png.VersioningImage2,
 
             TestImages.Png.SnakeGame,
-            TestImages.Png.Banner7Adam7InterlaceMode,
-            TestImages.Png.Banner8Index,
-
-            TestImages.Png.Bad.ChunkLength2,
-            TestImages.Png.VimImage2,
 
             TestImages.Png.Rgb24BppTrans,
-            TestImages.Png.GrayA8Bit,
-            TestImages.Png.Gray1BitTrans,
-            TestImages.Png.Bad.ZlibOverflow,
-            TestImages.Png.Bad.ZlibOverflow2,
-            TestImages.Png.Bad.ZlibZtxtBadHeader,
-            TestImages.Png.Bad.Issue1047_BadEndChunk
-        };
-
-        public static readonly string[] TestImages48Bpp =
-        {
-            TestImages.Png.Rgb48Bpp,
-            TestImages.Png.Rgb48BppInterlaced
-        };
-
-        public static readonly string[] TestImages64Bpp =
-        {
-            TestImages.Png.Rgba64Bpp,
-            TestImages.Png.Rgb48BppTrans
-        };
-
-        public static readonly string[] TestImagesL16Bit =
-        {
-            TestImages.Png.L16Bit,
-        };
 
-        public static readonly string[] TestImagesGrayAlpha16Bit =
-        {
-            TestImages.Png.GrayAlpha16Bit,
-            TestImages.Png.GrayTrns16BitInterlaced
+            TestImages.Png.Bad.ChunkLength1,
+            TestImages.Png.Bad.ChunkLength2,
         };
 
-        public static readonly string[] TestImagesL8BitInterlaced =
-            {
-                TestImages.Png.GrayAlpha1BitInterlaced,
-                TestImages.Png.GrayAlpha2BitInterlaced,
-                TestImages.Png.Gray4BitInterlaced,
-                TestImages.Png.GrayA8BitInterlaced
-            };
-
         public static readonly string[] TestImagesIssue1014 =
         {
             TestImages.Png.Issue1014_1, TestImages.Png.Issue1014_2,
@@ -95,6 +53,14 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
             TestImages.Png.Issue1177_2
         };
 
+        public static readonly string[] CorruptedTestImages =
+        {
+            TestImages.Png.Bad.CorruptedChunk,
+            TestImages.Png.Bad.ZlibOverflow,
+            TestImages.Png.Bad.ZlibOverflow2,
+            TestImages.Png.Bad.ZlibZtxtBadHeader,
+        };
+
         [Theory]
         [WithFileCollection(nameof(CommonTestImages), PixelTypes.Rgba32)]
         public void Decode<TPixel>(TestImageProvider<TPixel> provider)
@@ -103,25 +69,28 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
             using (Image<TPixel> image = provider.GetImage(PngDecoder))
             {
                 image.DebugSave(provider);
+                image.CompareToOriginal(provider, ImageComparer.Exact);
+            }
+        }
 
-                // We don't have another x-plat reference decoder that can be compared for this image.
-                if (provider.Utility.SourceFileOrDescription == TestImages.Png.Bad.Issue1047_BadEndChunk)
-                {
-                    if (TestEnvironment.IsWindows)
-                    {
-                        image.CompareToOriginal(provider, ImageComparer.Exact, (IImageDecoder)SystemDrawingReferenceDecoder.Instance);
-                    }
-                }
-                else
-                {
-                    image.CompareToOriginal(provider, ImageComparer.Exact);
-                }
+        [Theory]
+        [WithFile(TestImages.Png.GrayA8Bit, PixelTypes.Rgba32)]
+        [WithFile(TestImages.Png.Gray1BitTrans, PixelTypes.Rgba32)]
+        public void Decode_GrayWithAlpha<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : unmanaged, IPixel<TPixel>
+        {
+            using (Image<TPixel> image = provider.GetImage(PngDecoder))
+            {
+                image.DebugSave(provider);
+                image.CompareToOriginal(provider, ImageComparer.Exact);
             }
         }
 
         [Theory]
         [WithFile(TestImages.Png.Interlaced, PixelTypes.Rgba32)]
-        public void Decode_Interlaced_ImageIsCorrect<TPixel>(TestImageProvider<TPixel> provider)
+        [WithFile(TestImages.Png.Banner7Adam7InterlaceMode, PixelTypes.Rgba32)]
+        [WithFile(TestImages.Png.Banner8Index, PixelTypes.Rgba32)]
+        public void Decode_Interlaced<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : unmanaged, IPixel<TPixel>
         {
             using (Image<TPixel> image = provider.GetImage(PngDecoder))
@@ -132,7 +101,25 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
         }
 
         [Theory]
-        [WithFileCollection(nameof(TestImages48Bpp), PixelTypes.Rgb48)]
+        [WithFile(TestImages.Png.Indexed, PixelTypes.Rgba32)]
+        [WithFile(TestImages.Png.Banner8Index, PixelTypes.Rgba32)]
+        [WithFile(TestImages.Png.PalettedTwoColor, PixelTypes.Rgba32)]
+        [WithFile(TestImages.Png.PalettedFourColor, PixelTypes.Rgba32)]
+        [WithFile(TestImages.Png.PalettedSixteenColor, PixelTypes.Rgba32)]
+        [WithFile(TestImages.Png.Paletted256Colors, PixelTypes.Rgba32)]
+        public void Decode_Indexed<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : unmanaged, IPixel<TPixel>
+        {
+            using (Image<TPixel> image = provider.GetImage(PngDecoder))
+            {
+                image.DebugSave(provider);
+                image.CompareToOriginal(provider, ImageComparer.Exact);
+            }
+        }
+
+        [Theory]
+        [WithFile(TestImages.Png.Rgb48Bpp, PixelTypes.Rgb48)]
+        [WithFile(TestImages.Png.Rgb48BppInterlaced, PixelTypes.Rgb48)]
         public void Decode_48Bpp<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : unmanaged, IPixel<TPixel>
         {
@@ -144,7 +131,8 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
         }
 
         [Theory]
-        [WithFileCollection(nameof(TestImages64Bpp), PixelTypes.Rgba64)]
+        [WithFile(TestImages.Png.Rgba64Bpp, PixelTypes.Rgba64)]
+        [WithFile(TestImages.Png.Rgb48BppTrans, PixelTypes.Rgba64)]
         public void Decode_64Bpp<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : unmanaged, IPixel<TPixel>
         {
@@ -156,7 +144,10 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
         }
 
         [Theory]
-        [WithFileCollection(nameof(TestImagesL8BitInterlaced), PixelTypes.Rgba32)]
+        [WithFile(TestImages.Png.GrayAlpha1BitInterlaced, PixelTypes.Rgba32)]
+        [WithFile(TestImages.Png.GrayAlpha2BitInterlaced, PixelTypes.Rgba32)]
+        [WithFile(TestImages.Png.Gray4BitInterlaced, PixelTypes.Rgba32)]
+        [WithFile(TestImages.Png.GrayA8BitInterlaced, PixelTypes.Rgba32)]
         public void Decoder_L8bitInterlaced<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : unmanaged, IPixel<TPixel>
         {
@@ -168,7 +159,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
         }
 
         [Theory]
-        [WithFileCollection(nameof(TestImagesL16Bit), PixelTypes.Rgb48)]
+        [WithFile(TestImages.Png.L16Bit, PixelTypes.Rgb48)]
         public void Decode_L16Bit<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : unmanaged, IPixel<TPixel>
         {
@@ -180,7 +171,8 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
         }
 
         [Theory]
-        [WithFileCollection(nameof(TestImagesGrayAlpha16Bit), PixelTypes.Rgba64)]
+        [WithFile(TestImages.Png.GrayAlpha16Bit, PixelTypes.Rgba64)]
+        [WithFile(TestImages.Png.GrayTrns16BitInterlaced, PixelTypes.Rgba64)]
         public void Decode_GrayAlpha16Bit<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : unmanaged, IPixel<TPixel>
         {
@@ -193,7 +185,19 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
 
         [Theory]
         [WithFile(TestImages.Png.GrayA8BitInterlaced, PixelTypes)]
-        public void Decoder_CanDecodeGrey8bitWithAlpha<TPixel>(TestImageProvider<TPixel> provider)
+        public void Decoder_CanDecode_Grey8bitInterlaced_WithAlpha<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : unmanaged, IPixel<TPixel>
+        {
+            using (Image<TPixel> image = provider.GetImage(PngDecoder))
+            {
+                image.DebugSave(provider);
+                image.CompareToOriginal(provider, ImageComparer.Exact);
+            }
+        }
+
+        [Theory]
+        [WithFileCollection(nameof(CorruptedTestImages), PixelTypes.Rgba32)]
+        public void Decoder_CanDecode_CorruptedImages<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : unmanaged, IPixel<TPixel>
         {
             using (Image<TPixel> image = provider.GetImage(PngDecoder))
@@ -232,9 +236,63 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
             }
         }
 
+        [Theory]
+        [WithFile(TestImages.Png.Bad.MissingDataChunk, PixelTypes.Rgba32)]
+        public void Decode_MissingDataChunk_ThrowsException<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : unmanaged, IPixel<TPixel>
+        {
+            System.Exception ex = Record.Exception(
+                () =>
+                {
+                    using (Image<TPixel> image = provider.GetImage(PngDecoder))
+                    {
+                        image.DebugSave(provider);
+                    }
+                });
+            Assert.NotNull(ex);
+            Assert.Contains("PNG Image does not contain a data chunk", ex.Message);
+        }
+
+        [Theory]
+        [WithFile(TestImages.Png.Bad.BitDepthZero, PixelTypes.Rgba32)]
+        [WithFile(TestImages.Png.Bad.BitDepthThree, PixelTypes.Rgba32)]
+        public void Decode_InvalidBitDepth_ThrowsException<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : unmanaged, IPixel<TPixel>
+        {
+            System.Exception ex = Record.Exception(
+                () =>
+                {
+                    using (Image<TPixel> image = provider.GetImage(PngDecoder))
+                    {
+                        image.DebugSave(provider);
+                    }
+                });
+            Assert.NotNull(ex);
+            Assert.Contains("Invalid or unsupported bit depth", ex.Message);
+        }
+
+        [Theory]
+        [WithFile(TestImages.Png.Bad.ColorTypeOne, PixelTypes.Rgba32)]
+        [WithFile(TestImages.Png.Bad.ColorTypeNine, PixelTypes.Rgba32)]
+        public void Decode_InvalidColorType_ThrowsException<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : unmanaged, IPixel<TPixel>
+        {
+            System.Exception ex = Record.Exception(
+                () =>
+                {
+                    using (Image<TPixel> image = provider.GetImage(PngDecoder))
+                    {
+                        image.DebugSave(provider);
+                    }
+                });
+            Assert.NotNull(ex);
+            Assert.Contains("Invalid or unsupported color type", ex.Message);
+        }
+
+        // https://github.com/SixLabors/ImageSharp/issues/1014
         [Theory]
         [WithFileCollection(nameof(TestImagesIssue1014), PixelTypes.Rgba32)]
-        public void Issue1014<TPixel>(TestImageProvider<TPixel> provider)
+        public void Issue1014_DataSplitOverMultipleIDatChunks<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : unmanaged, IPixel<TPixel>
         {
             System.Exception ex = Record.Exception(
@@ -249,9 +307,10 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
             Assert.Null(ex);
         }
 
+        // https://github.com/SixLabors/ImageSharp/issues/1177
         [Theory]
         [WithFileCollection(nameof(TestImagesIssue1177), PixelTypes.Rgba32)]
-        public void Issue1177<TPixel>(TestImageProvider<TPixel> provider)
+        public void Issue1177_CRC_Omitted<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : unmanaged, IPixel<TPixel>
         {
             System.Exception ex = Record.Exception(
@@ -266,6 +325,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
             Assert.Null(ex);
         }
 
+        // https://github.com/SixLabors/ImageSharp/issues/1127
         [Theory]
         [WithFile(TestImages.Png.Issue1127, PixelTypes.Rgba32)]
         public void Issue1127<TPixel>(TestImageProvider<TPixel> provider)
@@ -283,6 +343,53 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
             Assert.Null(ex);
         }
 
+        // https://github.com/SixLabors/ImageSharp/issues/1047
+        [Theory]
+        [WithFile(TestImages.Png.Bad.Issue1047_BadEndChunk, PixelTypes.Rgba32)]
+        public void Issue1047<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : unmanaged, IPixel<TPixel>
+        {
+            System.Exception ex = Record.Exception(
+                () =>
+                {
+                    using (Image<TPixel> image = provider.GetImage(PngDecoder))
+                    {
+                        image.DebugSave(provider);
+
+                        // We don't have another x-plat reference decoder that can be compared for this image.
+                        if (TestEnvironment.IsWindows)
+                        {
+                            image.CompareToOriginal(provider, ImageComparer.Exact, SystemDrawingReferenceDecoder.Instance);
+                        }
+                    }
+                });
+            Assert.Null(ex);
+        }
+
+        // https://github.com/SixLabors/ImageSharp/issues/410
+        [Theory]
+        [WithFile(TestImages.Png.Bad.Issue410_MalformedApplePng, PixelTypes.Rgba32)]
+        public void Issue410_MalformedApplePng<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : unmanaged, IPixel<TPixel>
+        {
+            System.Exception ex = Record.Exception(
+                () =>
+                {
+                    using (Image<TPixel> image = provider.GetImage(PngDecoder))
+                    {
+                        image.DebugSave(provider);
+
+                        // We don't have another x-plat reference decoder that can be compared for this image.
+                        if (TestEnvironment.IsWindows)
+                        {
+                            image.CompareToOriginal(provider, ImageComparer.Exact, SystemDrawingReferenceDecoder.Instance);
+                        }
+                    }
+                });
+            Assert.NotNull(ex);
+            Assert.Contains("Proprietary Apple PNG detected!", ex.Message);
+        }
+
         [Theory]
         [WithFile(TestImages.Png.Splash, PixelTypes.Rgba32)]
         [WithFile(TestImages.Png.Bike, PixelTypes.Rgba32)]
diff --git a/tests/ImageSharp.Tests/Metadata/Profiles/IPTC/IptcProfileTests.cs b/tests/ImageSharp.Tests/Metadata/Profiles/IPTC/IptcProfileTests.cs
index d9f44cef9..3baea45d6 100644
--- a/tests/ImageSharp.Tests/Metadata/Profiles/IPTC/IptcProfileTests.cs
+++ b/tests/ImageSharp.Tests/Metadata/Profiles/IPTC/IptcProfileTests.cs
@@ -25,8 +25,8 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.IPTC
         }
 
         [Theory]
-        [MemberData("AllIptcTags")]
-        public void IptcProfile_SetValue_WithStrictOption_Works(IptcTag tag)
+        [MemberData(nameof(AllIptcTags))]
+        public void IptcProfile_SetValue_WithStrictEnabled_Works(IptcTag tag)
         {
             // arrange
             var profile = new IptcProfile();
@@ -41,6 +41,23 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.IPTC
             Assert.Equal(expectedLength, actual.Value.Length);
         }
 
+        [Theory]
+        [MemberData(nameof(AllIptcTags))]
+        public void IptcProfile_SetValue_WithStrictDisabled_Works(IptcTag tag)
+        {
+            // arrange
+            var profile = new IptcProfile();
+            var value = new string('s', tag.MaxLength() + 1);
+            var expectedLength = value.Length;
+
+            // act
+            profile.SetValue(tag, value, false);
+
+            // assert
+            IptcValue actual = profile.GetValues(tag).First();
+            Assert.Equal(expectedLength, actual.Value.Length);
+        }
+
         [Theory]
         [InlineData(IptcTag.DigitalCreationDate)]
         [InlineData(IptcTag.ExpirationDate)]
@@ -199,13 +216,6 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.IPTC
             ContainsIptcValue(iptcValues, IptcTag.Caption, expectedCaption);
         }
 
-        [Fact]
-        public void IptcProfile_SetNewValue_RespectsMaxLength()
-        {
-            // arrange
-            var profile = new IptcProfile();
-        }
-
         [Theory]
         [InlineData(IptcTag.ObjectAttribute)]
         [InlineData(IptcTag.SubjectReference)]
@@ -292,7 +302,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.IPTC
         [Fact]
         public void IptcProfile_RemoveByTag_RemovesAllEntrys()
         {
-            // arange
+            // arrange
             var profile = new IptcProfile();
             profile.SetValue(IptcTag.Byline, "test");
             profile.SetValue(IptcTag.Byline, "test2");
@@ -308,7 +318,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.IPTC
         [Fact]
         public void IptcProfile_RemoveByTagAndValue_Works()
         {
-            // arange
+            // arrange
             var profile = new IptcProfile();
             profile.SetValue(IptcTag.Byline, "test");
             profile.SetValue(IptcTag.Byline, "test2");
@@ -322,9 +332,9 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.IPTC
         }
 
         [Fact]
-        public void IptcProfile_GetValue_RetrievesAllEntrys()
+        public void IptcProfile_GetValue_RetrievesAllEntries()
         {
-            // arange
+            // arrange
             var profile = new IptcProfile();
             profile.SetValue(IptcTag.Byline, "test");
             profile.SetValue(IptcTag.Byline, "test2");
diff --git a/tests/ImageSharp.Tests/TestImages.cs b/tests/ImageSharp.Tests/TestImages.cs
index 18fd84331..bec0c6624 100644
--- a/tests/ImageSharp.Tests/TestImages.cs
+++ b/tests/ImageSharp.Tests/TestImages.cs
@@ -65,6 +65,12 @@ namespace SixLabors.ImageSharp.Tests
             public const string Filter3 = "Png/filter3.png";
             public const string Filter4 = "Png/filter4.png";
 
+            // Paletted images also from http://www.schaik.com/pngsuite/pngsuite_fil_png.html
+            public const string PalettedTwoColor = "Png/basn3p01.png";
+            public const string PalettedFourColor = "Png/basn3p02.png";
+            public const string PalettedSixteenColor = "Png/basn3p04.png";
+            public const string Paletted256Colors = "Png/basn3p08.png";
+
             // Filter changing per scanline
             public const string FilterVar = "Png/filterVar.png";
 
@@ -93,6 +99,8 @@ namespace SixLabors.ImageSharp.Tests
             public const string Issue1014_4 = "Png/issues/Issue_1014_4.png";
             public const string Issue1014_5 = "Png/issues/Issue_1014_5.png";
             public const string Issue1014_6 = "Png/issues/Issue_1014_6.png";
+
+            // Issue 1127: https://github.com/SixLabors/ImageSharp/issues/1127
             public const string Issue1127 = "Png/issues/Issue_1127.png";
 
             // Issue 1177: https://github.com/SixLabors/ImageSharp/issues/1177
@@ -101,14 +109,31 @@ namespace SixLabors.ImageSharp.Tests
 
             public static class Bad
             {
-                // Odd chunk lengths
-                public const string ChunkLength1 = "Png/chunklength1.png";
-                public const string ChunkLength2 = "Png/chunklength2.png";
+                public const string MissingDataChunk = "Png/xdtn0g01.png";
                 public const string CorruptedChunk = "Png/big-corrupted-chunk.png";
+
+                // Zlib errors.
                 public const string ZlibOverflow = "Png/zlib-overflow.png";
                 public const string ZlibOverflow2 = "Png/zlib-overflow2.png";
                 public const string ZlibZtxtBadHeader = "Png/zlib-ztxt-bad-header.png";
+
+                // Odd chunk lengths
+                public const string ChunkLength1 = "Png/chunklength1.png";
+                public const string ChunkLength2 = "Png/chunklength2.png";
+
+                // Issue 1047: https://github.com/SixLabors/ImageSharp/issues/1047
                 public const string Issue1047_BadEndChunk = "Png/issues/Issue_1047.png";
+
+                // Issue 410: https://github.com/SixLabors/ImageSharp/issues/410
+                public const string Issue410_MalformedApplePng = "Png/issues/Issue_410.png";
+
+                // Bad bit depth.
+                public const string BitDepthZero = "Png/xd0n2c08.png";
+                public const string BitDepthThree = "Png/xd3n2c08.png";
+
+                // Invalid color type.
+                public const string ColorTypeOne = "Png/xc1n0g08.png";
+                public const string ColorTypeNine = "Png/xc9n2c08.png";
             }
 
             public static readonly string[] All =
diff --git a/tests/Images/Input/Png/basn3p01.png b/tests/Images/Input/Png/basn3p01.png
new file mode 100644
index 000000000..15673642f
--- /dev/null
+++ b/tests/Images/Input/Png/basn3p01.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c2d7cd682df5f74506b33a5d70c344aaee248fda79fdfef8e873426fd6f2b75b
+size 112
diff --git a/tests/Images/Input/Png/basn3p02.png b/tests/Images/Input/Png/basn3p02.png
new file mode 100644
index 000000000..1065847ef
--- /dev/null
+++ b/tests/Images/Input/Png/basn3p02.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0466bb7ed9984cf03b70704564bcffab1df8ec0e8167473ba0f75e4fedce5a8f
+size 146
diff --git a/tests/Images/Input/Png/basn3p04.png b/tests/Images/Input/Png/basn3p04.png
new file mode 100644
index 000000000..05e361b1e
--- /dev/null
+++ b/tests/Images/Input/Png/basn3p04.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e1fc7be978d3149b98533d0076245ae64353b7967290f4204c1282ecb4ec1aba
+size 216
diff --git a/tests/Images/Input/Png/basn3p08.png b/tests/Images/Input/Png/basn3p08.png
new file mode 100644
index 000000000..68cb909bf
--- /dev/null
+++ b/tests/Images/Input/Png/basn3p08.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d58256cd2eb16b5740d4c1403d25ce43d8dd03e270627ab709d2fb141e3d904c
+size 1286
diff --git a/tests/Images/Input/Png/issues/Issue_410.png b/tests/Images/Input/Png/issues/Issue_410.png
new file mode 100644
index 000000000..1ca3be3ea
--- /dev/null
+++ b/tests/Images/Input/Png/issues/Issue_410.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fe3c66fb0f52b989f7398bc6bcaa18e83625120a53b4972023705a7a5925eab1
+size 674
diff --git a/tests/Images/Input/Png/xc1n0g08.png b/tests/Images/Input/Png/xc1n0g08.png
new file mode 100644
index 000000000..2afec8533
--- /dev/null
+++ b/tests/Images/Input/Png/xc1n0g08.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4059f7e6a1c5bac1801f70e09f9ec1e1297dcdce34055c13ab2703d6d9613c7e
+size 138
diff --git a/tests/Images/Input/Png/xc9n2c08.png b/tests/Images/Input/Png/xc9n2c08.png
new file mode 100644
index 000000000..549a4924a
--- /dev/null
+++ b/tests/Images/Input/Png/xc9n2c08.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e252a0e7df3e794e52ce4a831edafef76e7043d0d8d84019db0f7fd0b30e20f4
+size 145
diff --git a/tests/Images/Input/Png/xd0n2c08.png b/tests/Images/Input/Png/xd0n2c08.png
new file mode 100644
index 000000000..df7548a6d
--- /dev/null
+++ b/tests/Images/Input/Png/xd0n2c08.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c1287690808e809dc5d4fb89d8a7fd69ed93521f290abd42021ca00a061a1ba4
+size 145
diff --git a/tests/Images/Input/Png/xd3n2c08.png b/tests/Images/Input/Png/xd3n2c08.png
new file mode 100644
index 000000000..db5cec0c4
--- /dev/null
+++ b/tests/Images/Input/Png/xd3n2c08.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:00b53c3bbd0641454521b982bc6f6bcfda7c91f1874cefb3a9bac37d80a1a269
+size 145
diff --git a/tests/Images/Input/Png/xdtn0g01.png b/tests/Images/Input/Png/xdtn0g01.png
new file mode 100644
index 000000000..96c906fa8
--- /dev/null
+++ b/tests/Images/Input/Png/xdtn0g01.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f9d1fb2a708703518368c392c74765a6e3e5b49dbb9717df3974452291032df9
+size 61