diff --git a/ClosedXML/Excel/Drawings/IXLPicture.cs b/ClosedXML/Excel/Drawings/IXLPicture.cs
index 857488f..84829b7 100644
--- a/ClosedXML/Excel/Drawings/IXLPicture.cs
+++ b/ClosedXML/Excel/Drawings/IXLPicture.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
-using System.IO;
 using DocumentFormat.OpenXml.Packaging;
 
 namespace ClosedXML.Excel.Drawings
diff --git a/ClosedXML/Excel/Drawings/XLPicture.cs b/ClosedXML/Excel/Drawings/XLPicture.cs
index edaea9a..c933076 100644
--- a/ClosedXML/Excel/Drawings/XLPicture.cs
+++ b/ClosedXML/Excel/Drawings/XLPicture.cs
@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
-using System.IO;
 using DocumentFormat.OpenXml.Packaging;
 
 namespace ClosedXML.Excel.Drawings
diff --git a/ClosedXML/Excel/XLWorkbook_Save.cs b/ClosedXML/Excel/XLWorkbook_Save.cs
index fd42245..9b099a8 100644
--- a/ClosedXML/Excel/XLWorkbook_Save.cs
+++ b/ClosedXML/Excel/XLWorkbook_Save.cs
@@ -15,8 +15,6 @@
 using DocumentFormat.OpenXml.Vml.Office;
 using DocumentFormat.OpenXml.Vml.Spreadsheet;
 using Vml = DocumentFormat.OpenXml.Vml;
-using A = DocumentFormat.OpenXml.Drawing;
-using Xdr = DocumentFormat.OpenXml.Drawing.Spreadsheet;
 using BackgroundColor = DocumentFormat.OpenXml.Spreadsheet.BackgroundColor;
 using BottomBorder = DocumentFormat.OpenXml.Spreadsheet.BottomBorder;
 using Break = DocumentFormat.OpenXml.Spreadsheet.Break;
@@ -37,6 +35,7 @@
 using Text = DocumentFormat.OpenXml.Spreadsheet.Text;
 using TopBorder = DocumentFormat.OpenXml.Spreadsheet.TopBorder;
 using Underline = DocumentFormat.OpenXml.Spreadsheet.Underline;
+using Xdr = DocumentFormat.OpenXml.Drawing.Spreadsheet;
 using System.Xml;
 using System.Xml.Linq;
 using System.Text;
@@ -2551,18 +2550,18 @@
                     new Xdr.Picture(
                         new Xdr.NonVisualPictureProperties(
                             new Xdr.NonVisualDrawingProperties { Id = nvpId, Name = picture.Name },
-                            new Xdr.NonVisualPictureDrawingProperties(new A.PictureLocks { NoChangeAspect = true, NoMove = true, NoResize = true })
+                            new Xdr.NonVisualPictureDrawingProperties(new PictureLocks { NoChangeAspect = true, NoMove = true, NoResize = true })
                         ),
                         new Xdr.BlipFill(
-                            new A.Blip { Embed = drawingsPart.GetIdOfPart(imagePart), CompressionState = A.BlipCompressionValues.Print },
-                            new A.Stretch(new A.FillRectangle())
+                            new Blip { Embed = drawingsPart.GetIdOfPart(imagePart), CompressionState = BlipCompressionValues.Print },
+                            new Stretch(new FillRectangle())
                         ),
                         new Xdr.ShapeProperties(
-                            new A.Transform2D(
-                                new A.Offset { X = 0, Y = 0 },
-                                new A.Extents { Cx = extentsCx, Cy = extentsCy }
+                            new Transform2D(
+                                new Offset { X = 0, Y = 0 },
+                                new Extents { Cx = extentsCx, Cy = extentsCy }
                             ),
-                            new A.PresetGeometry { Preset = A.ShapeTypeValues.Rectangle }
+                            new PresetGeometry { Preset = ShapeTypeValues.Rectangle }
                         )
                     ),
                     new Xdr.ClientData()
@@ -2599,18 +2598,18 @@
                         new Xdr.Picture(
                             new Xdr.NonVisualPictureProperties(
                                 new Xdr.NonVisualDrawingProperties { Id = nvpId, Name = picture.Name },
-                                new Xdr.NonVisualPictureDrawingProperties(new A.PictureLocks { NoChangeAspect = true, NoMove = true, NoResize = true })
+                                new Xdr.NonVisualPictureDrawingProperties(new PictureLocks { NoChangeAspect = true, NoMove = true, NoResize = true })
                             ),
                             new Xdr.BlipFill(
-                                new A.Blip { Embed = drawingsPart.GetIdOfPart(imagePart), CompressionState = A.BlipCompressionValues.Print },
-                                new A.Stretch(new A.FillRectangle())
+                                new Blip { Embed = drawingsPart.GetIdOfPart(imagePart), CompressionState = BlipCompressionValues.Print },
+                                new Stretch(new FillRectangle())
                             ),
                             new Xdr.ShapeProperties(
-                                new A.Transform2D(
-                                    new A.Offset { X = 0, Y = 0 },
-                                    new A.Extents { Cx = extentsCx, Cy = extentsCy }
+                                new Transform2D(
+                                    new Offset { X = 0, Y = 0 },
+                                    new Extents { Cx = extentsCx, Cy = extentsCy }
                                 ),
-                                new A.PresetGeometry { Preset = A.ShapeTypeValues.Rectangle }
+                                new PresetGeometry { Preset = ShapeTypeValues.Rectangle }
                             )
                         ),
                         new Xdr.ClientData()
@@ -2639,18 +2638,18 @@
                         new Xdr.Picture(
                             new Xdr.NonVisualPictureProperties(
                                 new Xdr.NonVisualDrawingProperties { Id = nvpId, Name = picture.Name },
-                                new Xdr.NonVisualPictureDrawingProperties(new A.PictureLocks { NoChangeAspect = true, NoMove = true, NoResize = true })
+                                new Xdr.NonVisualPictureDrawingProperties(new PictureLocks { NoChangeAspect = true, NoMove = true, NoResize = true })
                             ),
                             new Xdr.BlipFill(
-                                new A.Blip { Embed = drawingsPart.GetIdOfPart(imagePart), CompressionState = A.BlipCompressionValues.Print },
-                                new A.Stretch(new A.FillRectangle())
+                                new Blip { Embed = drawingsPart.GetIdOfPart(imagePart), CompressionState = BlipCompressionValues.Print },
+                                new Stretch(new FillRectangle())
                             ),
                             new Xdr.ShapeProperties(
-                                new A.Transform2D(
-                                    new A.Offset { X = 0, Y = 0 },
-                                    new A.Extents { Cx = extentsCx, Cy = extentsCy }
+                                new Transform2D(
+                                    new Offset { X = 0, Y = 0 },
+                                    new Extents { Cx = extentsCx, Cy = extentsCy }
                                 ),
-                                new A.PresetGeometry { Preset = A.ShapeTypeValues.Rectangle }
+                                new PresetGeometry { Preset = ShapeTypeValues.Rectangle }
                             )
                         ),
                         new Xdr.ClientData()
diff --git a/ClosedXML/Excel/XLWorksheet.cs b/ClosedXML/Excel/XLWorksheet.cs
index 12cce27..132ec9d 100644
--- a/ClosedXML/Excel/XLWorksheet.cs
+++ b/ClosedXML/Excel/XLWorksheet.cs
@@ -1505,6 +1505,6 @@
                 pictures = new List<Drawings.IXLPicture>();
             }
             pictures.Add(pic);
-        } 
+        }
     }
 }
diff --git a/ClosedXML_Examples/ImageHandling/ImageAnchors.cs b/ClosedXML_Examples/ImageHandling/ImageAnchors.cs
index 7425a9f..303ff73 100644
--- a/ClosedXML_Examples/ImageHandling/ImageAnchors.cs
+++ b/ClosedXML_Examples/ImageHandling/ImageAnchors.cs
@@ -13,7 +13,7 @@
             var wb = new XLWorkbook();
             XLPicture pic;
             IXLWorksheet ws;
-            
+
             using (Stream fs = Assembly.GetExecutingAssembly().GetManifestResourceStream("ClosedXML_Examples.Resources.ImageHandling.png"))
             {
                 ws = wb.Worksheets.Add("Images");
diff --git a/ClosedXML_Tests/ClosedXML_Tests.csproj b/ClosedXML_Tests/ClosedXML_Tests.csproj
index 00cbfef..e53b52b 100644
--- a/ClosedXML_Tests/ClosedXML_Tests.csproj
+++ b/ClosedXML_Tests/ClosedXML_Tests.csproj
@@ -269,7 +269,7 @@
     <EmbeddedResource Include="Resource\Examples\Misc\RightToLeft.xlsx" />
     <EmbeddedResource Include="Resource\Examples\PivotTables\PivotTables.xlsx" />
     <None Include="packages.config" />
-    <EmbeddedResource Include="Resource\Examples\ImageHandling\ImageHandling.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\ImageHandling\ImageAnchors.xlsx" />
     <EmbeddedResource Include="Resource\Examples\ImageHandling\ImageFormats.xlsx" />
   </ItemGroup>
   <ItemGroup />
diff --git a/ClosedXML_Tests/Examples/ImageHandlingTests.cs b/ClosedXML_Tests/Examples/ImageHandlingTests.cs
index 9299dab..6af9d80 100644
--- a/ClosedXML_Tests/Examples/ImageHandlingTests.cs
+++ b/ClosedXML_Tests/Examples/ImageHandlingTests.cs
@@ -7,9 +7,9 @@
     public class ImageHandlingTests
     {
         [Test]
-        public void ImageHandling()
+        public void ImageAnchors()
         {
-            TestHelper.RunTestExample<ImageAnchors>(@"ImageHandling\ImageHandling.xlsx");
+            TestHelper.RunTestExample<ImageAnchors>(@"ImageHandling\ImageAnchors.xlsx");
         }
 
         [Test]
@@ -18,4 +18,4 @@
             TestHelper.RunTestExample<ImageFormats>(@"ImageHandling\ImageFormats.xlsx");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/ClosedXML_Tests/Resource/Examples/ImageHandling/ImageAnchors.xlsx b/ClosedXML_Tests/Resource/Examples/ImageHandling/ImageAnchors.xlsx
new file mode 100644
index 0000000..89fb86d
--- /dev/null
+++ b/ClosedXML_Tests/Resource/Examples/ImageHandling/ImageAnchors.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/ImageHandling/ImageHandling.xlsx b/ClosedXML_Tests/Resource/Examples/ImageHandling/ImageHandling.xlsx
deleted file mode 100644
index 89fb86d..0000000
--- a/ClosedXML_Tests/Resource/Examples/ImageHandling/ImageHandling.xlsx
+++ /dev/null
Binary files differ