diff --git a/tests/TestFiles/Direct2D1/Controls/Adorner/Focus_Adorner_Is_Properly_Clipped_Clip_False.expected.png b/tests/TestFiles/Direct2D1/Controls/Adorner/Focus_Adorner_Is_Properly_Clipped_Clip_False.expected.png
deleted file mode 100644
index 4821c22c39..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Adorner/Focus_Adorner_Is_Properly_Clipped_Clip_False.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Adorner/Focus_Adorner_Is_Properly_Clipped_Clip_True.expected.png b/tests/TestFiles/Direct2D1/Controls/Adorner/Focus_Adorner_Is_Properly_Clipped_Clip_True.expected.png
deleted file mode 100644
index 6a67087d41..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Adorner/Focus_Adorner_Is_Properly_Clipped_Clip_True.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Border/Border_1px_Border.expected.png b/tests/TestFiles/Direct2D1/Controls/Border/Border_1px_Border.expected.png
deleted file mode 100644
index 24239d5799..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Border/Border_1px_Border.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Border/Border_2px_Border.expected.png b/tests/TestFiles/Direct2D1/Controls/Border/Border_2px_Border.expected.png
deleted file mode 100644
index cebe42f3df..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Border/Border_2px_Border.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Border/Border_Bottom_Aligns_Content.expected.png b/tests/TestFiles/Direct2D1/Controls/Border/Border_Bottom_Aligns_Content.expected.png
deleted file mode 100644
index 163e53293f..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Border/Border_Bottom_Aligns_Content.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Border/Border_Brush_Offsets_Content.expected.png b/tests/TestFiles/Direct2D1/Controls/Border/Border_Brush_Offsets_Content.expected.png
deleted file mode 100644
index d1c13a9e57..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Border/Border_Brush_Offsets_Content.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Border/Border_Centers_Content_Horizontally.expected.png b/tests/TestFiles/Direct2D1/Controls/Border/Border_Centers_Content_Horizontally.expected.png
deleted file mode 100644
index 18ecd01c7a..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Border/Border_Centers_Content_Horizontally.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Border/Border_Centers_Content_Vertically.expected.png b/tests/TestFiles/Direct2D1/Controls/Border/Border_Centers_Content_Vertically.expected.png
deleted file mode 100644
index 40d0de862e..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Border/Border_Centers_Content_Vertically.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Border/Border_Fill.expected.png b/tests/TestFiles/Direct2D1/Controls/Border/Border_Fill.expected.png
deleted file mode 100644
index 8e08d02f66..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Border/Border_Fill.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Border/Border_Left_Aligns_Content.expected.png b/tests/TestFiles/Direct2D1/Controls/Border/Border_Left_Aligns_Content.expected.png
deleted file mode 100644
index 73be4dcdc6..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Border/Border_Left_Aligns_Content.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Border/Border_Margin_Offsets_Content.expected.png b/tests/TestFiles/Direct2D1/Controls/Border/Border_Margin_Offsets_Content.expected.png
deleted file mode 100644
index 1fa36969e5..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Border/Border_Margin_Offsets_Content.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Border/Border_Nested_Rotate.expected.png b/tests/TestFiles/Direct2D1/Controls/Border/Border_Nested_Rotate.expected.png
deleted file mode 100644
index 54d3bb9cec..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Border/Border_Nested_Rotate.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Border/Border_NonUniform_CornerRadius.expected.png b/tests/TestFiles/Direct2D1/Controls/Border/Border_NonUniform_CornerRadius.expected.png
deleted file mode 100644
index 9deb45aaeb..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Border/Border_NonUniform_CornerRadius.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Border/Border_Padding_Offsets_Content.expected.png b/tests/TestFiles/Direct2D1/Controls/Border/Border_Padding_Offsets_Content.expected.png
deleted file mode 100644
index 1fa36969e5..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Border/Border_Padding_Offsets_Content.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Border/Border_Right_Aligns_Content.expected.png b/tests/TestFiles/Direct2D1/Controls/Border/Border_Right_Aligns_Content.expected.png
deleted file mode 100644
index 3db06328cc..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Border/Border_Right_Aligns_Content.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Border/Border_Stretches_Content_Horizontally.expected.png b/tests/TestFiles/Direct2D1/Controls/Border/Border_Stretches_Content_Horizontally.expected.png
deleted file mode 100644
index e255633894..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Border/Border_Stretches_Content_Horizontally.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Border/Border_Stretches_Content_Vertically.expected.png b/tests/TestFiles/Direct2D1/Controls/Border/Border_Stretches_Content_Vertically.expected.png
deleted file mode 100644
index e255633894..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Border/Border_Stretches_Content_Vertically.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Border/Border_Top_Aligns_Content.expected.png b/tests/TestFiles/Direct2D1/Controls/Border/Border_Top_Aligns_Content.expected.png
deleted file mode 100644
index 1c48ec82c6..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Border/Border_Top_Aligns_Content.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Border/Border_Uniform_CornerRadius.expected.png b/tests/TestFiles/Direct2D1/Controls/Border/Border_Uniform_CornerRadius.expected.png
deleted file mode 100644
index a4bfa75eb8..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Border/Border_Uniform_CornerRadius.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/CustomRender/Clip.expected.png b/tests/TestFiles/Direct2D1/Controls/CustomRender/Clip.expected.png
deleted file mode 100644
index c64045d17e..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/CustomRender/Clip.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/CustomRender/Clip_With_Transform.expected.png b/tests/TestFiles/Direct2D1/Controls/CustomRender/Clip_With_Transform.expected.png
deleted file mode 100644
index ce74202234..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/CustomRender/Clip_With_Transform.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/CustomRender/GeometryClip.expected.png b/tests/TestFiles/Direct2D1/Controls/CustomRender/GeometryClip.expected.png
deleted file mode 100644
index bb39bf62ca..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/CustomRender/GeometryClip.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/CustomRender/GeometryClip_With_Transform.expected.png b/tests/TestFiles/Direct2D1/Controls/CustomRender/GeometryClip_With_Transform.expected.png
deleted file mode 100644
index ce74202234..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/CustomRender/GeometryClip_With_Transform.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/CustomRender/Opacity.expected.png b/tests/TestFiles/Direct2D1/Controls/CustomRender/Opacity.expected.png
deleted file mode 100644
index 66d12819f4..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/CustomRender/Opacity.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/CustomRender/OpacityMask.expected.png b/tests/TestFiles/Direct2D1/Controls/CustomRender/OpacityMask.expected.png
deleted file mode 100644
index 212a4f1eaa..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/CustomRender/OpacityMask.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_Fill.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_Fill.expected.png
deleted file mode 100644
index 2980a94b70..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_Fill.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_None.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_None.expected.png
deleted file mode 100644
index 58eebe2251..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_None.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_Uniform.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_Uniform.expected.png
deleted file mode 100644
index 588c6515c5..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_Uniform.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_UniformToFill.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_UniformToFill.expected.png
deleted file mode 100644
index 98d421f98c..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_UniformToFill.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/blend/Cat.jpg b/tests/TestFiles/Direct2D1/Controls/Image/blend/Cat.jpg
deleted file mode 100644
index 01de4614f6..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/blend/Cat.jpg and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/blend/ColourShading - by Stib.png b/tests/TestFiles/Direct2D1/Controls/Image/blend/ColourShading - by Stib.png
deleted file mode 100644
index ef464dedb4..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/blend/ColourShading - by Stib.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Color.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Color.expected.png
deleted file mode 100644
index c6f12e8b43..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Color.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_ColorBurn.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_ColorBurn.expected.png
deleted file mode 100644
index c6f12e8b43..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_ColorBurn.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_ColorDodge.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_ColorDodge.expected.png
deleted file mode 100644
index c6f12e8b43..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_ColorDodge.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Darken.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Darken.expected.png
deleted file mode 100644
index c6f12e8b43..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Darken.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Difference.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Difference.expected.png
deleted file mode 100644
index c6f12e8b43..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Difference.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Exclusion.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Exclusion.expected.png
deleted file mode 100644
index c6f12e8b43..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Exclusion.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_HardLight.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_HardLight.expected.png
deleted file mode 100644
index c6f12e8b43..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_HardLight.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Hue.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Hue.expected.png
deleted file mode 100644
index c6f12e8b43..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Hue.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Lighten.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Lighten.expected.png
deleted file mode 100644
index c6f12e8b43..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Lighten.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Luminosity.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Luminosity.expected.png
deleted file mode 100644
index c6f12e8b43..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Luminosity.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Multiply.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Multiply.expected.png
deleted file mode 100644
index c6f12e8b43..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Multiply.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Nothing.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Nothing.expected.png
deleted file mode 100644
index c6f12e8b43..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Nothing.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Overlay.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Overlay.expected.png
deleted file mode 100644
index c6f12e8b43..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Overlay.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Plus.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Plus.expected.png
deleted file mode 100644
index c6f12e8b43..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Plus.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Saturation.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Saturation.expected.png
deleted file mode 100644
index c6f12e8b43..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Saturation.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Screen.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Screen.expected.png
deleted file mode 100644
index c6f12e8b43..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_Screen.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_SoftLight.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_SoftLight.expected.png
deleted file mode 100644
index c6f12e8b43..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/blend/Image_Blend_SoftLight.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/composition/A.png b/tests/TestFiles/Direct2D1/Controls/Image/composition/A.png
deleted file mode 100644
index fb3dacda4c..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/composition/A.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/composition/B.png b/tests/TestFiles/Direct2D1/Controls/Image/composition/B.png
deleted file mode 100644
index 13aaf23dde..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/composition/B.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_Destination.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_Destination.expected.png
deleted file mode 100644
index 030552a395..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_Destination.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_DestinationAtop.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_DestinationAtop.expected.png
deleted file mode 100644
index 030552a395..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_DestinationAtop.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_DestinationIn.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_DestinationIn.expected.png
deleted file mode 100644
index 030552a395..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_DestinationIn.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_DestinationOut.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_DestinationOut.expected.png
deleted file mode 100644
index 030552a395..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_DestinationOut.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_DestinationOver.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_DestinationOver.expected.png
deleted file mode 100644
index 030552a395..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_DestinationOver.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_Source.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_Source.expected.png
deleted file mode 100644
index 030552a395..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_Source.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_SourceAtop.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_SourceAtop.expected.png
deleted file mode 100644
index 030552a395..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_SourceAtop.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_SourceIn.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_SourceIn.expected.png
deleted file mode 100644
index 030552a395..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_SourceIn.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_SourceOut.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_SourceOut.expected.png
deleted file mode 100644
index 030552a395..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_SourceOut.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_SourceOver.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_SourceOver.expected.png
deleted file mode 100644
index 030552a395..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_SourceOver.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_Xor.expected.png b/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_Xor.expected.png
deleted file mode 100644
index 030552a395..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/composition/Image_Blend_Xor.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/Image/test.png b/tests/TestFiles/Direct2D1/Controls/Image/test.png
deleted file mode 100644
index ed4f82f847..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/Image/test.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png b/tests/TestFiles/Direct2D1/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png
deleted file mode 100644
index b65d33de37..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/TextBlock/Should_Account_For_Overhang_Leading_And_Trailing.expected.png b/tests/TestFiles/Direct2D1/Controls/TextBlock/Should_Account_For_Overhang_Leading_And_Trailing.expected.png
deleted file mode 100644
index 0a6667d134..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/TextBlock/Should_Account_For_Overhang_Leading_And_Trailing.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/TextBlock/Should_Draw_MultiLineText_WithOverHandLeadingTrailing.expected.png b/tests/TestFiles/Direct2D1/Controls/TextBlock/Should_Draw_MultiLineText_WithOverHandLeadingTrailing.expected.png
deleted file mode 100644
index 2e02aea30c..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/TextBlock/Should_Draw_MultiLineText_WithOverHandLeadingTrailing.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/TextBlock/Should_Draw_Run_With_Background.expected.png b/tests/TestFiles/Direct2D1/Controls/TextBlock/Should_Draw_Run_With_Background.expected.png
deleted file mode 100644
index a382da4478..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/TextBlock/Should_Draw_Run_With_Background.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/TextBlock/Should_Draw_TextDecorations.expected.png b/tests/TestFiles/Direct2D1/Controls/TextBlock/Should_Draw_TextDecorations.expected.png
deleted file mode 100644
index 5c62bfd179..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/TextBlock/Should_Draw_TextDecorations.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/TextBlock/Should_Keep_TrailingWhiteSpace.expected.png b/tests/TestFiles/Direct2D1/Controls/TextBlock/Should_Keep_TrailingWhiteSpace.expected.png
deleted file mode 100644
index d0922b25ab..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/TextBlock/Should_Keep_TrailingWhiteSpace.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/TextBlock/Should_Measure_Arrange_TextBlock_150_NoWrap.expected.png b/tests/TestFiles/Direct2D1/Controls/TextBlock/Should_Measure_Arrange_TextBlock_150_NoWrap.expected.png
deleted file mode 100644
index 7546a2d532..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/TextBlock/Should_Measure_Arrange_TextBlock_150_NoWrap.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/TextBlock/Should_Measure_Arrange_TextBlock_44_NoWrap.expected.png b/tests/TestFiles/Direct2D1/Controls/TextBlock/Should_Measure_Arrange_TextBlock_44_NoWrap.expected.png
deleted file mode 100644
index bd94817c75..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/TextBlock/Should_Measure_Arrange_TextBlock_44_NoWrap.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/TextBlock/Should_Measure_Arrange_TextBlock_44_Wrap.expected.png b/tests/TestFiles/Direct2D1/Controls/TextBlock/Should_Measure_Arrange_TextBlock_44_Wrap.expected.png
deleted file mode 100644
index 9b0a492027..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/TextBlock/Should_Measure_Arrange_TextBlock_44_Wrap.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Controls/TextBlock/Wrapping_NoWrap.expected.png b/tests/TestFiles/Direct2D1/Controls/TextBlock/Wrapping_NoWrap.expected.png
deleted file mode 100644
index f91d165886..0000000000
Binary files a/tests/TestFiles/Direct2D1/Controls/TextBlock/Wrapping_NoWrap.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/GeometryClipping/Geometry_Clip_Clips_Path.expected.png b/tests/TestFiles/Direct2D1/GeometryClipping/Geometry_Clip_Clips_Path.expected.png
deleted file mode 100644
index 2e5a1ff6a7..0000000000
Binary files a/tests/TestFiles/Direct2D1/GeometryClipping/Geometry_Clip_Clips_Path.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/Bitmap/FramebufferRenderResultsShouldBeUsableAsBitmap_Bgra8888.expected.png b/tests/TestFiles/Direct2D1/Media/Bitmap/FramebufferRenderResultsShouldBeUsableAsBitmap_Bgra8888.expected.png
deleted file mode 100644
index 19686464c5..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/Bitmap/FramebufferRenderResultsShouldBeUsableAsBitmap_Bgra8888.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/Bitmap/FramebufferRenderResultsShouldBeUsableAsBitmap_Rgb565.expected.png b/tests/TestFiles/Direct2D1/Media/Bitmap/FramebufferRenderResultsShouldBeUsableAsBitmap_Rgb565.expected.png
deleted file mode 100644
index f3d20008a1..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/Bitmap/FramebufferRenderResultsShouldBeUsableAsBitmap_Rgb565.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/Bitmap/FramebufferRenderResultsShouldBeUsableAsBitmap_Rgba8888.expected.png b/tests/TestFiles/Direct2D1/Media/Bitmap/FramebufferRenderResultsShouldBeUsableAsBitmap_Rgba8888.expected.png
deleted file mode 100644
index 19686464c5..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/Bitmap/FramebufferRenderResultsShouldBeUsableAsBitmap_Rgba8888.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/Bitmap/WriteableBitmapShouldBeUsable_Bgra8888.expected.png b/tests/TestFiles/Direct2D1/Media/Bitmap/WriteableBitmapShouldBeUsable_Bgra8888.expected.png
deleted file mode 100644
index ef77cbe0f2..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/Bitmap/WriteableBitmapShouldBeUsable_Bgra8888.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/Bitmap/WriteableBitmapShouldBeUsable_Rgba8888.expected.png b/tests/TestFiles/Direct2D1/Media/Bitmap/WriteableBitmapShouldBeUsable_Rgba8888.expected.png
deleted file mode 100644
index 3cabea1742..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/Bitmap/WriteableBitmapShouldBeUsable_Rgba8888.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/CombinedGeometry/Geometry1_Transform.expected.png b/tests/TestFiles/Direct2D1/Media/CombinedGeometry/Geometry1_Transform.expected.png
deleted file mode 100644
index 34976f3de6..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/CombinedGeometry/Geometry1_Transform.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/CombinedGeometry/GeometryCombineMode_Exclude.expected.png b/tests/TestFiles/Direct2D1/Media/CombinedGeometry/GeometryCombineMode_Exclude.expected.png
deleted file mode 100644
index 2c4aa99eeb..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/CombinedGeometry/GeometryCombineMode_Exclude.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/CombinedGeometry/GeometryCombineMode_Intersect.expected.png b/tests/TestFiles/Direct2D1/Media/CombinedGeometry/GeometryCombineMode_Intersect.expected.png
deleted file mode 100644
index abb3cea270..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/CombinedGeometry/GeometryCombineMode_Intersect.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/CombinedGeometry/GeometryCombineMode_Union.expected.png b/tests/TestFiles/Direct2D1/Media/CombinedGeometry/GeometryCombineMode_Union.expected.png
deleted file mode 100644
index f431ef4403..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/CombinedGeometry/GeometryCombineMode_Union.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/CombinedGeometry/GeometryCombineMode_Xor.expected.png b/tests/TestFiles/Direct2D1/Media/CombinedGeometry/GeometryCombineMode_Xor.expected.png
deleted file mode 100644
index 4dd547c4bf..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/CombinedGeometry/GeometryCombineMode_Xor.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrushIsProperlyMapped_Absolute.expected.png b/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrushIsProperlyMapped_Absolute.expected.png
deleted file mode 100644
index 3ec7ba615c..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrushIsProperlyMapped_Absolute.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrushIsProperlyMapped_Relative.expected.png b/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrushIsProperlyMapped_Relative.expected.png
deleted file mode 100644
index 5ff1d30c91..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrushIsProperlyMapped_Relative.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_DrawingContext.expected.png b/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_DrawingContext.expected.png
deleted file mode 100644
index 3a2241b53f..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_DrawingContext.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue.expected.png b/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue.expected.png
deleted file mode 100644
index 8e08d02f66..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Center.expected.png b/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Center.expected.png
deleted file mode 100644
index 8e08d02f66..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Center.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Center_and_Rotation.expected.png b/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Center_and_Rotation.expected.png
deleted file mode 100644
index 8e08d02f66..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Center_and_Rotation.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Rotation.expected.png b/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Rotation.expected.png
deleted file mode 100644
index 8e08d02f66..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Rotation.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_SoftEdge.expected.png b/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_SoftEdge.expected.png
deleted file mode 100644
index 8e08d02f66..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_SoftEdge.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_Umbrella.expected.png b/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_Umbrella.expected.png
deleted file mode 100644
index 8e08d02f66..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_Umbrella.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/DrawingBrush/DrawingBrushIsProperlyScaled.expected.png b/tests/TestFiles/Direct2D1/Media/DrawingBrush/DrawingBrushIsProperlyScaled.expected.png
deleted file mode 100644
index 16f4d712f4..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/DrawingBrush/DrawingBrushIsProperlyScaled.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/DrawingBrush/DrawingBrushIsProperlyTiled.expected.png b/tests/TestFiles/Direct2D1/Media/DrawingBrush/DrawingBrushIsProperlyTiled.expected.png
deleted file mode 100644
index 3352350378..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/DrawingBrush/DrawingBrushIsProperlyTiled.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/GeometryGroup/Child_Transform.expected.png b/tests/TestFiles/Direct2D1/Media/GeometryGroup/Child_Transform.expected.png
deleted file mode 100644
index d8e4c54924..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/GeometryGroup/Child_Transform.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/GeometryGroup/FillRule_Stroke_EvenOdd.expected.png b/tests/TestFiles/Direct2D1/Media/GeometryGroup/FillRule_Stroke_EvenOdd.expected.png
deleted file mode 100644
index 4dd547c4bf..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/GeometryGroup/FillRule_Stroke_EvenOdd.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/GeometryGroup/FillRule_Stroke_NonZero.expected.png b/tests/TestFiles/Direct2D1/Media/GeometryGroup/FillRule_Stroke_NonZero.expected.png
deleted file mode 100644
index 3ab700dc04..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/GeometryGroup/FillRule_Stroke_NonZero.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/GlyphRun/Should_Render_GlyphRun_Aliased.expected.png b/tests/TestFiles/Direct2D1/Media/GlyphRun/Should_Render_GlyphRun_Aliased.expected.png
deleted file mode 100644
index f130809067..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/GlyphRun/Should_Render_GlyphRun_Aliased.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/GlyphRun/Should_Render_GlyphRun_Geometry.expected.png b/tests/TestFiles/Direct2D1/Media/GlyphRun/Should_Render_GlyphRun_Geometry.expected.png
deleted file mode 100644
index 004265112f..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/GlyphRun/Should_Render_GlyphRun_Geometry.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/GlyphRun/Should_Render_GlyphRun_Positioned.expected.png b/tests/TestFiles/Direct2D1/Media/GlyphRun/Should_Render_GlyphRun_Positioned.expected.png
deleted file mode 100644
index 913266b652..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/GlyphRun/Should_Render_GlyphRun_Positioned.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/GlyphRun/Should_Render_GlyphRun_UnPositioned.expected.png b/tests/TestFiles/Direct2D1/Media/GlyphRun/Should_Render_GlyphRun_UnPositioned.expected.png
deleted file mode 100644
index 913266b652..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/GlyphRun/Should_Render_GlyphRun_UnPositioned.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Fill_NoTile.expected.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Fill_NoTile.expected.png
deleted file mode 100644
index 73d147bf77..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Fill_NoTile.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Is_Properly_Mapped_Absolute.expected.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Is_Properly_Mapped_Absolute.expected.png
deleted file mode 100644
index c6ed0f9c66..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Is_Properly_Mapped_Absolute.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Is_Properly_Mapped_Relative.expected.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Is_Properly_Mapped_Relative.expected.png
deleted file mode 100644
index f8111f51cb..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Is_Properly_Mapped_Relative.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_FlipXY_TopLeftDest.expected.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_FlipXY_TopLeftDest.expected.png
deleted file mode 100644
index f99f56ec14..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_FlipXY_TopLeftDest.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_FlipX_TopLeftDest.expected.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_FlipX_TopLeftDest.expected.png
deleted file mode 100644
index 4d89f995c4..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_FlipX_TopLeftDest.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_FlipY_TopLeftDest.expected.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_FlipY_TopLeftDest.expected.png
deleted file mode 100644
index 75c53f0c28..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_FlipY_TopLeftDest.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_NoTile_Alignment_BottomRight.expected.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_NoTile_Alignment_BottomRight.expected.png
deleted file mode 100644
index a13b34ba2d..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_NoTile_Alignment_BottomRight.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_NoTile_Alignment_Center.expected.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_NoTile_Alignment_Center.expected.png
deleted file mode 100644
index 14704f751c..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_NoTile_Alignment_Center.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_NoTile_Alignment_TopLeft.expected.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_NoTile_Alignment_TopLeft.expected.png
deleted file mode 100644
index 7ebac13d30..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_NoTile_Alignment_TopLeft.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_NoTile_BottomRightQuarterDest.expected.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_NoTile_BottomRightQuarterDest.expected.png
deleted file mode 100644
index dd41cb98c3..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_NoTile_BottomRightQuarterDest.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_NoTile_BottomRightQuarterSource.expected.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_NoTile_BottomRightQuarterSource.expected.png
deleted file mode 100644
index ab9f2b76e3..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_NoTile_BottomRightQuarterSource.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_NoTile_BottomRightQuarterSource_BottomRightQuarterDest.expected.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_NoTile_BottomRightQuarterSource_BottomRightQuarterDest.expected.png
deleted file mode 100644
index fea4a2a8e9..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_NoTile_BottomRightQuarterSource_BottomRightQuarterDest.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_Tile_BottomRightQuarterSource_CenterQuarterDest.expected.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_Tile_BottomRightQuarterSource_CenterQuarterDest.expected.png
deleted file mode 100644
index afd39c2360..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NoStretch_Tile_BottomRightQuarterSource_CenterQuarterDest.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NullSource.expected.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NullSource.expected.png
deleted file mode 100644
index 4c9409ee63..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_NullSource.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Should_Render_With_Transform.expected.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Should_Render_With_Transform.expected.png
deleted file mode 100644
index 957cddecb8..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Should_Render_With_Transform.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Should_Render_With_TransformOrigin.expected.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Should_Render_With_TransformOrigin.expected.png
deleted file mode 100644
index b14d474414..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Should_Render_With_TransformOrigin.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Tile_Fill.expected.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Tile_Fill.expected.png
deleted file mode 100644
index 864cad8a79..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Tile_Fill.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Tile_Small_Image.expected.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Tile_Small_Image.expected.png
deleted file mode 100644
index 669da6ca1a..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Tile_Small_Image.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Tile_Small_Image_With_Transform.expected.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Tile_Small_Image_With_Transform.expected.png
deleted file mode 100644
index ac400eae2a..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Tile_Small_Image_With_Transform.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Tile_UniformToFill.expected.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Tile_UniformToFill.expected.png
deleted file mode 100644
index cfb6639297..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Tile_UniformToFill.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_UniformToFill_NoTile.expected.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_UniformToFill_NoTile.expected.png
deleted file mode 100644
index e173fa6cee..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_UniformToFill_NoTile.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Uniform_NoTile.expected.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Uniform_NoTile.expected.png
deleted file mode 100644
index de73af8170..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Uniform_NoTile.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/github_icon.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/github_icon.png
deleted file mode 100644
index cd053c5fe1..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageBrush/github_icon.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/github_icon_small.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/github_icon_small.png
deleted file mode 100644
index 5799bdfdce..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageBrush/github_icon_small.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageDrawing/ImageDrawing_BottomRight.expected.png b/tests/TestFiles/Direct2D1/Media/ImageDrawing/ImageDrawing_BottomRight.expected.png
deleted file mode 100644
index c6b7c2f307..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageDrawing/ImageDrawing_BottomRight.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageDrawing/ImageDrawing_Fill.expected.png b/tests/TestFiles/Direct2D1/Media/ImageDrawing/ImageDrawing_Fill.expected.png
deleted file mode 100644
index acc8532ff9..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageDrawing/ImageDrawing_Fill.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageDrawing/Should_Render_DrawingBrushTransform.expected.png b/tests/TestFiles/Direct2D1/Media/ImageDrawing/Should_Render_DrawingBrushTransform.expected.png
deleted file mode 100644
index fa8bd2f004..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageDrawing/Should_Render_DrawingBrushTransform.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageDrawing/github_icon.png b/tests/TestFiles/Direct2D1/Media/ImageDrawing/github_icon.png
deleted file mode 100644
index cd053c5fe1..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/ImageDrawing/github_icon.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/LinearGradientBrush/LinearGradientBrushIsProperlyMapped_Absolute.expected.png b/tests/TestFiles/Direct2D1/Media/LinearGradientBrush/LinearGradientBrushIsProperlyMapped_Absolute.expected.png
deleted file mode 100644
index 84f0d079a6..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/LinearGradientBrush/LinearGradientBrushIsProperlyMapped_Absolute.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/LinearGradientBrush/LinearGradientBrushIsProperlyMapped_Relative.expected.png b/tests/TestFiles/Direct2D1/Media/LinearGradientBrush/LinearGradientBrushIsProperlyMapped_Relative.expected.png
deleted file mode 100644
index 969f5087be..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/LinearGradientBrush/LinearGradientBrushIsProperlyMapped_Relative.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/LinearGradientBrush/LinearGradientBrush_DrawingContext.expected.png b/tests/TestFiles/Direct2D1/Media/LinearGradientBrush/LinearGradientBrush_DrawingContext.expected.png
deleted file mode 100644
index 7ba0bf1622..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/LinearGradientBrush/LinearGradientBrush_DrawingContext.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/LinearGradientBrush/LinearGradientBrush_RedBlue_Horizontal_Fill.expected.png b/tests/TestFiles/Direct2D1/Media/LinearGradientBrush/LinearGradientBrush_RedBlue_Horizontal_Fill.expected.png
deleted file mode 100644
index 89668d19f4..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/LinearGradientBrush/LinearGradientBrush_RedBlue_Horizontal_Fill.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/LinearGradientBrush/LinearGradientBrush_RedBlue_Vertical_Fill.expected.png b/tests/TestFiles/Direct2D1/Media/LinearGradientBrush/LinearGradientBrush_RedBlue_Vertical_Fill.expected.png
deleted file mode 100644
index 2b882874dc..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/LinearGradientBrush/LinearGradientBrush_RedBlue_Vertical_Fill.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_DrawingContext.expected.png b/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_DrawingContext.expected.png
deleted file mode 100644
index 85d11f2c2b..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_DrawingContext.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_Is_Properly_Mapped_Absolute_CenterOrigin.expected.png b/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_Is_Properly_Mapped_Absolute_CenterOrigin.expected.png
deleted file mode 100644
index 38781990d4..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_Is_Properly_Mapped_Absolute_CenterOrigin.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_Is_Properly_Mapped_Absolute_MovedOrigin.expected.png b/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_Is_Properly_Mapped_Absolute_MovedOrigin.expected.png
deleted file mode 100644
index 233e2abad1..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_Is_Properly_Mapped_Absolute_MovedOrigin.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_Is_Properly_Mapped_Relative_CenterOrigin.expected.png b/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_Is_Properly_Mapped_Relative_CenterOrigin.expected.png
deleted file mode 100644
index ce9c6e3505..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_Is_Properly_Mapped_Relative_CenterOrigin.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_Is_Properly_Mapped_Relative_MovedOrigin.expected.png b/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_Is_Properly_Mapped_Relative_MovedOrigin.expected.png
deleted file mode 100644
index de6a6dd6a9..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_Is_Properly_Mapped_Relative_MovedOrigin.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_Partial_Cover.expected.png b/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_Partial_Cover.expected.png
deleted file mode 100644
index f36b636083..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_Partial_Cover.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedBlue.expected.png b/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedBlue.expected.png
deleted file mode 100644
index fce116d98d..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedBlue.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedBlue_Offset_Inside.expected.png b/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedBlue_Offset_Inside.expected.png
deleted file mode 100644
index 4d690abee5..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedBlue_Offset_Inside.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedBlue_Offset_Outside.expected.png b/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedBlue_Offset_Outside.expected.png
deleted file mode 100644
index 667aa9151e..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedBlue_Offset_Outside.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedGreenBlue_Offset_Inside.expected.png b/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedGreenBlue_Offset_Inside.expected.png
deleted file mode 100644
index 1d660f79d1..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedGreenBlue_Offset_Inside.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedGreenBlue_Offset_Outside.expected.png b/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedGreenBlue_Offset_Outside.expected.png
deleted file mode 100644
index ea1009b54a..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedGreenBlue_Offset_Outside.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/StreamGeometry/PreciseEllipticArc_Produces_Valid_Arcs_In_All_Directions.immediate.expected.png b/tests/TestFiles/Direct2D1/Media/StreamGeometry/PreciseEllipticArc_Produces_Valid_Arcs_In_All_Directions.immediate.expected.png
deleted file mode 100644
index 825b1d7ea7..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/StreamGeometry/PreciseEllipticArc_Produces_Valid_Arcs_In_All_Directions.immediate.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/TextFormatting/TextLayout/TextLayout_Basic.expected.png b/tests/TestFiles/Direct2D1/Media/TextFormatting/TextLayout/TextLayout_Basic.expected.png
deleted file mode 100644
index 215e83106f..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/TextFormatting/TextLayout/TextLayout_Basic.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/TextFormatting/TextLayout/TextLayout_Rotated.expected.png b/tests/TestFiles/Direct2D1/Media/TextFormatting/TextLayout/TextLayout_Rotated.expected.png
deleted file mode 100644
index 237a799224..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/TextFormatting/TextLayout/TextLayout_Rotated.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Checkerboard_144_Dpi.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Checkerboard_144_Dpi.expected.png
deleted file mode 100644
index 7e674b849a..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Checkerboard_144_Dpi.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Checkerboard_192_Dpi.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Checkerboard_192_Dpi.expected.png
deleted file mode 100644
index f80ac7f90d..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Checkerboard_192_Dpi.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Checkerboard_96_Dpi.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Checkerboard_96_Dpi.expected.png
deleted file mode 100644
index 0f88a0d468..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Checkerboard_96_Dpi.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Fill_NoTile.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Fill_NoTile.expected.png
deleted file mode 100644
index 110b44a4c0..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Fill_NoTile.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Grip_144_Dpi.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Grip_144_Dpi.expected.png
deleted file mode 100644
index 61192b2e60..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Grip_144_Dpi.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Grip_192_Dpi.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Grip_192_Dpi.expected.png
deleted file mode 100644
index a209dc94cc..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Grip_192_Dpi.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Grip_96_Dpi.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Grip_96_Dpi.expected.png
deleted file mode 100644
index 6ac1bdb088..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Grip_96_Dpi.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_InTree_Visual.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_InTree_Visual.expected.png
deleted file mode 100644
index a74af7a06e..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_InTree_Visual.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Is_Properly_Mapped_Absolute.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Is_Properly_Mapped_Absolute.expected.png
deleted file mode 100644
index c6ed0f9c66..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Is_Properly_Mapped_Absolute.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Is_Properly_Mapped_Relative.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Is_Properly_Mapped_Relative.expected.png
deleted file mode 100644
index e5211cd127..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Is_Properly_Mapped_Relative.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_FlipXY_TopLeftDest.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_FlipXY_TopLeftDest.expected.png
deleted file mode 100644
index 7e4faf77d5..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_FlipXY_TopLeftDest.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_FlipX_TopLeftDest.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_FlipX_TopLeftDest.expected.png
deleted file mode 100644
index 3b91d04f7c..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_FlipX_TopLeftDest.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_FlipY_TopLeftDest.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_FlipY_TopLeftDest.expected.png
deleted file mode 100644
index 1df122151d..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_FlipY_TopLeftDest.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_Alignment_BottomRight.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_Alignment_BottomRight.expected.png
deleted file mode 100644
index a13b34ba2d..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_Alignment_BottomRight.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_Alignment_Center.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_Alignment_Center.expected.png
deleted file mode 100644
index aedc6afe30..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_Alignment_Center.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_Alignment_TopLeft.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_Alignment_TopLeft.expected.png
deleted file mode 100644
index 7ebac13d30..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_Alignment_TopLeft.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_BottomRightQuarterDest.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_BottomRightQuarterDest.expected.png
deleted file mode 100644
index ccdcab84e4..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_BottomRightQuarterDest.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_BottomRightQuarterSource.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_BottomRightQuarterSource.expected.png
deleted file mode 100644
index ab9f2b76e3..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_BottomRightQuarterSource.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_BottomRightQuarterSource_BottomRightQuarterDest.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_BottomRightQuarterSource_BottomRightQuarterDest.expected.png
deleted file mode 100644
index fea4a2a8e9..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_BottomRightQuarterSource_BottomRightQuarterDest.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_Tile_BottomRightQuarterSource_CenterQuarterDest.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_Tile_BottomRightQuarterSource_CenterQuarterDest.expected.png
deleted file mode 100644
index afd39c2360..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_Tile_BottomRightQuarterSource_CenterQuarterDest.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Should_Be_Usable_As_Opacity_Mask.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Should_Be_Usable_As_Opacity_Mask.expected.png
deleted file mode 100644
index 4413901c56..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Should_Be_Usable_As_Opacity_Mask.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_UniformToFill_NoTile.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_UniformToFill_NoTile.expected.png
deleted file mode 100644
index 2d7ccac2f7..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_UniformToFill_NoTile.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Uniform_NoTile.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Uniform_NoTile.expected.png
deleted file mode 100644
index d9c62a72a8..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Uniform_NoTile.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/github_icon.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/github_icon.png
deleted file mode 100644
index cd053c5fe1..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/github_icon.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/OpacityMask/Opacity_Mask_Masks_Element.expected.png b/tests/TestFiles/Direct2D1/OpacityMask/Opacity_Mask_Masks_Element.expected.png
deleted file mode 100644
index ba8312accf..0000000000
Binary files a/tests/TestFiles/Direct2D1/OpacityMask/Opacity_Mask_Masks_Element.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/OpacityMask/RenderTransform_Applies_To_Opacity_Mask.expected.png b/tests/TestFiles/Direct2D1/OpacityMask/RenderTransform_Applies_To_Opacity_Mask.expected.png
deleted file mode 100644
index bf9775ba0b..0000000000
Binary files a/tests/TestFiles/Direct2D1/OpacityMask/RenderTransform_Applies_To_Opacity_Mask.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/SVGPath/SVGPath.expected.png b/tests/TestFiles/Direct2D1/SVGPath/SVGPath.expected.png
deleted file mode 100644
index 9830048810..0000000000
Binary files a/tests/TestFiles/Direct2D1/SVGPath/SVGPath.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Ellipse/Circle_1px_Stroke.expected.png b/tests/TestFiles/Direct2D1/Shapes/Ellipse/Circle_1px_Stroke.expected.png
deleted file mode 100644
index e637006545..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Ellipse/Circle_1px_Stroke.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Ellipse/Should_Render_Circle_Aliased.expected.png b/tests/TestFiles/Direct2D1/Shapes/Ellipse/Should_Render_Circle_Aliased.expected.png
deleted file mode 100644
index d051696d78..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Ellipse/Should_Render_Circle_Aliased.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Ellipse/Should_Render_Circle_Antialiased.expected.png b/tests/TestFiles/Direct2D1/Shapes/Ellipse/Should_Render_Circle_Antialiased.expected.png
deleted file mode 100644
index 06dc7f5450..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Ellipse/Should_Render_Circle_Antialiased.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Line/Line_1px_Stroke.expected.png b/tests/TestFiles/Direct2D1/Shapes/Line/Line_1px_Stroke.expected.png
deleted file mode 100644
index f0a6a9b109..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Line/Line_1px_Stroke.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Line/Line_1px_Stroke_Reversed.expected.png b/tests/TestFiles/Direct2D1/Shapes/Line/Line_1px_Stroke_Reversed.expected.png
deleted file mode 100644
index 9ed7e713a9..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Line/Line_1px_Stroke_Reversed.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Line/Line_1px_Stroke_Vertical.expected.png b/tests/TestFiles/Direct2D1/Shapes/Line/Line_1px_Stroke_Vertical.expected.png
deleted file mode 100644
index 845961351c..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Line/Line_1px_Stroke_Vertical.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Line/Lines_With_DashArray.expected.png b/tests/TestFiles/Direct2D1/Shapes/Line/Lines_With_DashArray.expected.png
deleted file mode 100644
index 802cec826c..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Line/Lines_With_DashArray.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Path/Arc_Absolute.expected.png b/tests/TestFiles/Direct2D1/Shapes/Path/Arc_Absolute.expected.png
deleted file mode 100644
index 113cc908e6..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Path/Arc_Absolute.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Path/Arc_Relative.expected.png b/tests/TestFiles/Direct2D1/Shapes/Path/Arc_Relative.expected.png
deleted file mode 100644
index 113cc908e6..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Path/Arc_Relative.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Path/BeginFigure_IsFilled_Is_Respected.expected.png b/tests/TestFiles/Direct2D1/Shapes/Path/BeginFigure_IsFilled_Is_Respected.expected.png
deleted file mode 100644
index d67d71c520..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Path/BeginFigure_IsFilled_Is_Respected.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Path/CubicBezier_Absolute.expected.png b/tests/TestFiles/Direct2D1/Shapes/Path/CubicBezier_Absolute.expected.png
deleted file mode 100644
index 8c8f5350ee..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Path/CubicBezier_Absolute.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Path/CubicBezier_Relative.expected.png b/tests/TestFiles/Direct2D1/Shapes/Path/CubicBezier_Relative.expected.png
deleted file mode 100644
index 8c8f5350ee..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Path/CubicBezier_Relative.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Path/GetWidenedPathGeometry_Line.expected.png b/tests/TestFiles/Direct2D1/Shapes/Path/GetWidenedPathGeometry_Line.expected.png
deleted file mode 100644
index 8399b9e790..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Path/GetWidenedPathGeometry_Line.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Path/GetWidenedPathGeometry_Line_Dash.expected.png b/tests/TestFiles/Direct2D1/Shapes/Path/GetWidenedPathGeometry_Line_Dash.expected.png
deleted file mode 100644
index a09d404883..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Path/GetWidenedPathGeometry_Line_Dash.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Path/HorizontalLine_Absolute.expected.png b/tests/TestFiles/Direct2D1/Shapes/Path/HorizontalLine_Absolute.expected.png
deleted file mode 100644
index 546ffec3bb..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Path/HorizontalLine_Absolute.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Path/HorizontalLine_Relative.expected.png b/tests/TestFiles/Direct2D1/Shapes/Path/HorizontalLine_Relative.expected.png
deleted file mode 100644
index 546ffec3bb..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Path/HorizontalLine_Relative.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Path/Line_Absolute.expected.png b/tests/TestFiles/Direct2D1/Shapes/Path/Line_Absolute.expected.png
deleted file mode 100644
index 4661a6a8c4..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Path/Line_Absolute.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Path/Line_Relative.expected.png b/tests/TestFiles/Direct2D1/Shapes/Path/Line_Relative.expected.png
deleted file mode 100644
index 4661a6a8c4..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Path/Line_Relative.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Path/Path_100px_Triangle_Centered.expected.png b/tests/TestFiles/Direct2D1/Shapes/Path/Path_100px_Triangle_Centered.expected.png
deleted file mode 100644
index dab965f988..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Path/Path_100px_Triangle_Centered.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Path/Path_Expander_With_Border.expected.png b/tests/TestFiles/Direct2D1/Shapes/Path/Path_Expander_With_Border.expected.png
deleted file mode 100644
index 7a7d70a521..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Path/Path_Expander_With_Border.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Path/Path_Tick_Scaled.expected.png b/tests/TestFiles/Direct2D1/Shapes/Path/Path_Tick_Scaled.expected.png
deleted file mode 100644
index cb4466a21f..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Path/Path_Tick_Scaled.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Path/Path_Tick_Scaled_Stroke_8px.expected.png b/tests/TestFiles/Direct2D1/Shapes/Path/Path_Tick_Scaled_Stroke_8px.expected.png
deleted file mode 100644
index 355edf84c2..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Path/Path_Tick_Scaled_Stroke_8px.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Path/Path_With_PenLineCap.expected.png b/tests/TestFiles/Direct2D1/Shapes/Path/Path_With_PenLineCap.expected.png
deleted file mode 100644
index a61ba9f080..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Path/Path_With_PenLineCap.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Path/Path_With_Rotated_Geometry.expected.png b/tests/TestFiles/Direct2D1/Shapes/Path/Path_With_Rotated_Geometry.expected.png
deleted file mode 100644
index 7676900459..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Path/Path_With_Rotated_Geometry.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Path/VerticalLine_Absolute.expected.png b/tests/TestFiles/Direct2D1/Shapes/Path/VerticalLine_Absolute.expected.png
deleted file mode 100644
index b2e2beafd4..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Path/VerticalLine_Absolute.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Path/VerticalLine_Relative.expected.png b/tests/TestFiles/Direct2D1/Shapes/Path/VerticalLine_Relative.expected.png
deleted file mode 100644
index ff36de2a5c..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Path/VerticalLine_Relative.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Polygon/Polygon_1px_Stroke.expected.png b/tests/TestFiles/Direct2D1/Shapes/Polygon/Polygon_1px_Stroke.expected.png
deleted file mode 100644
index f62be2d4bf..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Polygon/Polygon_1px_Stroke.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Polygon/Polygon_NonUniformFill.expected.png b/tests/TestFiles/Direct2D1/Shapes/Polygon/Polygon_NonUniformFill.expected.png
deleted file mode 100644
index 0888c74c30..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Polygon/Polygon_NonUniformFill.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Polyline/Polyline_10px_Stroke_PenLineJoin.expected.png b/tests/TestFiles/Direct2D1/Shapes/Polyline/Polyline_10px_Stroke_PenLineJoin.expected.png
deleted file mode 100644
index d908a572cb..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Polyline/Polyline_10px_Stroke_PenLineJoin.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Polyline/Polyline_1px_Stroke.expected.png b/tests/TestFiles/Direct2D1/Shapes/Polyline/Polyline_1px_Stroke.expected.png
deleted file mode 100644
index 544d9e2320..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Polyline/Polyline_1px_Stroke.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_0px_Stroke.expected.png b/tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_0px_Stroke.expected.png
deleted file mode 100644
index 27aacea049..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_0px_Stroke.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_1px_Stroke.expected.png b/tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_1px_Stroke.expected.png
deleted file mode 100644
index 24239d5799..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_1px_Stroke.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_2px_Stroke.expected.png b/tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_2px_Stroke.expected.png
deleted file mode 100644
index cebe42f3df..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_2px_Stroke.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_Stroke_Fill.expected.png b/tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_Stroke_Fill.expected.png
deleted file mode 100644
index d1c13a9e57..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_Stroke_Fill.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_Stroke_Fill_ClipToBounds.expected.png b/tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_Stroke_Fill_ClipToBounds.expected.png
deleted file mode 100644
index d1c13a9e57..0000000000
Binary files a/tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_Stroke_Fill_ClipToBounds.expected.png and /dev/null differ