diff --git a/Annotations.cs b/Annotations.cs
index e2ffae5ab..bbdb5dd42 100644
--- a/Annotations.cs
+++ b/Annotations.cs
@@ -1,4 +1,6 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+#pragma warning disable IDE0073 // The file header does not match the required text
+
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 #if NETFRAMEWORK || NETSTANDARD1_3
 
diff --git a/MetadataExtractor.Tests/AgeTest.cs b/MetadataExtractor.Tests/AgeTest.cs
index 659b7baa1..82e1cde76 100644
--- a/MetadataExtractor.Tests/AgeTest.cs
+++ b/MetadataExtractor.Tests/AgeTest.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-namespace MetadataExtractor.Tests
+namespace MetadataExtractor
 {
     /// <summary>Unit tests for <see cref="Age"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/DirectoryExtensionsTest.cs b/MetadataExtractor.Tests/DirectoryExtensionsTest.cs
index ffdc1532a..93c8bc82c 100644
--- a/MetadataExtractor.Tests/DirectoryExtensionsTest.cs
+++ b/MetadataExtractor.Tests/DirectoryExtensionsTest.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-namespace MetadataExtractor.Tests
+namespace MetadataExtractor
 {
     /// <summary>Unit tests for <see cref="DirectoryExtensions"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/DirectoryTest.cs b/MetadataExtractor.Tests/DirectoryTest.cs
index 187bf89d9..e662f7bf7 100644
--- a/MetadataExtractor.Tests/DirectoryTest.cs
+++ b/MetadataExtractor.Tests/DirectoryTest.cs
@@ -3,7 +3,7 @@
 using System.Globalization;
 using MetadataExtractor.Formats.Exif;
 
-namespace MetadataExtractor.Tests
+namespace MetadataExtractor
 {
     /// <summary>Unit tests for <see cref="Directory"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Adobe/AdobeJpegReaderTest.cs b/MetadataExtractor.Tests/Formats/Adobe/AdobeJpegReaderTest.cs
index 0530a37e0..c4646d6e4 100644
--- a/MetadataExtractor.Tests/Formats/Adobe/AdobeJpegReaderTest.cs
+++ b/MetadataExtractor.Tests/Formats/Adobe/AdobeJpegReaderTest.cs
@@ -1,9 +1,8 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Adobe;
 using MetadataExtractor.Formats.Jpeg;
 
-namespace MetadataExtractor.Tests.Formats.Adobe
+namespace MetadataExtractor.Formats.Adobe
 {
     /// <summary>Unit tests for <see cref="AdobeJpegReader"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Bmp/BmpReaderTest.cs b/MetadataExtractor.Tests/Formats/Bmp/BmpReaderTest.cs
index f577a06b0..1801f43af 100644
--- a/MetadataExtractor.Tests/Formats/Bmp/BmpReaderTest.cs
+++ b/MetadataExtractor.Tests/Formats/Bmp/BmpReaderTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Bmp;
-
-namespace MetadataExtractor.Tests.Formats.Bmp
+namespace MetadataExtractor.Formats.Bmp
 {
     /// <summary>Unit tests for <see cref="BmpReader"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Exif/CanonMakernoteDescriptorTest.cs b/MetadataExtractor.Tests/Formats/Exif/CanonMakernoteDescriptorTest.cs
index 9078cbd5e..ef302657f 100644
--- a/MetadataExtractor.Tests/Formats/Exif/CanonMakernoteDescriptorTest.cs
+++ b/MetadataExtractor.Tests/Formats/Exif/CanonMakernoteDescriptorTest.cs
@@ -2,7 +2,7 @@
 
 using MetadataExtractor.Formats.Exif.Makernotes;
 
-namespace MetadataExtractor.Tests.Formats.Exif
+namespace MetadataExtractor.Formats.Exif
 {
     /// <summary>Unit tests for <see cref="CanonMakernoteDescriptor"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Exif/ExifDirectoryTest.cs b/MetadataExtractor.Tests/Formats/Exif/ExifDirectoryTest.cs
index 87040067f..1c0a54376 100644
--- a/MetadataExtractor.Tests/Formats/Exif/ExifDirectoryTest.cs
+++ b/MetadataExtractor.Tests/Formats/Exif/ExifDirectoryTest.cs
@@ -1,9 +1,8 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Exif;
 using MetadataExtractor.Formats.Jpeg;
 
-namespace MetadataExtractor.Tests.Formats.Exif
+namespace MetadataExtractor.Formats.Exif
 {
     /// <summary>
     /// Unit tests for <see cref="ExifSubIfdDirectory"/>, <see cref="ExifIfd0Directory"/>, <see cref="ExifThumbnailDirectory"/>.
diff --git a/MetadataExtractor.Tests/Formats/Exif/ExifIFD0DescriptorTest.cs b/MetadataExtractor.Tests/Formats/Exif/ExifIFD0DescriptorTest.cs
index 1c27e0db3..2a0365e46 100644
--- a/MetadataExtractor.Tests/Formats/Exif/ExifIFD0DescriptorTest.cs
+++ b/MetadataExtractor.Tests/Formats/Exif/ExifIFD0DescriptorTest.cs
@@ -1,9 +1,8 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Exif;
 using MetadataExtractor.Formats.Jpeg;
 
-namespace MetadataExtractor.Tests.Formats.Exif
+namespace MetadataExtractor.Formats.Exif
 {
     /// <summary>Unit tests for <see cref="ExifIfd0Descriptor"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Exif/ExifInteropDescriptorTest.cs b/MetadataExtractor.Tests/Formats/Exif/ExifInteropDescriptorTest.cs
index cc7215f05..db076202e 100644
--- a/MetadataExtractor.Tests/Formats/Exif/ExifInteropDescriptorTest.cs
+++ b/MetadataExtractor.Tests/Formats/Exif/ExifInteropDescriptorTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Exif;
-
-namespace MetadataExtractor.Tests.Formats.Exif
+namespace MetadataExtractor.Formats.Exif
 {
     /// <summary>Unit tests for <see cref="ExifInteropDescriptor"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Exif/ExifReaderGremlinTest.cs b/MetadataExtractor.Tests/Formats/Exif/ExifReaderGremlinTest.cs
index eb13126cf..74a22ef89 100644
--- a/MetadataExtractor.Tests/Formats/Exif/ExifReaderGremlinTest.cs
+++ b/MetadataExtractor.Tests/Formats/Exif/ExifReaderGremlinTest.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Exif;
 using MetadataExtractor.Formats.Jpeg;
 using Xunit.Abstractions;
 
-namespace MetadataExtractor.Tests.Formats.Exif
+namespace MetadataExtractor.Formats.Exif
 {
     /// <summary>
     /// Long-running test of <see cref="ExifReader"/> that attempts to verify exceptions are not thrown for invalid input.
diff --git a/MetadataExtractor.Tests/Formats/Exif/ExifReaderTest.cs b/MetadataExtractor.Tests/Formats/Exif/ExifReaderTest.cs
index 8d0f9f406..9b8a45dcd 100644
--- a/MetadataExtractor.Tests/Formats/Exif/ExifReaderTest.cs
+++ b/MetadataExtractor.Tests/Formats/Exif/ExifReaderTest.cs
@@ -1,9 +1,8 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Exif;
 using MetadataExtractor.Formats.Jpeg;
 
-namespace MetadataExtractor.Tests.Formats.Exif
+namespace MetadataExtractor.Formats.Exif
 {
     /// <summary>Unit tests for <see cref="ExifReader"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Exif/ExifSubIFDDescriptorTest.cs b/MetadataExtractor.Tests/Formats/Exif/ExifSubIFDDescriptorTest.cs
index 7826afec0..dff25f623 100644
--- a/MetadataExtractor.Tests/Formats/Exif/ExifSubIFDDescriptorTest.cs
+++ b/MetadataExtractor.Tests/Formats/Exif/ExifSubIFDDescriptorTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Exif;
-
-namespace MetadataExtractor.Tests.Formats.Exif
+namespace MetadataExtractor.Formats.Exif
 {
     /// <summary>Unit tests for <see cref="ExifSubIfdDescriptor"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Exif/ExifThumbnailDescriptorTest.cs b/MetadataExtractor.Tests/Formats/Exif/ExifThumbnailDescriptorTest.cs
index 9f698442d..b02728902 100644
--- a/MetadataExtractor.Tests/Formats/Exif/ExifThumbnailDescriptorTest.cs
+++ b/MetadataExtractor.Tests/Formats/Exif/ExifThumbnailDescriptorTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Exif;
-
-namespace MetadataExtractor.Tests.Formats.Exif
+namespace MetadataExtractor.Formats.Exif
 {
     /// <summary>Unit tests for <see cref="ExifThumbnailDescriptor"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Exif/NikonType1MakernoteTest.cs b/MetadataExtractor.Tests/Formats/Exif/NikonType1MakernoteTest.cs
index 0ff1a3e64..3b718505f 100644
--- a/MetadataExtractor.Tests/Formats/Exif/NikonType1MakernoteTest.cs
+++ b/MetadataExtractor.Tests/Formats/Exif/NikonType1MakernoteTest.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Exif;
 using MetadataExtractor.Formats.Exif.Makernotes;
 using MetadataExtractor.Formats.Jpeg;
 
-namespace MetadataExtractor.Tests.Formats.Exif
+namespace MetadataExtractor.Formats.Exif
 {
     /// <summary>Unit tests for Nikon (Type 1) makernote handling.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Exif/NikonType2MakernoteTest.cs b/MetadataExtractor.Tests/Formats/Exif/NikonType2MakernoteTest.cs
index b21fa260a..36b84b763 100644
--- a/MetadataExtractor.Tests/Formats/Exif/NikonType2MakernoteTest.cs
+++ b/MetadataExtractor.Tests/Formats/Exif/NikonType2MakernoteTest.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Exif;
 using MetadataExtractor.Formats.Exif.Makernotes;
 using MetadataExtractor.Formats.Jpeg;
 
-namespace MetadataExtractor.Tests.Formats.Exif
+namespace MetadataExtractor.Formats.Exif
 {
     /// <summary>Unit tests for Nikon (Type 2) makernote handling.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Exif/PanasonicMakernoteTest.cs b/MetadataExtractor.Tests/Formats/Exif/PanasonicMakernoteTest.cs
index 554ed59c5..9f7413305 100644
--- a/MetadataExtractor.Tests/Formats/Exif/PanasonicMakernoteTest.cs
+++ b/MetadataExtractor.Tests/Formats/Exif/PanasonicMakernoteTest.cs
@@ -3,7 +3,7 @@
 using MetadataExtractor.Formats.Exif.Makernotes;
 using MetadataExtractor.Formats.Jpeg;
 
-namespace MetadataExtractor.Tests.Formats.Exif
+namespace MetadataExtractor.Formats.Exif
 {
     /// <summary>Unit tests for Panasonic maker notes.</summary>
     /// <author>psandhaus</author>
diff --git a/MetadataExtractor.Tests/Formats/Exif/SonyType1MakernoteTest.cs b/MetadataExtractor.Tests/Formats/Exif/SonyType1MakernoteTest.cs
index 10a81ff01..277037282 100644
--- a/MetadataExtractor.Tests/Formats/Exif/SonyType1MakernoteTest.cs
+++ b/MetadataExtractor.Tests/Formats/Exif/SonyType1MakernoteTest.cs
@@ -3,7 +3,7 @@
 using MetadataExtractor.Formats.Exif.Makernotes;
 using MetadataExtractor.Formats.Jpeg;
 
-namespace MetadataExtractor.Tests.Formats.Exif
+namespace MetadataExtractor.Formats.Exif
 {
     /// <summary>Unit tests for Sony (Type 1) maker notes.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Exif/SonyType6MakernoteTest.cs b/MetadataExtractor.Tests/Formats/Exif/SonyType6MakernoteTest.cs
index c5ea707a2..3a70de712 100644
--- a/MetadataExtractor.Tests/Formats/Exif/SonyType6MakernoteTest.cs
+++ b/MetadataExtractor.Tests/Formats/Exif/SonyType6MakernoteTest.cs
@@ -3,7 +3,7 @@
 using MetadataExtractor.Formats.Exif.Makernotes;
 using MetadataExtractor.Formats.Jpeg;
 
-namespace MetadataExtractor.Tests.Formats.Exif
+namespace MetadataExtractor.Formats.Exif
 {
     /// <summary>Unit tests for Sony (Type 6) maker notes.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Gif/GifReaderTest.cs b/MetadataExtractor.Tests/Formats/Gif/GifReaderTest.cs
index a36b69f75..d09a253be 100644
--- a/MetadataExtractor.Tests/Formats/Gif/GifReaderTest.cs
+++ b/MetadataExtractor.Tests/Formats/Gif/GifReaderTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Gif;
-
-namespace MetadataExtractor.Tests.Formats.Gif
+namespace MetadataExtractor.Formats.Gif
 {
     /// <summary>Unit tests for <see cref="GifReader"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Icc/IccReaderTest.cs b/MetadataExtractor.Tests/Formats/Icc/IccReaderTest.cs
index ff6e8400f..816baa5ad 100644
--- a/MetadataExtractor.Tests/Formats/Icc/IccReaderTest.cs
+++ b/MetadataExtractor.Tests/Formats/Icc/IccReaderTest.cs
@@ -1,9 +1,8 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Icc;
 using MetadataExtractor.Formats.Jpeg;
 
-namespace MetadataExtractor.Tests.Formats.Icc
+namespace MetadataExtractor.Formats.Icc
 {
     /// <summary>Unit tests for <see cref="IccReader"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Iptc/IptcDirectoryTest.cs b/MetadataExtractor.Tests/Formats/Iptc/IptcDirectoryTest.cs
index 98871cc94..66fbda92c 100644
--- a/MetadataExtractor.Tests/Formats/Iptc/IptcDirectoryTest.cs
+++ b/MetadataExtractor.Tests/Formats/Iptc/IptcDirectoryTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Iptc;
-
-namespace MetadataExtractor.Tests.Formats.Iptc
+namespace MetadataExtractor.Formats.Iptc
 {
     /// <summary>Unit tests for <see cref="IptcDirectory"/>.</summary>
     /// <author>Akihiko Kusanagi https://github.com/nagix</author>
diff --git a/MetadataExtractor.Tests/Formats/Iptc/IptcReaderTest.cs b/MetadataExtractor.Tests/Formats/Iptc/IptcReaderTest.cs
index 8d1d8213d..4e8ad7e46 100644
--- a/MetadataExtractor.Tests/Formats/Iptc/IptcReaderTest.cs
+++ b/MetadataExtractor.Tests/Formats/Iptc/IptcReaderTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Iptc;
-
-namespace MetadataExtractor.Tests.Formats.Iptc
+namespace MetadataExtractor.Formats.Iptc
 {
     /// <summary>Unit tests for <see cref="IptcReader"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Iptc/Iso2022ConverterTest.cs b/MetadataExtractor.Tests/Formats/Iptc/Iso2022ConverterTest.cs
index 66d344418..e53302417 100644
--- a/MetadataExtractor.Tests/Formats/Iptc/Iso2022ConverterTest.cs
+++ b/MetadataExtractor.Tests/Formats/Iptc/Iso2022ConverterTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Iptc;
-
-namespace MetadataExtractor.Tests.Formats.Iptc
+namespace MetadataExtractor.Formats.Iptc
 {
     /// <summary>Unit tests for <see cref="Iso2022Converter"/>.</summary>
     public sealed class Iso2022ConverterTest
diff --git a/MetadataExtractor.Tests/Formats/Jfif/JfifReaderTest.cs b/MetadataExtractor.Tests/Formats/Jfif/JfifReaderTest.cs
index 0ebaa7cdf..3b8317729 100644
--- a/MetadataExtractor.Tests/Formats/Jfif/JfifReaderTest.cs
+++ b/MetadataExtractor.Tests/Formats/Jfif/JfifReaderTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Jfif;
-
-namespace MetadataExtractor.Tests.Formats.Jfif
+namespace MetadataExtractor.Formats.Jfif
 {
     /// <summary>Unit tests for <see cref="JfifReader"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Jpeg/HuffmanTablesDirectoryTest.cs b/MetadataExtractor.Tests/Formats/Jpeg/HuffmanTablesDirectoryTest.cs
index 64024786a..e627666c5 100644
--- a/MetadataExtractor.Tests/Formats/Jpeg/HuffmanTablesDirectoryTest.cs
+++ b/MetadataExtractor.Tests/Formats/Jpeg/HuffmanTablesDirectoryTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Jpeg;
-
-namespace MetadataExtractor.Tests.Formats.Jpeg
+namespace MetadataExtractor.Formats.Jpeg
 {
     /// <summary>Unit tests for <see cref="HuffmanTablesDirectory"/>.</summary>
     /// <author>Nadahar</author>
diff --git a/MetadataExtractor.Tests/Formats/Jpeg/JpegComponentTest.cs b/MetadataExtractor.Tests/Formats/Jpeg/JpegComponentTest.cs
index bbf44193a..64e022fec 100644
--- a/MetadataExtractor.Tests/Formats/Jpeg/JpegComponentTest.cs
+++ b/MetadataExtractor.Tests/Formats/Jpeg/JpegComponentTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Jpeg;
-
-namespace MetadataExtractor.Tests.Formats.Jpeg
+namespace MetadataExtractor.Formats.Jpeg
 {
     /// <summary>Unit tests for <see cref="JpegComponent"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Jpeg/JpegDescriptorTest.cs b/MetadataExtractor.Tests/Formats/Jpeg/JpegDescriptorTest.cs
index 84f918110..fc2396a0f 100644
--- a/MetadataExtractor.Tests/Formats/Jpeg/JpegDescriptorTest.cs
+++ b/MetadataExtractor.Tests/Formats/Jpeg/JpegDescriptorTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Jpeg;
-
-namespace MetadataExtractor.Tests.Formats.Jpeg
+namespace MetadataExtractor.Formats.Jpeg
 {
     /// <summary>Unit tests for <see cref="JpegDescriptor"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Jpeg/JpegDirectoryTest.cs b/MetadataExtractor.Tests/Formats/Jpeg/JpegDirectoryTest.cs
index 63971ae69..59d709a42 100644
--- a/MetadataExtractor.Tests/Formats/Jpeg/JpegDirectoryTest.cs
+++ b/MetadataExtractor.Tests/Formats/Jpeg/JpegDirectoryTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Jpeg;
-
-namespace MetadataExtractor.Tests.Formats.Jpeg
+namespace MetadataExtractor.Formats.Jpeg
 {
     /// <summary>Unit tests for <see cref="JpegDirectory"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Jpeg/JpegMetadataReaderTest.cs b/MetadataExtractor.Tests/Formats/Jpeg/JpegMetadataReaderTest.cs
index ac1fc587c..cf32af504 100644
--- a/MetadataExtractor.Tests/Formats/Jpeg/JpegMetadataReaderTest.cs
+++ b/MetadataExtractor.Tests/Formats/Jpeg/JpegMetadataReaderTest.cs
@@ -1,9 +1,8 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 using MetadataExtractor.Formats.Exif;
-using MetadataExtractor.Formats.Jpeg;
 
-namespace MetadataExtractor.Tests.Formats.Jpeg
+namespace MetadataExtractor.Formats.Jpeg
 {
     /// <summary>Unit tests for <see cref="JpegMetadataReader"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Jpeg/JpegReaderTest.cs b/MetadataExtractor.Tests/Formats/Jpeg/JpegReaderTest.cs
index f04b1f151..10e76a49e 100644
--- a/MetadataExtractor.Tests/Formats/Jpeg/JpegReaderTest.cs
+++ b/MetadataExtractor.Tests/Formats/Jpeg/JpegReaderTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Jpeg;
-
-namespace MetadataExtractor.Tests.Formats.Jpeg
+namespace MetadataExtractor.Formats.Jpeg
 {
     /// <summary>Unit tests for <see cref="JpegReader"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Jpeg/JpegSegmentReaderTest.cs b/MetadataExtractor.Tests/Formats/Jpeg/JpegSegmentReaderTest.cs
index b7385f69c..dec050694 100644
--- a/MetadataExtractor.Tests/Formats/Jpeg/JpegSegmentReaderTest.cs
+++ b/MetadataExtractor.Tests/Formats/Jpeg/JpegSegmentReaderTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Jpeg;
-
-namespace MetadataExtractor.Tests.Formats.Jpeg
+namespace MetadataExtractor.Formats.Jpeg
 {
     /// <summary>Unit tests for <see cref="JpegSegmentReader"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Netpbm/NetpbmReaderTest.cs b/MetadataExtractor.Tests/Formats/Netpbm/NetpbmReaderTest.cs
index 87bb584d6..5c36dcbf2 100644
--- a/MetadataExtractor.Tests/Formats/Netpbm/NetpbmReaderTest.cs
+++ b/MetadataExtractor.Tests/Formats/Netpbm/NetpbmReaderTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Netpbm;
-
-namespace MetadataExtractor.Tests.Formats.Netpbm
+namespace MetadataExtractor.Formats.Netpbm
 {
     /// <summary>Unit tests for <see cref="NetpbmReader"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Photoshop/PsdReaderTest.cs b/MetadataExtractor.Tests/Formats/Photoshop/PsdReaderTest.cs
index 90cb97240..98d990253 100644
--- a/MetadataExtractor.Tests/Formats/Photoshop/PsdReaderTest.cs
+++ b/MetadataExtractor.Tests/Formats/Photoshop/PsdReaderTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Photoshop;
-
-namespace MetadataExtractor.Tests.Formats.Photoshop
+namespace MetadataExtractor.Formats.Photoshop
 {
     /// <summary>Unit tests for <see cref="PsdReader"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Png/PngChunkReaderTest.cs b/MetadataExtractor.Tests/Formats/Png/PngChunkReaderTest.cs
index c3b9cb392..ad991f4f4 100644
--- a/MetadataExtractor.Tests/Formats/Png/PngChunkReaderTest.cs
+++ b/MetadataExtractor.Tests/Formats/Png/PngChunkReaderTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Png;
-
-namespace MetadataExtractor.Tests.Formats.Png
+namespace MetadataExtractor.Formats.Png
 {
     /// <summary>Unit tests for <see cref="PngChunkReader"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Png/PngChunkTypeTest.cs b/MetadataExtractor.Tests/Formats/Png/PngChunkTypeTest.cs
index 61d35e199..c0f7449ff 100644
--- a/MetadataExtractor.Tests/Formats/Png/PngChunkTypeTest.cs
+++ b/MetadataExtractor.Tests/Formats/Png/PngChunkTypeTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Png;
-
-namespace MetadataExtractor.Tests.Formats.Png
+namespace MetadataExtractor.Formats.Png
 {
     /// <summary>Unit tests for <see cref="PngChunkType"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/Png/PngDescriptorTest.cs b/MetadataExtractor.Tests/Formats/Png/PngDescriptorTest.cs
index 893188ab0..ddc773dff 100644
--- a/MetadataExtractor.Tests/Formats/Png/PngDescriptorTest.cs
+++ b/MetadataExtractor.Tests/Formats/Png/PngDescriptorTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Png;
-
-namespace MetadataExtractor.Tests.Formats.Png
+namespace MetadataExtractor.Formats.Png
 {
     /// <summary>Unit tests for <see cref="PngDescriptor"/>.</summary>
     /// <author>Akihiko Kusanagi</author>
diff --git a/MetadataExtractor.Tests/Formats/Png/PngMetadataReaderTest.cs b/MetadataExtractor.Tests/Formats/Png/PngMetadataReaderTest.cs
index c17abcbd8..335826067 100644
--- a/MetadataExtractor.Tests/Formats/Png/PngMetadataReaderTest.cs
+++ b/MetadataExtractor.Tests/Formats/Png/PngMetadataReaderTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using MetadataExtractor.Formats.Png;
-
-namespace MetadataExtractor.Tests.Formats.Png
+namespace MetadataExtractor.Formats.Png
 {
     /// <summary>Unit tests for <see cref="PngMetadataReader"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Formats/QuickTime/QuickTimeReaderExtensionsTests.cs b/MetadataExtractor.Tests/Formats/QuickTime/QuickTimeReaderExtensionsTests.cs
new file mode 100644
index 000000000..cd3726ded
--- /dev/null
+++ b/MetadataExtractor.Tests/Formats/QuickTime/QuickTimeReaderExtensionsTests.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
+
+namespace MetadataExtractor.Formats.QuickTime;
+
+public sealed class QuickTimeReaderExtensionsTests
+{
+    [Fact]
+    public void Get4ccString()
+    {
+        byte[] bytes = [0x66, 0x74, 0x79, 0x70];
+
+        SequentialReader reader = new SequentialByteArrayReader(bytes);
+
+        Assert.Equal("ftyp", reader.Get4ccString());
+    }
+}
diff --git a/MetadataExtractor.Tests/Formats/Xmp/XmpReaderTest.cs b/MetadataExtractor.Tests/Formats/Xmp/XmpReaderTest.cs
index 6173baf99..df4ad3197 100644
--- a/MetadataExtractor.Tests/Formats/Xmp/XmpReaderTest.cs
+++ b/MetadataExtractor.Tests/Formats/Xmp/XmpReaderTest.cs
@@ -1,9 +1,8 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 using MetadataExtractor.Formats.Jpeg;
-using MetadataExtractor.Formats.Xmp;
 
-namespace MetadataExtractor.Tests.Formats.Xmp
+namespace MetadataExtractor.Formats.Xmp
 {
     /// <summary>Unit tests for <see cref="XmpReader"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/GeoLocationTest.cs b/MetadataExtractor.Tests/GeoLocationTest.cs
index dc4683673..e6232cdfc 100644
--- a/MetadataExtractor.Tests/GeoLocationTest.cs
+++ b/MetadataExtractor.Tests/GeoLocationTest.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-namespace MetadataExtractor.Tests
+namespace MetadataExtractor
 {
     /// <summary>Unit tests for <see cref="GeoLocation"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/IO/BitReaderTest.cs b/MetadataExtractor.Tests/IO/BitReaderTest.cs
index b50a4b98a..45c88217a 100644
--- a/MetadataExtractor.Tests/IO/BitReaderTest.cs
+++ b/MetadataExtractor.Tests/IO/BitReaderTest.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-namespace MetadataExtractor.Tests.IO
+namespace MetadataExtractor.IO
 {
     public sealed class BitReaderTest
     {
diff --git a/MetadataExtractor.Tests/IO/ByteArrayReaderTest.cs b/MetadataExtractor.Tests/IO/ByteArrayReaderTest.cs
index 9e92700c2..f9393fc7f 100644
--- a/MetadataExtractor.Tests/IO/ByteArrayReaderTest.cs
+++ b/MetadataExtractor.Tests/IO/ByteArrayReaderTest.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-namespace MetadataExtractor.Tests.IO
+namespace MetadataExtractor.IO
 {
     /// <summary>Unit tests for <see cref="ByteArrayReader"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/IO/IndexedCapturingReaderTest.cs b/MetadataExtractor.Tests/IO/IndexedCapturingReaderTest.cs
index d3f88838c..19f9fee1b 100644
--- a/MetadataExtractor.Tests/IO/IndexedCapturingReaderTest.cs
+++ b/MetadataExtractor.Tests/IO/IndexedCapturingReaderTest.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-namespace MetadataExtractor.Tests.IO
+namespace MetadataExtractor.IO
 {
     /// <summary>Unit tests for <see cref="IndexedCapturingReader"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/IO/IndexedReaderTestBase.cs b/MetadataExtractor.Tests/IO/IndexedReaderTestBase.cs
index 17c57c378..5a4b09462 100644
--- a/MetadataExtractor.Tests/IO/IndexedReaderTestBase.cs
+++ b/MetadataExtractor.Tests/IO/IndexedReaderTestBase.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-namespace MetadataExtractor.Tests.IO
+namespace MetadataExtractor.IO
 {
     /// <summary>Base class for testing implementations of <see cref="IndexedReader"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/IO/IndexedSeekingReaderTest.cs b/MetadataExtractor.Tests/IO/IndexedSeekingReaderTest.cs
index 3ab6701dd..e2ad12b76 100644
--- a/MetadataExtractor.Tests/IO/IndexedSeekingReaderTest.cs
+++ b/MetadataExtractor.Tests/IO/IndexedSeekingReaderTest.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-namespace MetadataExtractor.Tests.IO
+namespace MetadataExtractor.IO
 {
     /// <summary>Unit tests for <see cref="IndexedSeekingReader"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/IO/SequentialByteArrayReaderTest.cs b/MetadataExtractor.Tests/IO/SequentialByteArrayReaderTest.cs
index 24b2f734a..34e15af96 100644
--- a/MetadataExtractor.Tests/IO/SequentialByteArrayReaderTest.cs
+++ b/MetadataExtractor.Tests/IO/SequentialByteArrayReaderTest.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-namespace MetadataExtractor.Tests.IO
+namespace MetadataExtractor.IO
 {
     /// <summary>Unit tests for <see cref="SequentialByteArrayReader"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/IO/SequentialReaderTestBase.cs b/MetadataExtractor.Tests/IO/SequentialReaderTestBase.cs
index a88fb843a..9cb01a183 100644
--- a/MetadataExtractor.Tests/IO/SequentialReaderTestBase.cs
+++ b/MetadataExtractor.Tests/IO/SequentialReaderTestBase.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-namespace MetadataExtractor.Tests.IO
+namespace MetadataExtractor.IO
 {
     /// <summary>Base class for testing implementations of <see cref="SequentialReader"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/IO/SequentialStreamReaderTest.cs b/MetadataExtractor.Tests/IO/SequentialStreamReaderTest.cs
index 3ef743a01..34337f5af 100644
--- a/MetadataExtractor.Tests/IO/SequentialStreamReaderTest.cs
+++ b/MetadataExtractor.Tests/IO/SequentialStreamReaderTest.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-namespace MetadataExtractor.Tests.IO
+namespace MetadataExtractor.IO
 {
     /// <summary>Unit tests for <see cref="SequentialStreamReader"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/MetadataExtractor.Tests.csproj b/MetadataExtractor.Tests/MetadataExtractor.Tests.csproj
index 71f888842..532f6f7e3 100644
--- a/MetadataExtractor.Tests/MetadataExtractor.Tests.csproj
+++ b/MetadataExtractor.Tests/MetadataExtractor.Tests.csproj
@@ -3,6 +3,8 @@
   <PropertyGroup>
     <TargetFrameworks>net8.0;net472</TargetFrameworks>
 
+    <RootNamespace>MetadataExtractor</RootNamespace>
+
     <RestoreAdditionalProjectSources>
       $(RestoreAdditionalProjectSources);
       https://www.myget.org/F/xunit/api/v3/index.json
diff --git a/MetadataExtractor.Tests/MockDirectory.cs b/MetadataExtractor.Tests/MockDirectory.cs
index bb2958898..d6f43a092 100644
--- a/MetadataExtractor.Tests/MockDirectory.cs
+++ b/MetadataExtractor.Tests/MockDirectory.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-namespace MetadataExtractor.Tests
+namespace MetadataExtractor
 {
     /// <summary>A mock implementation of Directory used in unit testing.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/RationalTest.cs b/MetadataExtractor.Tests/RationalTest.cs
index 3961b8575..4289da174 100644
--- a/MetadataExtractor.Tests/RationalTest.cs
+++ b/MetadataExtractor.Tests/RationalTest.cs
@@ -4,7 +4,7 @@
 
 // ReSharper disable ReturnValueOfPureMethodIsNotUsed
 
-namespace MetadataExtractor.Tests
+namespace MetadataExtractor
 {
     /// <summary>Unit tests for the <see cref="Rational"/> type.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/StringValueTest.cs b/MetadataExtractor.Tests/StringValueTest.cs
index 72d1925af..35afeb394 100644
--- a/MetadataExtractor.Tests/StringValueTest.cs
+++ b/MetadataExtractor.Tests/StringValueTest.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-namespace MetadataExtractor.Tests;
+namespace MetadataExtractor;
 
 public sealed class StringValueTest
 {
diff --git a/MetadataExtractor.Tests/TagDescriptorTests.cs b/MetadataExtractor.Tests/TagDescriptorTests.cs
index 591ea1d79..68023d574 100644
--- a/MetadataExtractor.Tests/TagDescriptorTests.cs
+++ b/MetadataExtractor.Tests/TagDescriptorTests.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-namespace MetadataExtractor.Tests
+namespace MetadataExtractor
 {
     /// <summary>Unit tests for <see cref="TagDescriptor{T}"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/TestDataUtil.cs b/MetadataExtractor.Tests/TestDataUtil.cs
index a6e30161b..f4cf3a11c 100644
--- a/MetadataExtractor.Tests/TestDataUtil.cs
+++ b/MetadataExtractor.Tests/TestDataUtil.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-namespace MetadataExtractor.Tests
+namespace MetadataExtractor
 {
     /// <summary>Utility functions for working with unit tests data files.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/TestHelper.cs b/MetadataExtractor.Tests/TestHelper.cs
index 069a79019..9d18bfae2 100644
--- a/MetadataExtractor.Tests/TestHelper.cs
+++ b/MetadataExtractor.Tests/TestHelper.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-namespace MetadataExtractor.Tests
+namespace MetadataExtractor
 {
     /// <author>Drew Noakes https://drewnoakes.com</author>
     public static class TestHelper
diff --git a/MetadataExtractor.Tests/UseCultureAttribute.cs b/MetadataExtractor.Tests/UseCultureAttribute.cs
index 24ed1ab6d..220b217e7 100644
--- a/MetadataExtractor.Tests/UseCultureAttribute.cs
+++ b/MetadataExtractor.Tests/UseCultureAttribute.cs
@@ -6,7 +6,7 @@
 
 // ReSharper disable MemberCanBePrivate.Global
 
-namespace MetadataExtractor.Tests
+namespace MetadataExtractor
 {
     /// <summary>
     /// Apply this attribute to your test method to replace the
diff --git a/MetadataExtractor.Tests/Util/ByteTrieTest.cs b/MetadataExtractor.Tests/Util/ByteTrieTest.cs
index 10e288a76..86e24112a 100644
--- a/MetadataExtractor.Tests/Util/ByteTrieTest.cs
+++ b/MetadataExtractor.Tests/Util/ByteTrieTest.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-namespace MetadataExtractor.Tests.Util
+namespace MetadataExtractor.Util
 {
     /// <summary>Unit tests for <see cref="ByteTrie{T}"/>.</summary>
     /// <author>Drew Noakes https://drewnoakes.com</author>
diff --git a/MetadataExtractor.Tests/Util/FileTypeTest.cs b/MetadataExtractor.Tests/Util/FileTypeTest.cs
index 02aa75576..0788aeba1 100644
--- a/MetadataExtractor.Tests/Util/FileTypeTest.cs
+++ b/MetadataExtractor.Tests/Util/FileTypeTest.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-namespace MetadataExtractor.Tests.Util
+namespace MetadataExtractor.Util
 {
     public class FileTypeTest
     {