Add new CMP test file, fix issues

SabreTools.Models/ClrMamePro/Archive.cs

@@ -1,7 +1,7 @@
 namespace SabreTools.Models.ClrMamePro
 {
     /// <remarks>archive</remarks>
-    public class Archive : ItemBase
+    public class Archive
     {
         /// <remarks>name</remarks>
         public string Name { get; set; }

SabreTools.Models/ClrMamePro/BiosSet.cs

@@ -1,7 +1,7 @@
 namespace SabreTools.Models.ClrMamePro
 {
     /// <remarks>biosset</remarks>
-    public class BiosSet : ItemBase
+    public class BiosSet
     {
         /// <remarks>name</remarks>
         public string Name { get; set; }

SabreTools.Models/ClrMamePro/Chip.cs

@@ -0,0 +1,25 @@
+namespace SabreTools.Models.ClrMamePro
+{
+    /// <remarks>chip</remarks>
+    public class Chip
+    {
+        /// <remarks>type, (cpu|audio)</remarks>
+        public string Type { get; set; }
+
+        /// <remarks>name</remarks>
+        public string Name { get; set; }
+
+        /// <remarks>flags</remarks>
+        public string? Flags { get; set; }
+
+        /// <remarks>clock</remarks>
+        public string? Clock { get; set; }
+
+        #region DO NOT USE IN PRODUCTION
+
+        /// <remarks>Should be empty</remarks>
+        public object[]? ADDITIONAL_ELEMENTS { get; set; }
+
+        #endregion
+    }
+}

SabreTools.Models/ClrMamePro/DipSwitch.cs

@@ -0,0 +1,22 @@
+namespace SabreTools.Models.ClrMamePro
+{
+    /// <remarks>dipswitch</remarks>
+    public class DipSwitch
+    {
+        /// <remarks>name</remarks>
+        public string Name { get; set; }
+
+        /// <remarks>entry</remarks>
+        public string[]? Entry { get; set; }
+
+        /// <remarks>default</remarks>
+        public string? Default { get; set; }
+
+        #region DO NOT USE IN PRODUCTION
+
+        /// <remarks>Should be empty</remarks>
+        public object[]? ADDITIONAL_ELEMENTS { get; set; }
+
+        #endregion
+    }
+}

SabreTools.Models/ClrMamePro/Disk.cs

@@ -1,7 +1,7 @@
 namespace SabreTools.Models.ClrMamePro
 {
     /// <remarks>disk</remarks>
-    public class Disk : ItemBase
+    public class Disk
     {
         /// <remarks>name</remarks>
         public string Name { get; set; }

SabreTools.Models/ClrMamePro/Driver.cs

@@ -0,0 +1,28 @@
+namespace SabreTools.Models.ClrMamePro
+{
+    /// <remarks>driver</remarks>
+    public class Driver
+    {
+        /// <remarks>status, (good|imperfect|preliminary)</remarks>
+        public string Status { get; set; }
+
+        /// <remarks>color, (good|imperfect|preliminary)</remarks>
+        public string Color { get; set; }
+
+        /// <remarks>sound, (good|imperfect|preliminary)</remarks>
+        public string Sound { get; set; }
+
+        /// <remarks>palettesize, Numeric?</remarks>
+        public string PaletteSize { get; set; }
+
+        /// <remarks>blit, (plain|dirty)</remarks>
+        public string Blit { get; set; }
+
+        #region DO NOT USE IN PRODUCTION
+
+        /// <remarks>Should be empty</remarks>
+        public object[]? ADDITIONAL_ELEMENTS { get; set; }
+
+        #endregion
+    }
+}

SabreTools.Models/ClrMamePro/GameBase.cs

@@ -29,8 +29,52 @@ namespace SabreTools.Models.ClrMamePro
         /// <remarks>sampleof</remarks>
         public string? SampleOf { get; set; }
 
-        /// <remarks>release, biosset, rom, disk, media, sample, archive</remarks>
+        /// <remarks>release</remarks>
-        public ItemBase[]? Item { get; set; }
+        public Release[]? Release { get; set; }
+
+        /// <remarks>biosset</remarks>
+        public BiosSet[]? BiosSet { get; set; }
+
+        /// <remarks>rom</remarks>
+        public Rom[]? Rom { get; set; }
+
+        /// <remarks>disk</remarks>
+        public Disk[]? Disk { get; set; }
+
+        /// <remarks>sample</remarks>
+        public Sample[]? Sample { get; set; }
+
+        /// <remarks>archive</remarks>
+        public Archive[]? Archive { get; set; }
+
+        #region Aaru Extensions
+
+        /// <remarks>media, Appears after Disk</remarks>
+        public Media[]? Media { get; set; }
+
+        #endregion
+
+        #region MAME Extensions
+
+        /// <remarks>chip, Appears after Archive</remarks>
+        public Chip[]? Chip { get; set; }
+
+        /// <remarks>video, Appears after Chip</remarks>
+        public Video? Video { get; set; }
+
+        /// <remarks>sound, Appears after Video</remarks>
+        public Sound? Sound { get; set; }
+
+        /// <remarks>input, Appears after Sound</remarks>
+        public Input? Input { get; set; }
+
+        /// <remarks>dipswitch, Appears after Input</remarks>
+        public DipSwitch[]? DipSwitch { get; set; }
+
+        /// <remarks>driver, Appears after DipSwitch</remarks>
+        public Driver? Driver { get; set; }
+
+        #endregion
 
         #region DO NOT USE IN PRODUCTION
 

SabreTools.Models/ClrMamePro/Input.cs

@@ -0,0 +1,31 @@
+namespace SabreTools.Models.ClrMamePro
+{
+    /// <remarks>input</remarks>
+    public class Input
+    {
+        /// <remarks>players, Numeric?</remarks>
+        public string Players { get; set; }
+
+        /// <remarks>control</remarks>
+        public string? Control { get; set; }
+
+        /// <remarks>buttons, Numeric?</remarks>
+        public string Buttons { get; set; }
+
+        /// <remarks>coins, Numeric?</remarks>
+        public string? Coins { get; set; }
+
+        /// <remarks>tilt</remarks>
+        public string? Tilt { get; set; }
+
+        /// <remarks>service</remarks>
+        public string? Service { get; set; }
+
+        #region DO NOT USE IN PRODUCTION
+
+        /// <remarks>Should be empty</remarks>
+        public object[]? ADDITIONAL_ELEMENTS { get; set; }
+
+        #endregion
+    }
+}

SabreTools.Models/ClrMamePro/ItemBase.cs

@@ -1,7 +0,0 @@
-namespace SabreTools.Models.ClrMamePro
-{
-    /// <summary>
-    /// Base class to unify the various item types
-    /// </summary>
-    public abstract class ItemBase { }
-}

SabreTools.Models/ClrMamePro/Media.cs

@@ -1,7 +1,7 @@
 namespace SabreTools.Models.ClrMamePro
 {
     /// <remarks>media</remarks>
-    public class Media : ItemBase
+    public class Media
     {
         /// <remarks>name</remarks>
         public string Name { get; set; }

SabreTools.Models/ClrMamePro/Release.cs

@@ -1,7 +1,7 @@
 namespace SabreTools.Models.ClrMamePro
 {
     /// <remarks>release</remarks>
-    public class Release : ItemBase
+    public class Release
     {
         /// <remarks>name</remarks>
         public string Name { get; set; }

SabreTools.Models/ClrMamePro/Rom.cs

@@ -1,7 +1,7 @@
 namespace SabreTools.Models.ClrMamePro
 {
     /// <remarks>rom</remarks>
-    public class Rom : ItemBase
+    public class Rom
     {
         /// <remarks>name</remarks>
         public string Name { get; set; }
@@ -56,9 +56,19 @@ namespace SabreTools.Models.ClrMamePro
 
         #endregion
 
+        #region MAME Extensions
+
+        /// <remarks>region; Appears after Status</remarks>
+        public string? Region { get; set; }
+
+        /// <remarks>offs; Appears after Flags</remarks>
+        public string? Offs { get; set; }
+
+        #endregion
+
         #region No-Intro Extensions
 
-        /// <remarks>serial; Appears after Status</remarks>
+        /// <remarks>serial; Appears after Offs</remarks>
         public string? Serial { get; set; }
 
         /// <remarks>header; Appears after Serial</remarks>

SabreTools.Models/ClrMamePro/Sample.cs

@@ -1,7 +1,7 @@
 namespace SabreTools.Models.ClrMamePro
 {
     /// <remarks>sample</remarks>
-    public class Sample : ItemBase
+    public class Sample
     {
         /// <remarks>name</remarks>
         public string Name { get; set; }

SabreTools.Models/ClrMamePro/Sound.cs

@@ -0,0 +1,16 @@
+namespace SabreTools.Models.ClrMamePro
+{
+    /// <remarks>sound</remarks>
+    public class Sound
+    {
+        /// <remarks>channels, Numeric?</remarks>
+        public string Channels { get; set; }
+
+        #region DO NOT USE IN PRODUCTION
+
+        /// <remarks>Should be empty</remarks>
+        public object[]? ADDITIONAL_ELEMENTS { get; set; }
+
+        #endregion
+    }
+}

SabreTools.Models/ClrMamePro/Video.cs

@@ -0,0 +1,34 @@
+namespace SabreTools.Models.ClrMamePro
+{
+    /// <remarks>video</remarks>
+    public class Video
+    {
+        /// <remarks>screen, (raster|vector)</remarks>
+        public string Screen { get; set; }
+
+        /// <remarks>orientation, (vertical|horizontal)</remarks>
+        public string Orientation { get; set; }
+
+        /// <remarks>x, Numeric?</remarks>
+        public string? X { get; set; }
+
+        /// <remarks>y, Numeric?</remarks>
+        public string? Y { get; set; }
+
+        /// <remarks>aspectx, Numeric?</remarks>
+        public string? AspectX { get; set; }
+
+        /// <remarks>aspecty, Numeric?</remarks>
+        public string? AspectY { get; set; }
+
+        /// <remarks>freq, Numeric?</remarks>
+        public string? Freq { get; set; }
+
+        #region DO NOT USE IN PRODUCTION
+
+        /// <remarks>Should be empty</remarks>
+        public object[]? ADDITIONAL_ELEMENTS { get; set; }
+
+        #endregion
+    }
+}

SabreTools.Serialization/ClrMamePro.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
@@ -51,8 +52,16 @@ namespace SabreTools.Serialization
                 string lastTopLevel = reader.TopLevel;
 
                 GameBase? game = null;
-                var games = new List<GameBase?>();
+                var games = new List<GameBase>();
-                var items = new List<ItemBase?>();
+                var releases = new List<Release>();
+                var biosSets = new List<BiosSet>();
+                var roms = new List<Rom>();
+                var disks = new List<Disk>();
+                var medias = new List<Media>();
+                var samples = new List<Sample>();
+                var archives = new List<Archive>();
+                var chips = new List<Chip>();
+                var dipSwitches = new List<DipSwitch>();
 
                 var additional = new List<string>();
                 var headerAdditional = new List<string>();
@@ -81,11 +90,29 @@ namespace SabreTools.Serialization
                                 case "machine":
                                 case "resource":
                                 case "set":
-                                    game.Item = items.ToArray();
+                                    game.Release = releases.ToArray();
+                                    game.BiosSet = biosSets.ToArray();
+                                    game.Rom = roms.ToArray();
+                                    game.Disk = disks.ToArray();
+                                    game.Media = medias.ToArray();
+                                    game.Sample = samples.ToArray();
+                                    game.Archive = archives.ToArray();
+                                    game.Chip = chips.ToArray();
+                                    game.DipSwitch = dipSwitches.ToArray();
                                     game.ADDITIONAL_ELEMENTS = gameAdditional.ToArray();
+
                                     games.Add(game);
                                     game = null;
-                                    items.Clear();
+
+                                    releases.Clear();
+                                    biosSets.Clear();
+                                    roms.Clear();
+                                    disks.Clear();
+                                    medias.Clear();
+                                    samples.Clear();
+                                    archives.Clear();
+                                    chips.Clear();
+                                    dipSwitches.Clear();
                                     gameAdditional.Clear();
                                     break;
                                 default:
@@ -123,7 +150,8 @@ namespace SabreTools.Serialization
                     }
 
                     // If we're in the doscenter block
-                    else if (reader.TopLevel == "clrmamepro" && reader.RowType == CmpRowType.Standalone)
+                    else if (reader.TopLevel == "clrmamepro"
+                        && reader.RowType == CmpRowType.Standalone)
                     {
                         // Create the block if we haven't already
                         dat.ClrMamePro ??= new Models.ClrMamePro.ClrMamePro();
@@ -176,7 +204,7 @@ namespace SabreTools.Serialization
                                 dat.ClrMamePro.ForcePacking = reader.Standalone?.Value;
                                 break;
                             default:
-                                headerAdditional.Add(item: reader.CurrentLine);
+                                headerAdditional.Add(reader.CurrentLine);
                                 break;
                         }
                     }
@@ -224,14 +252,24 @@ namespace SabreTools.Serialization
                             case "sampleof":
                                 game.SampleOf = reader.Standalone?.Value;
                                 break;
+                            case "sample":
+                                var sample = new Sample();
+                                sample.Name = reader.Standalone?.Value;
+                                sample.ADDITIONAL_ELEMENTS = Array.Empty<string>();
+                                samples.Add(sample);
+                                break;
                             default:
-                                gameAdditional.Add(item: reader.CurrentLine);
+                                gameAdditional.Add(reader.CurrentLine);
                                 break;
                         }
                     }
 
                     // If we're in an item block
-                    else if (reader.TopLevel == "game" && reader.RowType == CmpRowType.Internal)
+                    else if ((reader.TopLevel == "game"
+                            || reader.TopLevel == "machine"
+                            || reader.TopLevel == "resource"
+                            || reader.TopLevel == "set")
+                        && reader.RowType == CmpRowType.Internal)
                     {
                         // Create the block
                         switch (reader.InternalName)
@@ -258,14 +296,14 @@ namespace SabreTools.Serialization
                                             release.Default = kvp.Value;
                                             break;
                                         default:
-                                            itemAdditional.Add(item: reader.CurrentLine);
+                                            itemAdditional.Add($"{kvp.Key}: {kvp.Value}");
                                             break;
                                     }
                                 }
 
                                 // Add the release to the list
                                 release.ADDITIONAL_ELEMENTS = itemAdditional.ToArray();
-                                items.Add(release);
+                                releases.Add(release);
                                 itemAdditional.Clear();
                                 break;
 
@@ -285,14 +323,14 @@ namespace SabreTools.Serialization
                                             biosset.Default = kvp.Value;
                                             break;
                                         default:
-                                            itemAdditional.Add(item: reader.CurrentLine);
+                                            itemAdditional.Add($"{kvp.Key}: {kvp.Value}");
                                             break;
                                     }
                                 }
 
                                 // Add the biosset to the list
                                 biosset.ADDITIONAL_ELEMENTS = itemAdditional.ToArray();
-                                items.Add(biosset);
+                                biosSets.Add(biosset);
                                 itemAdditional.Clear();
                                 break;
 
@@ -341,9 +379,15 @@ namespace SabreTools.Serialization
                                         case "status":
                                             rom.Status = kvp.Value;
                                             break;
+                                        case "region":
+                                            rom.Region = kvp.Value;
+                                            break;
                                         case "flags":
                                             rom.Flags = kvp.Value;
                                             break;
+                                        case "offs":
+                                            rom.Offs = kvp.Value;
+                                            break;
                                         case "serial":
                                             rom.Serial = kvp.Value;
                                             break;
@@ -360,14 +404,14 @@ namespace SabreTools.Serialization
                                             rom.MIA = kvp.Value;
                                             break;
                                         default:
-                                            itemAdditional.Add(item: reader.CurrentLine);
+                                            itemAdditional.Add($"{kvp.Key}: {kvp.Value}");
                                             break;
                                     }
                                 }
 
                                 // Add the rom to the list
                                 rom.ADDITIONAL_ELEMENTS = itemAdditional.ToArray();
-                                items.Add(rom);
+                                roms.Add(rom);
                                 itemAdditional.Clear();
                                 break;
                                 
@@ -396,14 +440,14 @@ namespace SabreTools.Serialization
                                             disk.Flags = kvp.Value;
                                             break;
                                         default:
-                                            itemAdditional.Add(item: reader.CurrentLine);
+                                            itemAdditional.Add($"{kvp.Key}: {kvp.Value}");
                                             break;
                                     }
                                 }
 
                                 // Add the disk to the list
                                 disk.ADDITIONAL_ELEMENTS = itemAdditional.ToArray();
-                                items.Add(disk);
+                                disks.Add(disk);
                                 itemAdditional.Clear();
                                 break;
                                 
@@ -429,14 +473,14 @@ namespace SabreTools.Serialization
                                             media.SpamSum = kvp.Value;
                                             break;
                                         default:
-                                            itemAdditional.Add(item: reader.CurrentLine);
+                                            itemAdditional.Add($"{kvp.Key}: {kvp.Value}");
                                             break;
                                     }
                                 }
 
                                 // Add the media to the list
                                 media.ADDITIONAL_ELEMENTS = itemAdditional.ToArray();
-                                items.Add(media);
+                                medias.Add(media);
                                 itemAdditional.Clear();
                                 break;
                                 
@@ -450,14 +494,14 @@ namespace SabreTools.Serialization
                                             sample.Name = kvp.Value;
                                             break;
                                         default:
-                                            itemAdditional.Add(item: reader.CurrentLine);
+                                            itemAdditional.Add($"{kvp.Key}: {kvp.Value}");
                                             break;
                                     }
                                 }
 
                                 // Add the sample to the list
                                 sample.ADDITIONAL_ELEMENTS = itemAdditional.ToArray();
-                                items.Add(sample);
+                                samples.Add(sample);
                                 itemAdditional.Clear();
                                 break;
                                 
@@ -471,14 +515,202 @@ namespace SabreTools.Serialization
                                             archive.Name = kvp.Value;
                                             break;
                                         default:
-                                            itemAdditional.Add(item: reader.CurrentLine);
+                                            itemAdditional.Add($"{kvp.Key}: {kvp.Value}");
                                             break;
                                     }
                                 }
 
                                 // Add the archive to the list
                                 archive.ADDITIONAL_ELEMENTS = itemAdditional.ToArray();
-                                items.Add(archive);
+                                archives.Add(archive);
+                                itemAdditional.Clear();
+                                break;
+
+                            case "chip":
+                                var chip = new Chip();
+                                foreach (var kvp in reader.Internal)
+                                {
+                                    switch (kvp.Key?.ToLowerInvariant())
+                                    {
+                                        case "type":
+                                            chip.Type = kvp.Value;
+                                            break;
+                                        case "name":
+                                            chip.Name = kvp.Value;
+                                            break;
+                                        case "flags":
+                                            chip.Flags = kvp.Value;
+                                            break;
+                                        case "clock":
+                                            chip.Clock = kvp.Value;
+                                            break;
+                                        default:
+                                            itemAdditional.Add($"{kvp.Key}: {kvp.Value}");
+                                            break;
+                                    }
+                                }
+
+                                // Add the chip to the list
+                                chip.ADDITIONAL_ELEMENTS = itemAdditional.ToArray();
+                                chips.Add(chip);
+                                itemAdditional.Clear();
+                                break;
+
+                            case "video":
+                                var video = new Video();
+                                foreach (var kvp in reader.Internal)
+                                {
+                                    switch (kvp.Key?.ToLowerInvariant())
+                                    {
+                                        case "screen":
+                                            video.Screen = kvp.Value;
+                                            break;
+                                        case "orientation":
+                                            video.Orientation = kvp.Value;
+                                            break;
+                                        case "x":
+                                            video.X = kvp.Value;
+                                            break;
+                                        case "y":
+                                            video.Y = kvp.Value;
+                                            break;
+                                        case "aspectx":
+                                            video.AspectX = kvp.Value;
+                                            break;
+                                        case "aspecty":
+                                            video.AspectY = kvp.Value;
+                                            break;
+                                        case "freq":
+                                            video.Freq = kvp.Value;
+                                            break;
+                                        default:
+                                            itemAdditional.Add($"{kvp.Key}: {kvp.Value}");
+                                            break;
+                                    }
+                                }
+
+                                // Add the video to the game
+                                video.ADDITIONAL_ELEMENTS = itemAdditional.ToArray();
+                                game.Video = video;
+                                itemAdditional.Clear();
+                                break;
+
+                            case "sound":
+                                var sound = new Sound();
+                                foreach (var kvp in reader.Internal)
+                                {
+                                    switch (kvp.Key?.ToLowerInvariant())
+                                    {
+                                        case "channels":
+                                            sound.Channels = kvp.Value;
+                                            break;
+                                        default:
+                                            itemAdditional.Add($"{kvp.Key}: {kvp.Value}");
+                                            break;
+                                    }
+                                }
+
+                                // Add the sound to the game
+                                sound.ADDITIONAL_ELEMENTS = itemAdditional.ToArray();
+                                game.Sound = sound;
+                                itemAdditional.Clear();
+                                break;
+
+                            case "input":
+                                var input = new Input();
+                                foreach (var kvp in reader.Internal)
+                                {
+                                    switch (kvp.Key?.ToLowerInvariant())
+                                    {
+                                        case "players":
+                                            input.Players = kvp.Value;
+                                            break;
+                                        case "control":
+                                            input.Control = kvp.Value;
+                                            break;
+                                        case "buttons":
+                                            input.Buttons = kvp.Value;
+                                            break;
+                                        case "coins":
+                                            input.Coins = kvp.Value;
+                                            break;
+                                        case "tilt":
+                                            input.Tilt = kvp.Value;
+                                            break;
+                                        case "service":
+                                            input.Service = kvp.Value;
+                                            break;
+                                        default:
+                                            itemAdditional.Add($"{kvp.Key}: {kvp.Value}");
+                                            break;
+                                    }
+                                }
+
+                                // Add the input to the game
+                                input.ADDITIONAL_ELEMENTS = itemAdditional.ToArray();
+                                game.Input = input;
+                                itemAdditional.Clear();
+                                break;
+
+                            case "dipswitch":
+                                var dipswitch = new DipSwitch();
+                                var entries = new List<string>();
+                                foreach (var kvp in reader.Internal)
+                                {
+                                    switch (kvp.Key?.ToLowerInvariant())
+                                    {
+                                        case "name":
+                                            dipswitch.Name = kvp.Value;
+                                            break;
+                                        case "entry":
+                                            entries.Add(kvp.Value);
+                                            break;
+                                        case "default":
+                                            dipswitch.Default = kvp.Value;
+                                            break;
+                                        default:
+                                            itemAdditional.Add($"{kvp.Key}: {kvp.Value}");
+                                            break;
+                                    }
+                                }
+
+                                // Add the dipswitch to the list
+                                dipswitch.Entry = entries.ToArray();
+                                dipswitch.ADDITIONAL_ELEMENTS = itemAdditional.ToArray();
+                                dipSwitches.Add(dipswitch);
+                                itemAdditional.Clear();
+                                break;
+
+                            case "driver":
+                                var driver = new Driver();
+                                foreach (var kvp in reader.Internal)
+                                {
+                                    switch (kvp.Key?.ToLowerInvariant())
+                                    {
+                                        case "status":
+                                            driver.Status = kvp.Value;
+                                            break;
+                                        case "color":
+                                            driver.Color = kvp.Value;
+                                            break;
+                                        case "sound":
+                                            driver.Sound = kvp.Value;
+                                            break;
+                                        case "palettesize":
+                                            driver.PaletteSize = kvp.Value;
+                                            break;
+                                        case "blit":
+                                            driver.Blit = kvp.Value;
+                                            break;
+                                        default:
+                                            itemAdditional.Add($"{kvp.Key}: {kvp.Value}");
+                                            break;
+                                    }
+                                }
+
+                                // Add the driver to the game
+                                driver.ADDITIONAL_ELEMENTS = itemAdditional.ToArray();
+                                game.Driver = driver;
                                 itemAdditional.Clear();
                                 break;
                                 
@@ -490,7 +722,7 @@ namespace SabreTools.Serialization
 
                     else
                     {
-                        additional.Add(item: reader.CurrentLine);
+                        additional.Add(reader.CurrentLine);
                     }
                 }
 

SabreTools.Test/Serialization/DeserializationTests.cs

@@ -60,8 +60,9 @@ namespace SabreTools.Test.Parser
         }
 
         [Theory]
-        [InlineData("test-cmp-files.dat", 59)]
+        [InlineData("test-cmp-files1.dat", 59, true)]
-        public void ClrMameProDeserializeTest(string path, long count)
+        [InlineData("test-cmp-files2.dat", 312, false)]
+        public void ClrMameProDeserializeTest(string path, long count, bool expectHeader)
         {
             // Open the file for reading
             string filename = System.IO.Path.Combine(Environment.CurrentDirectory, "TestData", path);
@@ -70,41 +71,85 @@ namespace SabreTools.Test.Parser
             var dat = Serialization.ClrMamePro.Deserialize(filename);
 
             // Validate the values
+            if (expectHeader)
+            {
                 Assert.NotNull(dat?.ClrMamePro);
+                Assert.Null(dat.ClrMamePro.ADDITIONAL_ELEMENTS);
+            }
+            else
+            {
+                Assert.Null(dat?.ClrMamePro);
+            }
             Assert.Equal(count, dat.Game.Length);
 
             // Validate we're not missing any attributes or elements
             Assert.Empty(dat.ADDITIONAL_ELEMENTS);
-            Assert.Null(dat.ClrMamePro.ADDITIONAL_ELEMENTS);
             foreach (var game in dat.Game)
             {
                 Assert.Empty(game.ADDITIONAL_ELEMENTS);
-                foreach (var item in game.Item)
+                foreach (var release in game.Release ?? Array.Empty<Models.ClrMamePro.Release>())
                 {
-                    switch (item)
-                    {
-                        case Models.ClrMamePro.Release release:
                     Assert.Empty(release.ADDITIONAL_ELEMENTS);
-                            break;
-                        case Models.ClrMamePro.BiosSet biosset:
-                            Assert.Empty(biosset.ADDITIONAL_ELEMENTS);
-                            break;
-                        case Models.ClrMamePro.Rom rom:
-                            Assert.Empty(rom.ADDITIONAL_ELEMENTS);
-                            break;
-                        case Models.ClrMamePro.Disk disk:
-                            Assert.Empty(disk.ADDITIONAL_ELEMENTS);
-                            break;
-                        case Models.ClrMamePro.Media media:
-                            Assert.Empty(media.ADDITIONAL_ELEMENTS);
-                            break;
-                        case Models.ClrMamePro.Sample sample:
-                            Assert.Empty(sample.ADDITIONAL_ELEMENTS);
-                            break;
-                        case Models.ClrMamePro.Archive archive:
-                            Assert.Empty(archive.ADDITIONAL_ELEMENTS);
-                            break;
                 }
+
+                foreach (var biosset in game.BiosSet ?? Array.Empty<Models.ClrMamePro.BiosSet>())
+                {
+                    Assert.Empty(biosset.ADDITIONAL_ELEMENTS);
+                }
+
+                foreach (var rom in game.Rom ?? Array.Empty<Models.ClrMamePro.Rom>())
+                {
+                    Assert.Empty(rom.ADDITIONAL_ELEMENTS);
+                }
+
+                foreach (var disk in game.Disk ?? Array.Empty<Models.ClrMamePro.Disk>())
+                {
+                    Assert.Empty(disk.ADDITIONAL_ELEMENTS);
+                }
+
+                foreach (var media in game.Media ?? Array.Empty<Models.ClrMamePro.Media>())
+                {
+                    Assert.Empty(media.ADDITIONAL_ELEMENTS);
+                }
+
+                foreach (var sample in game.Sample ?? Array.Empty<Models.ClrMamePro.Sample>())
+                {
+                    Assert.Empty(sample.ADDITIONAL_ELEMENTS);
+                }
+
+                foreach (var archive in game.Archive ?? Array.Empty<Models.ClrMamePro.Archive>())
+                {
+                    Assert.Empty(archive.ADDITIONAL_ELEMENTS);
+                }
+
+                foreach (var chip in game.Chip ?? Array.Empty<Models.ClrMamePro.Chip>())
+                {
+                    Assert.Empty(chip.ADDITIONAL_ELEMENTS);
+                }
+
+                if (game.Video != null)
+                {
+                    Assert.Empty(game.Video.ADDITIONAL_ELEMENTS);
+                }
+
+                if (game.Sound != null)
+                {
+                    Assert.Empty(game.Sound.ADDITIONAL_ELEMENTS);
+                }
+
+                if (game.Input != null)
+                {
+                    Assert.Empty(game.Input.ADDITIONAL_ELEMENTS);
+                }
+
+                foreach (var dipswitch in game.DipSwitch ?? Array.Empty<Models.ClrMamePro.DipSwitch>())
+                {
+                    Assert.Empty(dipswitch.ADDITIONAL_ELEMENTS);
+                }
+
+                if (game.Driver != null)
+                {
+                    Assert.Empty(game.Driver.ADDITIONAL_ELEMENTS);
                 }
             }
         }