This commit was manufactured by cvs2svn to create tag 'V0_1_82_1mdk'.V0_1_82_1mdk

37 files changed, 0 insertions, 15222 deletions

diff --git a/test/check_dmidecode.pl b/test/check_dmidecode.pl
deleted file mode 100755
index 53adb90d..00000000
--- a/test/check_dmidecode.pl
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/perl
-
-use MDK::Common;
-
-foreach my $file (glob("dmidecode.*")) {
-    my %wanted = cat_($file) =~ /\(=> (\S+): (\S+)\)/g;
-
-    my %got = map {
-	s/\s*: .*//;
-	/(\S+):(.*)/ ? ($1 => $2) : ();
-    } `lspcidrake -p /dev/null -u /dev/null --dmidecode $file`;
-
-    my @missing = difference2([ keys %wanted ], [ keys %got ]);
-    if (@missing) {
-	warn "for $file, missing: ", join(' ', @missing), "\n";
-    }
-
-    my @surprise = difference2([ keys %got ], [ keys %wanted ]);
-    if (@surprise) {
-	warn "for $file, surprise: ", join(' ', map { "$_ => $got{$_}" } @surprise), "\n";
-    }
-
-    my @bad = grep { $wanted{$_} ne $got{$_} } intersection([ keys %wanted ], [ keys %got ]);
-    if (@bad) {
-	warn "for $file, bad $_: $wanted{$_} != $got{$_}\n" foreach @bad;
-    }
-}
diff --git a/test/dmidecode.Desktop.ASUSTek-A7N8X2.0 b/test/dmidecode.Desktop.ASUSTek-A7N8X2.0
deleted file mode 100644
index 67a1f028..00000000
--- a/test/dmidecode.Desktop.ASUSTek-A7N8X2.0
+++ /dev/null
@@ -1,525 +0,0 @@
-# dmidecode 2.3
-SMBIOS 2.2 present.
-48 structures occupying 1418 bytes.
-Table at 0x000F0000.
-Handle 0x0000
-	DMI type 0, 19 bytes.
-	BIOS Information
-		Vendor: Phoenix Technologies, LTD
-		Version: ASUS A7N8X2.0 Deluxe ACPI BIOS Rev 1007
-		Release Date: 10/06/2003
-		Address: 0xF0000
-		Runtime Size: 64 kB
-		ROM Size: 512 kB
-		Characteristics:
-			PCI is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			Boot from CD is supported
-			Selectable boot is supported
-			BIOS ROM is socketed
-			EDD is supported
-			5.25"/360 KB floppy services are supported (int 13h)
-			5.25"/1.2 MB floppy services are supported (int 13h)
-			3.5"/720 KB floppy services are supported (int 13h)
-			3.5"/2.88 MB floppy services are supported (int 13h)
-			Print screen service is supported (int 5h)
-			8042 keyboard services are supported (int 9h)
-			Serial services are supported (int 14h)
-			Printer services are supported (int 17h)
-			CGA/mono video services are supported (int 10h)
-			ACPI is supported
-			USB legacy is supported
-			AGP is supported
-			LS-120 boot is supported
-			ATAPI Zip drive boot is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: ASUSTeK Computer INC.
-		Product Name: A7N8X2.0
-		Version: REV 2.xx
-		Serial Number: xxxxxxxxxxx
-		UUID: Not Present
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: ASUSTeK Computer INC.
-		Product Name: A7N8X2.0
-		Version: REV 2.xx
-		Serial Number: xxxxxxxxxxx
-Handle 0x0003
-	DMI type 3, 13 bytes.
-	Chassis Information
-		Manufacturer: Chassis Manufactture
-		Type: Desktop
-		Lock: Not Present
-		Version: Chassis Version
-		Serial Number: Chassis serial Number
-		Asset Tag: Asset-1234567890
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-Handle 0x0004
-	DMI type 4, 32 bytes.
-	Processor Information
-		Socket Designation: Socket A
-		Type: Central Processor
-		Family: Duron
-		Manufacturer: AMD
-		ID: 62 06 00 00 FF FB 83 03
-		Signature: Family 6, Model 6, Stepping 2
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			APIC (On-chip APIC hardware supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-		Version: AMD Athlon(tm) XP
-		Voltage: 1.7 V
-		External Clock: 133 MHz
-		Max Speed: 3000 MHz
-		Current Speed: 1733 MHz
-		Status: Populated, Enabled
-		Upgrade: ZIF Socket
-		L1 Cache Handle: 0x0009
-		L2 Cache Handle: 0x000A
-		L3 Cache Handle: No L3 Cache
-Handle 0x0005
-	DMI type 5, 22 bytes.
-	Memory Controller Information
-		Error Detecting Method: None
-		Error Correcting Capabilities:
-			Other
-		Supported Interleave: Unknown
-		Current Interleave: Unknown
-		Maximum Memory Module Size: 1024 MB
-		Maximum Total Memory Size: 3072 MB
-		Supported Speeds:
-			70 ns
-			60 ns
-			50 ns
-		Supported Memory Types:
-			DIMM
-			SDRAM
-		Memory Module Voltage: 3.3 V
-		Associated Memory Slots: 3
-			0x0006
-			0x0007
-			0x0008
-		Enabled Error Correcting Capabilities:
-			None
-Handle 0x0006
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DDR1
-		Bank Connections: 0 1
-		Current Speed: Unknown
-		Type: DIMM
-		Installed Size: 512 MB (Double-bank Connection)
-		Enabled Size: 512 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0007
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DDR2
-		Bank Connections: None
-		Current Speed: Unknown
-		Type: DIMM
-		Installed Size: Not Installed (Single-bank Connection)
-		Enabled Size: Not Installed (Single-bank Connection)
-		Error Status: OK
-Handle 0x0008
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DDR3
-		Bank Connections: None
-		Current Speed: Unknown
-		Type: DIMM
-		Installed Size: Not Installed (Single-bank Connection)
-		Enabled Size: Not Installed (Single-bank Connection)
-		Error Status: OK
-Handle 0x0009
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L1 Cache
-		Configuration: Enabled, Not Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 128 KB
-		Maximum Size: 128 KB
-		Supported SRAM Types:
-			Pipeline Burst
-			Synchronous
-		Installed SRAM Type: Pipeline Burst Synchronous
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Data
-		Associativity: 4-way Set-associative
-Handle 0x000A
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L2 Cache
-		Configuration: Enabled, Not Socketed, Level 2
-		Operational Mode: Write Back
-		Location: External
-		Installed Size: 256 KB
-		Maximum Size: 256 KB
-		Supported SRAM Types:
-			Pipeline Burst
-			Synchronous
-		Installed SRAM Type: Pipeline Burst Synchronous
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Data
-		Associativity: 4-way Set-associative
-Handle 0x000B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: PRIMARY IDE/HDD
-		Internal Connector Type: On Board IDE
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: None
-Handle 0x000C
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: SECONDARY IDE/HDD
-		Internal Connector Type: On Board IDE
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: None
-Handle 0x000D
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: FLOPPY
-		Internal Connector Type: On Board Floppy
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: None
-Handle 0x000E
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Serial Port 1
-		Internal Connector Type: None
-		External Reference Designator: Serial Port 1
-		External Connector Type: DB-9 male
-		Port Type: Serial Port 16550 Compatible
-Handle 0x000F
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Serial Port 2
-		Internal Connector Type: None
-		External Reference Designator: Serial Port 2
-		External Connector Type: DB-9 male
-		Port Type: Serial Port 16550 Compatible
-Handle 0x0010
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Parallel Port
-		Internal Connector Type: None
-		External Reference Designator: Parallel Port
-		External Connector Type: DB-25 female
-		Port Type: Parallel Port ECP/EPP
-Handle 0x0011
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: PS/2 Keyboard
-		Internal Connector Type: None
-		External Reference Designator: PS/2 Keyboard
-		External Connector Type: PS/2
-		Port Type: Keyboard Port
-Handle 0x0012
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: PS/2 Mouse
-		Internal Connector Type: None
-		External Reference Designator: PS/2 Mouse
-		External Connector Type: PS/2
-		Port Type: Mouse Port
-Handle 0x0013
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: USB1
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0014
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: USB2
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0015
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: USB3
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0016
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: USB4
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0017
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: USB5
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0018
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: USB6
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0019
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: ETHERNET
-		External Connector Type: RJ-45
-		Port Type: Network Port
-Handle 0x001A
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: ETHERNET
-		External Connector Type: RJ-45
-		Port Type: Network Port
-Handle 0x001B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: Joystic Port
-		External Connector Type: DB-15 female
-		Port Type: Joystick Port
-Handle 0x001C
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: MIDI Port
-		External Connector Type: DB-15 female
-		Port Type: MIDI Port
-Handle 0x001D
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI1
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Short
-		ID: 1
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x001E
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI2
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Short
-		ID: 2
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x001F
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI3
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Short
-		ID: 3
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x0020
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI4
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Short
-		ID: 4
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x0021
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI5
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Short
-		ID: 5
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x0022
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: AGP
-		Type: 32-bit AGP
-		Current Usage: In Use
-		Length: Short
-		ID: 6
-		Characteristics:
-			3.3 V is provided
-Handle 0x0023
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: Onboard 1394
-		External Connector Type: IEEE 1394
-		Port Type: Firewire (IEEE P1394)
-Handle 0x0024
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: Line In Jack Port
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x0025
-	DMI type 13, 22 bytes.
-	BIOS Language Information
-		Installable Languages: 3
-			n|US|iso8859-1
-			n|US|iso8859-1
-			r|CA|iso8859-1
-		Currently Installed Language: n|US|iso8859-1
-Handle 0x0026
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 1536 MB
-		Error Information Handle: Not Provided
-		Number Of Devices: 3
-Handle 0x0027
-	DMI type 17, 21 bytes.
-	Memory Device
-		Array Handle: 0x0026
-		Error Information Handle: Not Provided
-		Total Width: 72 bits
-		Data Width: 64 bits
-		Size: 512 MB
-		Form Factor: DIMM
-		Set: None
-		Locator: DDR1
-		Bank Locator: Bank0/1
-		Type: DRAM
-		Type Detail: Synchronous
-Handle 0x0028
-	DMI type 17, 21 bytes.
-	Memory Device
-		Array Handle: 0x0026
-		Error Information Handle: Not Provided
-		Total Width: 72 bits
-		Data Width: 64 bits
-		Size: No Module Installed
-		Form Factor: DIMM
-		Set: None
-		Locator: DDR2
-		Bank Locator: Bank2/3
-		Type: DRAM
-		Type Detail: Synchronous
-Handle 0x0029
-	DMI type 17, 21 bytes.
-	Memory Device
-		Array Handle: 0x0026
-		Error Information Handle: Not Provided
-		Total Width: 72 bits
-		Data Width: 64 bits
-		Size: No Module Installed
-		Form Factor: DIMM
-		Set: None
-		Locator: DDR3
-		Bank Locator: Bank4/5
-		Type: DRAM
-		Type Detail: Synchronous
-Handle 0x002A
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Array Handle: 0x0026
-		Partition Width: 0
-Handle 0x002B
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Device Handle: 0x0027
-		Memory Array Mapped Address Handle: 0x002A
-		Partition Row Position: 1
-Handle 0x002C
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x000000003FF
-		Range Size: 1 kB
-		Physical Device Handle: 0x0028
-		Memory Array Mapped Address Handle: 0x002A
-		Partition Row Position: 1
-Handle 0x002D
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x000000003FF
-		Range Size: 1 kB
-		Physical Device Handle: 0x0029
-		Memory Array Mapped Address Handle: 0x002A
-		Partition Row Position: 1
-Handle 0x002E
-	DMI type 32, 11 bytes.
-	System Boot Information
-		Status: No errors detected
-Handle 0x002F
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Desktop.ASUSTek-A7V8X-X b/test/dmidecode.Desktop.ASUSTek-A7V8X-X
deleted file mode 100644
index 69774e14..00000000
--- a/test/dmidecode.Desktop.ASUSTek-A7V8X-X
+++ /dev/null
@@ -1,542 +0,0 @@
-# dmidecode 2.3
-SMBIOS 2.3 present.
-50 structures occupying 1383 bytes.
-Table at 0x000F39E0.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: Award Software, Inc.
-		Version: ASUS A7V8X-X ACPI BIOS Revision 1006
-		Release Date: 08/06/2003
-		Address: 0xF0000
-		Runtime Size: 64 kB
-		ROM Size: 256 kB
-		Characteristics:
-			PCI is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			ESCD support is available
-			Boot from CD is supported
-			Selectable boot is supported
-			BIOS ROM is socketed
-			EDD is supported
-			5.25"/360 KB floppy services are supported (int 13h)
-			5.25"/1.2 MB floppy services are supported (int 13h)
-			3.5"/720 KB floppy services are supported (int 13h)
-			3.5"/2.88 MB floppy services are supported (int 13h)
-			Print screen service is supported (int 5h)
-			8042 keyboard services are supported (int 9h)
-			Serial services are supported (int 14h)
-			Printer services are supported (int 17h)
-			CGA/mono video services are supported (int 10h)
-			ACPI is supported
-			USB legacy is supported
-			AGP is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: System Manufacturer
-		Product Name: System Name
-		Version: System Version
-		Serial Number: SYS-1234567890
-		UUID: Not Settable
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: ASUSTeK Computer INC.
-		Product Name: A7V8X-X
-		Version: REV 1.xx
-		Serial Number: xxxxxxxxxxx
-Handle 0x0003
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: Chassis Manufacture
-		Type: Tower
-		Lock: Not Present
-		Version: Chassis Version
-		Serial Number: Chassis Serial Number
-		Asset Tag: Asset-1234567890
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: Unknown
-		OEM Information: 0x00000002
-Handle 0x0004
-	DMI type 4, 32 bytes.
-	Processor Information
-		Socket Designation: SOCKET A
-		Type: Central Processor
-		Family: Other
-		Manufacturer: AuthenticAMD
-		ID: 44 06 00 00 FF FB 83 01
-		Signature: Family 6, Model 4, Stepping 4
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			APIC (On-chip APIC hardware supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-		Version: AMD Athlon(TM)
-		Voltage: 1.8 V
-		External Clock: 133 MHz
-		Max Speed: 2250 MHz
-		Current Speed: 1400 MHz
-		Status: Populated, Enabled
-		Upgrade: Other
-		L1 Cache Handle: 0x0009
-		L2 Cache Handle: 0x000A
-		L3 Cache Handle: Not Provided
-Handle 0x0005
-	DMI type 5, 22 bytes.
-	Memory Controller Information
-		Error Detecting Method: None
-		Error Correcting Capabilities:
-			Other
-		Supported Interleave: Unknown
-		Current Interleave: Unknown
-		Maximum Memory Module Size: 1024 MB
-		Maximum Total Memory Size: 3072 MB
-		Supported Speeds:
-			70 ns
-			60 ns
-			50 ns
-		Supported Memory Types:
-			ECC
-			DIMM
-			SDRAM
-		Memory Module Voltage: 3.3 V
-		Associated Memory Slots: 3
-			0x0006
-			0x0007
-			0x0008
-		Enabled Error Correcting Capabilities:
-			Unknown
-Handle 0x0006
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM 1
-		Bank Connections: 0 1
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 256 MB (Double-bank Connection)
-		Enabled Size: 256 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0007
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM 2
-		Bank Connections: 2 3
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 256 MB (Single-bank Connection)
-		Enabled Size: 256 MB (Single-bank Connection)
-		Error Status: OK
-Handle 0x0008
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM 3
-		Bank Connections: 4 5
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: Not Installed (Single-bank Connection)
-		Enabled Size: Not Installed (Single-bank Connection)
-		Error Status: OK
-Handle 0x0009
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L1 Cache
-		Configuration: Enabled, Not Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 128 KB
-		Maximum Size: 128 KB
-		Supported SRAM Types:
-			Pipeline Burst
-			Synchronous
-		Installed SRAM Type: Pipeline Burst Synchronous
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Data
-		Associativity: 4-way Set-associative
-Handle 0x000A
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L2 Cache
-		Configuration: Enabled, Not Socketed, Level 2
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 256 KB
-		Maximum Size: 8192 KB
-		Supported SRAM Types:
-			Pipeline Burst
-			Synchronous
-		Installed SRAM Type: Pipeline Burst Synchronous
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Data
-		Associativity: 4-way Set-associative
-Handle 0x000B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: PRIMARY IDE/HDD
-		Internal Connector Type: On Board IDE
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: None
-Handle 0x000C
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: SECONDARY IDE/HDD
-		Internal Connector Type: On Board IDE
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: None
-Handle 0x000D
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: FLOPPY
-		Internal Connector Type: On Board Floppy
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: None
-Handle 0x000E
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: USB1
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x000F
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: USB2
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0010
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: USB3
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0011
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: USB4
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0012
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: USB5
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0013
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: USB6
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0014
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: PS/2 Keyboard
-		External Connector Type: PS/2
-		Port Type: Keyboard Port
-Handle 0x0015
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: PS/2 Mouse
-		External Connector Type: PS/2
-		Port Type: Mouse Port
-Handle 0x0016
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: Parallel Port
-		External Connector Type: DB-25 female
-		Port Type: Parallel Port ECP/EPP
-Handle 0x0017
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: Serial Port 1
-		External Connector Type: DB-9 male
-		Port Type: Serial Port 16550 Compatible
-Handle 0x0018
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: Serial Port 2
-		External Connector Type: DB-9 male
-		Port Type: Serial Port 16550 Compatible
-Handle 0x0019
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: Joystick Port
-		External Connector Type: DB-15 female
-		Port Type: Joystick Port
-Handle 0x001A
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: MIDI Port
-		External Connector Type: DB-15 female
-		Port Type: MIDI Port
-Handle 0x001B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: Line In Jack
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x001C
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: LAN-000C6E1131B9M
-		External Connector Type: RJ-45
-		Port Type: Network Port
-Handle 0x001D
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI 1
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Short
-		ID: 1
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x001E
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI 2
-		Type: 32-bit PCI
-		Current Usage: In Use
-		Length: Short
-		ID: 2
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x001F
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI 3
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Short
-		ID: 3
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x0020
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI 4
-		Type: 32-bit PCI
-		Current Usage: In Use
-		Length: Short
-		ID: 4
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x0021
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI 5
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Short
-		ID: 5
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x0022
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI 6
-		Type: 32-bit PCI
-		Current Usage: In Use
-		Length: Short
-		ID: 6
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x0023
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: AGP
-		Type: 32-bit AGP 4x
-		Current Usage: In Use
-		Length: Short
-		ID: 7
-		Characteristics:
-			3.3 V is provided
-Handle 0x0024
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: 0
-		String 2: 0
-Handle 0x0025
-	DMI type 13, 22 bytes.
-	BIOS Language Information
-		Installable Languages: 1
-			en|US|iso8859-1
-		Currently Installed Language: en|US|iso8859-1
-Handle 0x0026
-	DMI type 14, 14 bytes.
-	Group Associations
-		Name: Cpu Module
-		Items: 3
-			0x0004 (Processor)
-			0x0009 (Cache)
-			0x000A (Cache)
-Handle 0x0027
-	DMI type 14, 29 bytes.
-	Group Associations
-		Name: Memory Module Set
-		Items: 8
-			0x0027 (Physical Memory Array)
-			0x0028 (Memory Device)
-			0x002C (Memory Device Mapped Address)
-			0x0029 (Memory Device)
-			0x002D (Memory Device Mapped Address)
-			0x002A (Memory Device)
-			0x002E (Memory Device Mapped Address)
-			0x002B (Memory Array Mapped Address)
-Handle 0x0028
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 3 GB
-		Error Information Handle: Not Provided
-		Number Of Devices: 3
-Handle 0x0029
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x0028
-		Error Information Handle: No Error
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 256 MB
-		Form Factor: DIMM
-		Set: 1
-		Locator: DDR 1
-		Bank Locator: Not Specified
-		Type: DRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-Handle 0x002A
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x0028
-		Error Information Handle: No Error
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 256 MB
-		Form Factor: DIMM
-		Set: 2
-		Locator: DDR 2
-		Bank Locator: Not Specified
-		Type: DRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-Handle 0x002B
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x0028
-		Error Information Handle: No Error
-		Total Width: Unknown
-		Data Width: Unknown
-		Size: No Module Installed
-		Form Factor: DIMM
-		Set: 3
-		Locator: DDR 3
-		Bank Locator: Not Specified
-		Type: DRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-Handle 0x002C
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Array Handle: 0x0027
-		Partition Width: 0
-Handle 0x002D
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x0029
-		Memory Array Mapped Address Handle: 0x002B
-		Partition Row Position: 1
-Handle 0x002E
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00010000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x002A
-		Memory Array Mapped Address Handle: 0x002B
-		Partition Row Position: 2
-Handle 0x002F
-	DMI type 126, 19 bytes.
-	Inactive
-Handle 0x0030
-	DMI type 32, 11 bytes.
-	System Boot Information
-		Status: No errors detected
-Handle 0x0031
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Desktop.ASUSTek-CUV4X b/test/dmidecode.Desktop.ASUSTek-CUV4X
deleted file mode 100644
index 599d5cf9..00000000
--- a/test/dmidecode.Desktop.ASUSTek-CUV4X
+++ /dev/null
@@ -1,483 +0,0 @@
-# dmidecode 2.3
-SMBIOS 2.3 present.
-43 structures occupying 1259 bytes.
-Table at 0x000F2950.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: Award Software, Inc.
-		Version: ASUS CUV4X ACPI BIOS Revision 1009
-		Release Date: 04/24/2001
-		Address: 0xF0000
-		Runtime Size: 64 kB
-		ROM Size: 256 kB
-		Characteristics:
-			ISA is supported
-			PCI is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			ESCD support is available
-			Boot from CD is supported
-			Selectable boot is supported
-			BIOS ROM is socketed
-			EDD is supported
-			5.25"/360 KB floppy services are supported (int 13h)
-			5.25"/1.2 MB floppy services are supported (int 13h)
-			3.5"/720 KB floppy services are supported (int 13h)
-			3.5"/2.88 MB floppy services are supported (int 13h)
-			Print screen service is supported (int 5h)
-			8042 keyboard services are supported (int 9h)
-			Serial services are supported (int 14h)
-			Printer services are supported (int 17h)
-			CGA/mono video services are supported (int 10h)
-			ACPI is supported
-			AGP is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: System Manufacturer
-		Product Name: System Name
-		Version: System Version
-		Serial Number: SYS-1234567890
-		UUID: Not Settable
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: ASUSTeK Computer INC.
-		Product Name: CUV4X
-		Version: REV 1.xx
-		Serial Number: xxxxxxxxxxx
-Handle 0x0003
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: Chassis Manufacture
-		Type: Tower
-		Lock: Not Present
-		Version: Chassis Version
-		Serial Number: Chassis Serial Number
-		Asset Tag: Asset-1234567890
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: Unknown
-		OEM Information: 0x00000000
-Handle 0x0004
-	DMI type 4, 32 bytes.
-	Processor Information
-		Socket Designation: PGA 370
-		Type: Central Processor
-		Family: Celeron
-		Manufacturer: genuine intel
-		ID: 86 06 00 00 FF F9 83 03
-		Signature: Type 0, Family 6, Model 8, Stepping 6
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-		Version: Intel Celeron(TM) Processor
-		Voltage: 1.7 V
-		External Clock: 66 MHz
-		Max Speed: 1200 MHz
-		Current Speed: 700 MHz
-		Status: Populated, Enabled
-		Upgrade: LIF Socket
-		L1 Cache Handle: 0x0009
-		L2 Cache Handle: 0x000A
-		L3 Cache Handle: Not Provided
-Handle 0x0005
-	DMI type 5, 22 bytes.
-	Memory Controller Information
-		Error Detecting Method: None
-		Error Correcting Capabilities:
-			Other
-		Supported Interleave: Unknown
-		Current Interleave: Unknown
-		Maximum Memory Module Size: 1024 MB
-		Maximum Total Memory Size: 3072 MB
-		Supported Speeds:
-			70 ns
-			60 ns
-			50 ns
-		Supported Memory Types:
-			DIMM
-			SDRAM
-		Memory Module Voltage: 3.3 V
-		Associated Memory Slots: 3
-			0x0006
-			0x0007
-			0x0008
-		Enabled Error Correcting Capabilities:
-			Unknown
-Handle 0x0006
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM 1
-		Bank Connections: 0 1
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 256 MB (Single-bank Connection)
-		Enabled Size: 256 MB (Single-bank Connection)
-		Error Status: OK
-Handle 0x0007
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM 2
-		Bank Connections: 2 3
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: Not Installed (Single-bank Connection)
-		Enabled Size: Not Installed (Single-bank Connection)
-		Error Status: OK
-Handle 0x0008
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM 3
-		Bank Connections: 4 5
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 128 MB (Double-bank Connection)
-		Enabled Size: 128 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0009
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L1 Cache
-		Configuration: Enabled, Not Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 32 KB
-		Maximum Size: 32 KB
-		Supported SRAM Types:
-			Pipeline Burst
-			Synchronous
-		Installed SRAM Type: Pipeline Burst Synchronous
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Data
-		Associativity: 4-way Set-associative
-Handle 0x000A
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L2 Cache
-		Configuration: Enabled, Not Socketed, Level 2
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 128 KB
-		Maximum Size: 256 KB
-		Supported SRAM Types:
-			Pipeline Burst
-			Synchronous
-		Installed SRAM Type: Pipeline Burst Synchronous
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Data
-		Associativity: 4-way Set-associative
-Handle 0x000B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: PRIMARY IDE/HDD
-		Internal Connector Type: On Board IDE
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: None
-Handle 0x000C
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: SECONDARY IDE/HDD
-		Internal Connector Type: On Board IDE
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: None
-Handle 0x000D
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: FLOPPY
-		Internal Connector Type: On Board Floppy
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: None
-Handle 0x000E
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: USB1
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x000F
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: USB2
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0010
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: PS/2 Keybaord
-		External Connector Type: PS/2
-		Port Type: Keyboard Port
-Handle 0x0011
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: PS/2 Mouse
-		External Connector Type: PS/2
-		Port Type: Mouse Port
-Handle 0x0012
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: Parallel Port
-		External Connector Type: DB-25 female
-		Port Type: Parallel Port ECP/EPP
-Handle 0x0013
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: Serial Port
-		External Connector Type: DB-9 male
-		Port Type: Serial Port 16550 Compatible
-Handle 0x0014
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: Serial Port 2
-		External Connector Type: DB-9 male
-		Port Type: Serial Port 16550 Compatible
-Handle 0x0015
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: Video Port
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Video Port
-Handle 0x0016
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI 1
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Short
-		ID: 1
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x0017
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI 2
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Short
-		ID: 2
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x0018
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI 3
-		Type: 32-bit PCI
-		Current Usage: In Use
-		Length: Short
-		ID: 3
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x0019
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI 4
-		Type: 32-bit PCI
-		Current Usage: In Use
-		Length: Short
-		ID: 4
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x001A
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI 5
-		Type: 32-bit PCI
-		Current Usage: In Use
-		Length: Short
-		ID: 5
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x001B
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: AGP
-		Type: 32-bit PCI
-		Current Usage: In Use
-		Length: Short
-		ID: 6
-		Characteristics:
-			3.3 V is provided
-			PME signal is supported
-Handle 0x001C
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: ISA 1
-		Type: 16-bit ISA
-		Current Usage: Unknown
-		Length: Long
-		Characteristics:
-			5.0 V is provided
-Handle 0x001D
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: 0
-		String 2: 0
-Handle 0x001E
-	DMI type 13, 22 bytes.
-	BIOS Language Information
-		Installable Languages: 1
-			en|US|iso8859-1
-		Currently Installed Language: en|US|iso8859-1
-Handle 0x001F
-	DMI type 14, 14 bytes.
-	Group Associations
-		Name: Cpu Module
-		Items: 3
-			0x0004 (Processor)
-			0x0009 (Cache)
-			0x000A (Cache)
-Handle 0x0020
-	DMI type 14, 29 bytes.
-	Group Associations
-		Name: Memory Module Set
-		Items: 8
-			0x0021 (Physical Memory Array)
-			0x0022 (Memory Device)
-			0x0026 (Memory Device Mapped Address)
-			0x0023 (Memory Device)
-			0x0027 (Memory Device Mapped Address)
-			0x0024 (Memory Device)
-			0x0028 (Memory Device Mapped Address)
-			0x0025 (Memory Array Mapped Address)
-Handle 0x0021
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 1 GB
-		Error Information Handle: Not Provided
-		Number Of Devices: 3
-Handle 0x0022
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x0021
-		Error Information Handle: No Error
-		Total Width: 72 bits
-		Data Width: 64 bits
-		Size: 256 MB
-		Form Factor: DIMM
-		Set: 1
-		Locator: DIMM 1
-		Bank Locator: Not Specified
-		Type: DRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-Handle 0x0023
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x0021
-		Error Information Handle: No Error
-		Total Width: Unknown
-		Data Width: Unknown
-		Size: No Module Installed
-		Form Factor: DIMM
-		Set: 2
-		Locator: DIMM 2
-		Bank Locator: Not Specified
-		Type: DRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-Handle 0x0024
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x0021
-		Error Information Handle: No Error
-		Total Width: 72 bits
-		Data Width: 64 bits
-		Size: 128 MB
-		Form Factor: DIMM
-		Set: 2
-		Locator: DIMM 3
-		Bank Locator: Not Specified
-		Type: DRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-Handle 0x0025
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x060000003FF
-		Range Size: 402653185 kB
-		Physical Array Handle: 0x0021
-		Partition Width: 0
-Handle 0x0026
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x0022
-		Memory Array Mapped Address Handle: 0x0025
-		Partition Row Position: 1
-Handle 0x0027
-	DMI type 126, 19 bytes.
-	Inactive
-Handle 0x0028
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00010000000
-		Ending Address: 0x00017FFFFFF
-		Range Size: 128 MB
-		Physical Device Handle: 0x0024
-		Memory Array Mapped Address Handle: 0x0025
-		Partition Row Position: 3
-Handle 0x0029
-	DMI type 32, 11 bytes.
-	System Boot Information
-		Status: No errors detected
-Handle 0x002A
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Desktop.ASUSTek-CUV4X-EA b/test/dmidecode.Desktop.ASUSTek-CUV4X-EA
deleted file mode 100644
index 5db5f393..00000000
--- a/test/dmidecode.Desktop.ASUSTek-CUV4X-EA
+++ /dev/null
@@ -1,544 +0,0 @@
-# dmidecode 2.3
-SMBIOS 2.3 present.
-48 structures occupying 1388 bytes.
-Table at 0x000F29D0.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: Award Software, Inc.
-		Version: ASUS CUV4X-EA ACPI BIOS Revision 1005
-		Release Date: 09/12/2001
-		Address: 0xF0000
-		Runtime Size: 64 kB
-		ROM Size: 256 kB
-		Characteristics:
-			PCI is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			ESCD support is available
-			Boot from CD is supported
-			Selectable boot is supported
-			BIOS ROM is socketed
-			EDD is supported
-			5.25"/360 KB floppy services are supported (int 13h)
-			5.25"/1.2 MB floppy services are supported (int 13h)
-			3.5"/720 KB floppy services are supported (int 13h)
-			3.5"/2.88 MB floppy services are supported (int 13h)
-			Print screen service is supported (int 5h)
-			8042 keyboard services are supported (int 9h)
-			Serial services are supported (int 14h)
-			Printer services are supported (int 17h)
-			CGA/mono video services are supported (int 10h)
-			ACPI is supported
-			AGP is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: System Manufacturer
-		Product Name: System Name
-		Version: System Version
-		Serial Number: SYS-1234567890
-		UUID: Not Settable
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: ASUSTeK Computer INC.
-		Product Name: CUV4X-EA
-		Version: REV 1.xx
-		Serial Number: xxxxxxxxxxx
-Handle 0x0003
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: Chassis Manufacture
-		Type: Tower
-		Lock: Not Present
-		Version: Chassis Version
-		Serial Number: Chassis Serial Number
-		Asset Tag: Asset-1234567890
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: Unknown
-		OEM Information: 0x00000000
-Handle 0x0004
-	DMI type 4, 32 bytes.
-	Processor Information
-		Socket Designation: PGA 370
-		Type: Central Processor
-		Family: Celeron
-		Manufacturer: GenuineIntel
-		ID: 8A 06 00 00 FF F9 83 03
-		Signature: Type 0, Family 6, Model 8, Stepping 10
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-		Version: Intel Celeron(TM) Processor
-		Voltage: 1.7 V
-		External Clock: 100 MHz
-		Max Speed: 1200 MHz
-		Current Speed: 1000 MHz
-		Status: Populated, Enabled
-		Upgrade: LIF Socket
-		L1 Cache Handle: 0x000A
-		L2 Cache Handle: 0x000B
-		L3 Cache Handle: Not Provided
-Handle 0x0005
-	DMI type 5, 24 bytes.
-	Memory Controller Information
-		Error Detecting Method: None
-		Error Correcting Capabilities:
-			Other
-		Supported Interleave: Unknown
-		Current Interleave: Unknown
-		Maximum Memory Module Size: 1024 MB
-		Maximum Total Memory Size: 4096 MB
-		Supported Speeds:
-			70 ns
-			60 ns
-			50 ns
-		Supported Memory Types:
-			DIMM
-			SDRAM
-		Memory Module Voltage: 3.3 V
-		Associated Memory Slots: 4
-			0x0006
-			0x0007
-			0x0008
-			0x0009
-		Enabled Error Correcting Capabilities:
-			Unknown
-Handle 0x0006
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM 1
-		Bank Connections: 0 1
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 256 MB (Double-bank Connection)
-		Enabled Size: 256 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0007
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM 2
-		Bank Connections: 2 3
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 256 MB (Double-bank Connection)
-		Enabled Size: 256 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0008
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM 3
-		Bank Connections: 4 5
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 256 MB (Double-bank Connection)
-		Enabled Size: 256 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0009
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM 4
-		Bank Connections: 6 7
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 256 MB (Double-bank Connection)
-		Enabled Size: 256 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x000A
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L1 Cache
-		Configuration: Enabled, Not Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 32 KB
-		Maximum Size: 32 KB
-		Supported SRAM Types:
-			Pipeline Burst
-			Synchronous
-		Installed SRAM Type: Pipeline Burst Synchronous
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Data
-		Associativity: 4-way Set-associative
-Handle 0x000B
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L2 Cache
-		Configuration: Enabled, Not Socketed, Level 2
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 128 KB
-		Maximum Size: 256 KB
-		Supported SRAM Types:
-			Pipeline Burst
-			Synchronous
-		Installed SRAM Type: Pipeline Burst Synchronous
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Data
-		Associativity: 4-way Set-associative
-Handle 0x000C
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: PRIMARY IDE/HDD
-		Internal Connector Type: On Board IDE
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: None
-Handle 0x000D
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: SECONDARY IDE/HDD
-		Internal Connector Type: On Board IDE
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: None
-Handle 0x000E
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: FLOPPY
-		Internal Connector Type: On Board Floppy
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: None
-Handle 0x000F
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: USB1
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0010
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: USB2
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0011
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: PS/2 Keybaord
-		External Connector Type: PS/2
-		Port Type: Keyboard Port
-Handle 0x0012
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: PS/2 Mouse
-		External Connector Type: PS/2
-		Port Type: Mouse Port
-Handle 0x0013
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: Parallel Port
-		External Connector Type: DB-25 female
-		Port Type: Parallel Port ECP/EPP
-Handle 0x0014
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: Serial Port
-		External Connector Type: DB-9 male
-		Port Type: Serial Port 16550 Compatible
-Handle 0x0015
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: Serial Port 2
-		External Connector Type: DB-9 male
-		Port Type: Serial Port 16550 Compatible
-Handle 0x0016
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: Joystick Port
-		External Connector Type: DB-15 female
-		Port Type: Joystick Port
-Handle 0x0017
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: MIDI Port
-		External Connector Type: DB-15 female
-		Port Type: MIDI Port
-Handle 0x0018
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: Video Port
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Video Port
-Handle 0x0019
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI 1
-		Type: 32-bit PCI
-		Current Usage: In Use
-		Length: Short
-		ID: 1
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x001A
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI 2
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Short
-		ID: 2
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x001B
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI 3
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Short
-		ID: 3
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x001C
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI 4
-		Type: 32-bit PCI
-		Current Usage: In Use
-		Length: Short
-		ID: 4
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x001D
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI 5
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Short
-		ID: 5
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x001E
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI 6
-		Type: 32-bit PCI
-		Current Usage: In Use
-		Length: Short
-		ID: 6
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x001F
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: AGP
-		Type: 32-bit PCI
-		Current Usage: In Use
-		Length: Short
-		ID: 7
-		Characteristics:
-			3.3 V is provided
-			PME signal is supported
-Handle 0x0020
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: 0
-		String 2: 0
-Handle 0x0021
-	DMI type 13, 22 bytes.
-	BIOS Language Information
-		Installable Languages: 1
-			en|US|iso8859-1
-		Currently Installed Language: en|US|iso8859-1
-Handle 0x0022
-	DMI type 14, 14 bytes.
-	Group Associations
-		Name: Cpu Module
-		Items: 3
-			0x0004 (Processor)
-			0x000A (Cache)
-			0x000B (Cache)
-Handle 0x0023
-	DMI type 14, 35 bytes.
-	Group Associations
-		Name: Memory Module Set
-		Items: 10
-			0x0024 (Physical Memory Array)
-			0x0025 (Memory Device)
-			0x002A (Memory Device Mapped Address)
-			0x0026 (Memory Device)
-			0x002B (Memory Device Mapped Address)
-			0x0027 (Memory Device)
-			0x002C (Memory Device Mapped Address)
-			0x0028 (Memory Device)
-			0x002D (Memory Device Mapped Address)
-			0x0029 (Memory Array Mapped Address)
-Handle 0x0024
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 1 GB
-		Error Information Handle: Not Provided
-		Number Of Devices: 4
-Handle 0x0025
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x0024
-		Error Information Handle: No Error
-		Total Width: 72 bits
-		Data Width: 64 bits
-		Size: 256 MB
-		Form Factor: DIMM
-		Set: 1
-		Locator: DIMM 1
-		Bank Locator: Not Specified
-		Type: DRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-Handle 0x0026
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x0024
-		Error Information Handle: No Error
-		Total Width: 72 bits
-		Data Width: 64 bits
-		Size: 256 MB
-		Form Factor: DIMM
-		Set: 2
-		Locator: DIMM 2
-		Bank Locator: Not Specified
-		Type: DRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-Handle 0x0027
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x0024
-		Error Information Handle: No Error
-		Total Width: 72 bits
-		Data Width: 64 bits
-		Size: 256 MB
-		Form Factor: DIMM
-		Set: 2
-		Locator: DIMM 3
-		Bank Locator: Not Specified
-		Type: DRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-Handle 0x0028
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x0024
-		Error Information Handle: No Error
-		Total Width: 72 bits
-		Data Width: 64 bits
-		Size: 256 MB
-		Form Factor: DIMM
-		Set: 2
-		Locator: DIMM 4
-		Bank Locator: Not Specified
-		Type: DRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-Handle 0x0029
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x100000003FF
-		Range Size: 1073741825 kB
-		Physical Array Handle: 0x0024
-		Partition Width: 0
-Handle 0x002A
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x0025
-		Memory Array Mapped Address Handle: 0x0029
-		Partition Row Position: 1
-Handle 0x002B
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00010000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x0026
-		Memory Array Mapped Address Handle: 0x0029
-		Partition Row Position: 2
-Handle 0x002C
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00020000000
-		Ending Address: 0x0002FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x0027
-		Memory Array Mapped Address Handle: 0x0029
-		Partition Row Position: 3
-Handle 0x002D
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00030000000
-		Ending Address: 0x0003FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x0028
-		Memory Array Mapped Address Handle: 0x0029
-		Partition Row Position: 4
-Handle 0x002E
-	DMI type 32, 11 bytes.
-	System Boot Information
-		Status: No errors detected
-Handle 0x002F
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Desktop.Dell-Dimension-4600i b/test/dmidecode.Desktop.Dell-Dimension-4600i
deleted file mode 100644
index 8214dda5..00000000
--- a/test/dmidecode.Desktop.Dell-Dimension-4600i
+++ /dev/null
@@ -1,633 +0,0 @@
-# dmidecode 2.3
-SMBIOS 2.3 present.
-67 structures occupying 2149 bytes.
-Table at 0x000F0450.
-Handle 0xDA00
-	DMI type 218, 35 bytes.
-	OEM-specific Type
-		Header and Data:
-			DA 23 00 DA B2 00 17 0B 0E 18 00 58 00 58 00 01
-			00 59 00 59 00 01 00 05 80 05 80 01 00 FF FF 00
-			00 00 00
-Handle 0xDA01
-	DMI type 218, 17 bytes.
-	OEM-specific Type
-		Header and Data:
-			DA 11 01 DA B2 00 17 0B 0E 18 00 FF FF 00 00 00
-			00
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: Dell Computer Corporation
-		Version: A07
-		Release Date: 11/06/2003
-		Address: 0xF0000
-		Runtime Size: 64 kB
-		ROM Size: 512 kB
-		Characteristics:
-			PCI is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			ESCD support is available
-			Boot from CD is supported
-			Selectable boot is supported
-			EDD is supported
-			Japanese floppy for Toshiba 1.2 MB is supported (int 13h)
-			Print screen service is supported (int 5h)
-			8042 keyboard services are supported (int 9h)
-			Serial services are supported (int 14h)
-			Printer services are supported (int 17h)
-			ACPI is supported
-			USB legacy is supported
-			AGP is supported
-			LS-120 boot is supported
-			BIOS boot specification is supported
-			Function key-initiated network boot is supported
-Handle 0x0100
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: Dell Computer Corporation
-		Product Name: Dimension 4600i              
-		Version: Not Specified
-		Serial Number: 3RN8641
-		UUID: 44454C4C-5200-104E-8038-B3C04F363431
-		Wake-up Type: APM Timer
-Handle 0x0200
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: Dell Computer Corp.
-		Product Name: 0F4491
-		Version:    
-		Serial Number: ..CN481113BT0349.
-Handle 0x0300
-	DMI type 3, 13 bytes.
-	Chassis Information
-		Manufacturer: Dell Computer Corporation
-		Type: Mini Tower
-		Lock: Not Present
-		Version: Not Specified
-		Serial Number: 3RN8641
-		Asset Tag:           
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-Handle 0x0400
-	DMI type 4, 32 bytes.
-	Processor Information
-		Socket Designation: Microprocessor
-		Type: Central Processor
-		Family: Pentium 4
-		Manufacturer: Intel
-		ID: 29 0F 00 00 FF FB EB BF
-		Signature: Type 0, Family 15, Model 2, Stepping 9
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			APIC (On-chip APIC hardware supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			CLFSH (CLFLUSH instruction supported)
-			DS (Debug store)
-			ACPI (ACPI supported)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-			SSE2 (Streaming SIMD extensions 2)
-			SS (Self-snoop)
-			HTT (Hyper-threading technology)
-			TM (Thermal monitor supported)
-			SBF (Signal break on FERR)
-		Version: Not Specified
-		Voltage: 1.2 V
-		External Clock: 800 MHz
-		Max Speed: 3200 MHz
-		Current Speed: 2600 MHz
-		Status: Populated, Enabled
-		Upgrade: ZIF Socket
-		L1 Cache Handle: 0x0700
-		L2 Cache Handle: 0x0701
-		L3 Cache Handle: Not Provided
-Handle 0x0700
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: Not Specified
-		Configuration: Enabled, Not Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 8 KB
-		Maximum Size: 8 KB
-		Supported SRAM Types:
-			Other
-		Installed SRAM Type: Other
-		Speed: Unknown
-		Error Correction Type: None
-		System Type: Data
-		Associativity: 4-way Set-associative
-Handle 0x0701
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: Not Specified
-		Configuration: Enabled, Not Socketed, Level 2
-		Operational Mode: Varies With Memory Address
-		Location: Internal
-		Installed Size: 512 KB
-		Maximum Size: 512 KB
-		Supported SRAM Types:
-			Other
-		Installed SRAM Type: Other
-		Speed: Unknown
-		Error Correction Type: Single-bit ECC
-		System Type: Unified
-		Associativity: Other
-Handle 0x0800
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: PARALLEL
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: DB-25 female
-		Port Type: Parallel Port PS/2
-Handle 0x0801
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: SERIAL1
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: DB-9 male
-		Port Type: Serial Port 16550A Compatible
-Handle 0x0803
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: KYBD
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: PS/2
-		Port Type: Keyboard Port
-Handle 0x0804
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: MOUSE
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: PS/2
-		Port Type: Mouse Port
-Handle 0x0805
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: USB1
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0806
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: USB2
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0807
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: USB3
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0808
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: USB4
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0809
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: USB5
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x080A
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: USB6
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x080B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: USB7
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x080C
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: USB8
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x080D
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: ENET
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: RJ-45
-		Port Type: Network Port
-Handle 0x080E
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: MIC
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x080F
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: LINE-OUT
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x0818
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: LINE-OUT
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x0819
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: LINE-OUT
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x0810
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: LINE-IN
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x0811
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: HP-OUT
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x0812
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: MONITOR
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: DB-15 female
-		Port Type: Video Port
-Handle 0x0901
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI1
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Long
-		ID: 1
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x0902
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI2
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Long
-		ID: 2
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x0903
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI3
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Long
-		ID: 3
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x0904
-	DMI type 126, 13 bytes.
-	Inactive
-Handle 0x0905
-	DMI type 126, 13 bytes.
-	Inactive
-Handle 0x090A
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: AGP1
-		Type: 32-bit AGP 8x
-		Current Usage: In Use
-		Length: Long
-		Characteristics:
-			3.3 V is provided
-			PME signal is supported
-Handle 0x0A00
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Video
-		Status: Disabled
-		Description: Intel 865-G PCI Accelerated SVGA
-Handle 0x0A02
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Ethernet
-		Status: Enabled
-		Description: Intel Pro 100 VE Network Connection
-Handle 0x0A03
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Sound
-		Status: Enabled
-		Description: AC'97 Audio Controller
-Handle 0x0B00
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: www.dell.com
-Handle 0x0D00
-	DMI type 13, 22 bytes.
-	BIOS Language Information
-		Installable Languages: 1
-			en|US|iso8859-1
-		Currently Installed Language: en|US|iso8859-1
-Handle 0x0F00
-	DMI type 15, 29 bytes.
-	System Event Log
-		Area Length: 2049 bytes
-		Header Start Offset: 0x0000
-		Header Length: 16 bytes
-		Data Start Offset: 0x0010
-		Access Method: Memory-mapped physical 32-bit address
-		Access Address: 0xFFF82000
-		Status: Valid, Not Full
-		Change Token: 0x00000012
-		Header Format: Type 1
-		Supported Log Type Descriptors: 3
-		Descriptor 1: POST error
-		Data Format 1: POST results bitmap
-		Descriptor 2: System limit exceeded
-		Data Format 2: System management
-		Descriptor 3: Log area reset/cleared
-		Data Format 3: None
-Handle 0x1000
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 4 GB
-		Error Information Handle: Not Provided
-		Number Of Devices: 4
-Handle 0x1100
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x1000
-		Error Information Handle: Not Provided
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 128 MB
-		Form Factor: DIMM
-		Set: None
-		Locator: CHANNEL A DIMM 0
-		Bank Locator: Not Specified
-		Type: SDRAM
-		Type Detail: Synchronous
-		Speed: 333 MHz (3.0 ns)
-Handle 0x1101
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x1000
-		Error Information Handle: Not Provided
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 128 MB
-		Form Factor: DIMM
-		Set: None
-		Locator: CHANNEL B DIMM 0
-		Bank Locator: Not Specified
-		Type: SDRAM
-		Type Detail: Synchronous
-		Speed: 333 MHz (3.0 ns)
-Handle 0x1102
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x1000
-		Error Information Handle: Not Provided
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 512 MB
-		Form Factor: DIMM
-		Set: None
-		Locator: CHANNEL A DIMM 1
-		Bank Locator: Not Specified
-		Type: SDRAM
-		Type Detail: Synchronous
-		Speed: 333 MHz (3.0 ns)
-Handle 0x1103
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x1000
-		Error Information Handle: Not Provided
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 512 MB
-		Form Factor: DIMM
-		Set: None
-		Locator: CHANNEL B DIMM 1
-		Bank Locator: Not Specified
-		Type: SDRAM
-		Type Detail: Synchronous
-		Speed: 333 MHz (3.0 ns)
-Handle 0x1301
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0004FFFFFFF
-		Range Size: 1280 MB
-		Physical Array Handle: 0x1000
-		Partition Width: 0
-Handle 0x1402
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x00007FFFFFF
-		Range Size: 128 MB
-		Physical Device Handle: 0x1100
-		Memory Array Mapped Address Handle: 0x1301
-		Partition Row Position: 1
-Handle 0x1403
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00008000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 128 MB
-		Physical Device Handle: 0x1101
-		Memory Array Mapped Address Handle: 0x1301
-		Partition Row Position: 1
-Handle 0x1404
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00010000000
-		Ending Address: 0x0002FFFFFFF
-		Range Size: 512 MB
-		Physical Device Handle: 0x1102
-		Memory Array Mapped Address Handle: 0x1301
-		Partition Row Position: 1
-Handle 0x1405
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00030000000
-		Ending Address: 0x0004FFFFFFF
-		Range Size: 512 MB
-		Physical Device Handle: 0x1103
-		Memory Array Mapped Address Handle: 0x1301
-		Partition Row Position: 1
-Handle 0x1800
-	DMI type 24, 5 bytes.
-	Hardware Security
-		Power-On Password Status: Enabled
-		Keyboard Password Status: Not Implemented
-		Administrator Password Status: Enabled
-		Front Panel Reset Status: Not Implemented
-Handle 0x1900
-	DMI type 25, 9 bytes.
-	System Power Controls
-		Next Scheduled Power-on: *-* 00:00:00
-Handle 0x1B00
-	DMI type 27, 12 bytes.
-	Cooling Device
-		Type: Fan
-		Status: OK
-		OEM-specific Information: 0x00000000
-Handle 0x1F00
-	DMI type 31, 28 bytes.
-	Boot Integrity Services Entry Point
-Handle 0x2000
-	DMI type 32, 11 bytes.
-	System Boot Information
-		Status: No errors detected
-Handle 0xD000
-	DMI type 208, 10 bytes.
-	OEM-specific Type
-		Header and Data:
-			D0 0A 00 D0 01 03 FE 00 55 01
-Handle 0xD100
-	DMI type 209, 12 bytes.
-	OEM-specific Type
-		Header and Data:
-			D1 0C 00 D1 78 03 07 03 04 0F 80 05
-Handle 0xD200
-	DMI type 210, 12 bytes.
-	OEM-specific Type
-		Header and Data:
-			D2 0C 00 D2 F8 03 04 03 06 80 04 05
-Handle 0xD400
-	DMI type 212, 177 bytes.
-	OEM-specific Type
-		Header and Data:
-			D4 B1 00 D4 70 00 71 00 00 10 2D 2E 42 00 11 FE
-			01 43 00 11 FE 00 0F 00 25 FC 00 10 00 25 FC 01
-			11 00 25 FC 02 12 00 25 FC 03 07 00 23 8F 00 08
-			00 23 F3 00 09 00 23 F3 04 0A 00 23 F3 08 0B 00
-			23 8F 10 0C 00 23 8F 20 0E 00 23 8F 30 0D 00 23
-			8C 40 A6 00 23 8C 41 A7 00 23 8C 42 05 01 22 FD
-			02 06 01 22 FD 00 8C 00 22 FE 00 8D 00 22 FE 01
-			9B 00 25 3F 40 9C 00 25 3F 00 09 01 25 3F 80 A8
-			00 26 FE 01 A9 00 26 FE 00 A1 00 26 F3 00 A2 00
-			26 F3 08 A3 00 26 F3 04 9F 00 26 FD 02 A0 00 26
-			FD 00 9D 00 11 FB 04 9E 00 11 FB 00 FF FF 00 00
-			00
-Handle 0xD401
-	DMI type 212, 207 bytes.
-	OEM-specific Type
-		Header and Data:
-			D4 CF 01 D4 70 00 71 00 03 40 59 6D 2D 00 59 FC
-			02 2E 00 59 FC 00 6E 00 59 FC 01 28 00 59 3F 00
-			29 00 59 3F 40 2A 00 59 3F 80 2B 00 5A 00 00 2C
-			00 5B 00 00 55 00 59 F3 00 6D 00 59 F3 04 5C 00
-			78 BF 40 5D 00 78 BF 00 04 80 78 F5 0A 01 A0 78
-			F5 00 1C 00 55 FB 04 1D 00 55 FB 00 19 00 55 E7
-			00 1A 00 55 E7 08 1B 00 55 E7 10 93 00 7B 7F 80
-			94 00 7B 7F 00 23 00 55 7F 00 22 00 55 7F 80 03
-			C0 67 00 05 8A 00 37 DF 20 8B 00 37 DF 00 AC 00
-			51 CF 30 AD 00 51 CF 00 AE 00 51 CF 10 AF 00 51
-			CF 20 F5 00 58 BF 40 F6 00 58 BF 00 EB 00 55 FE
-			00 EA 00 55 FE 01 01 01 51 3F 00 02 01 51 3F 40
-			03 01 51 3F 80 04 01 51 3F C0 FF FF 00 00 00
-Handle 0xD402
-	DMI type 212, 97 bytes.
-	OEM-specific Type
-		Header and Data:
-			D4 61 02 D4 70 00 71 00 00 10 2D 2E 2D 01 21 FE
-			01 2E 01 21 FE 00 2F 01 21 7F 00 30 01 21 7F 80
-			E2 00 27 7F 00 E3 00 27 7F 80 E4 00 27 BF 00 E5
-			00 27 BF 40 07 01 27 DF 20 08 01 27 DF 00 D1 00
-			22 7F 80 D2 00 22 7F 00 17 01 28 FE 00 18 01 28
-			FE 01 19 01 28 FB 00 1A 01 28 FB 04 FF FF 00 00
-			00
-Handle 0xD800
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0xDE00
-	DMI type 222, 13 bytes.
-	OEM-specific Type
-		Header and Data:
-			DE 0D 00 DE C1 01 FF FF 00 00 00 00 00
-Handle 0xDF00
-	DMI type 223, 61 bytes.
-	OEM-specific Type
-		Header and Data:
-			DF 3D 00 DF 0C 00 11 2C FF FF FF FF FF FF FF 74
-			4F 21 A7 01 11 2C FF FF FF FF FF FF FF 74 4F 21
-			C5 02 11 00 00 00 00 00 00 00 00 00 00 00 00 03
-			11 00 00 00 00 00 00 00 00 00 00 00 00
-Handle 0xDF01
-	DMI type 126, 33 bytes.
-	Inactive
-Handle 0x7F00
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Desktop.HP-Pavilion-061 b/test/dmidecode.Desktop.HP-Pavilion-061
deleted file mode 100644
index 42516da2..00000000
--- a/test/dmidecode.Desktop.HP-Pavilion-061
+++ /dev/null
@@ -1,442 +0,0 @@
-# dmidecode 2.4
-SMBIOS 2.3 present.
-37 structures occupying 1147 bytes.
-Table at 0x000F0800.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: Phoenix Technologies, LTD
-		Version:  3.03
-		Release Date: 02/09/2004
-		Address: 0xE0000
-		Runtime Size: 128 kB
-		ROM Size: 512 kB
-		Characteristics:
-			ISA is supported
-			PCI is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			ESCD support is available
-			Boot from CD is supported
-			Selectable boot is supported
-			BIOS ROM is socketed
-			EDD is supported
-			5.25"/360 KB floppy services are supported (int 13h)
-			5.25"/1.2 MB floppy services are supported (int 13h)
-			3.5"/720 KB floppy services are supported (int 13h)
-			3.5"/2.88 MB floppy services are supported (int 13h)
-			Print screen service is supported (int 5h)
-			8042 keyboard services are supported (int 9h)
-			Serial services are supported (int 14h)
-			Printer services are supported (int 17h)
-			CGA/mono video services are supported (int 10h)
-			ACPI is supported
-			USB legacy is supported
-			AGP is supported
-			LS-120 boot is supported
-			ATAPI Zip drive boot is supported
-			BIOS boot specification is supported
-			Function key-initiated network boot is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: HP Pavilion 061
-		Product Name: DW230A-ABA a500n
-		Version: 0n81211RE101KELUT10
-		Serial Number: MXM41207CJ NA500
-		UUID: C04117A0-5D78-D811-999A-C5E667A9E3F1
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 177, 69 bytes.
-	OEM-specific Type
-		Header and Data:
-			B1 45 02 00 00 0E A6 8F 90 6D 01 00 FF 80 43 10
-			65 30 06 11 1F 10 00 00 00 00 03 08 09 0E 03 00
-			40 82 73 B8 00 00 00 00 00 00 00 00 00 00 00 00
-			00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-			00 00 00 00 01
-		Strings:
-			VIA3177-MAC
-Handle 0x0003
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: ASUSTek Computer INC.
-		Product Name: Kelut 
-		Version: 2.02
-		Serial Number: MB-1234567890
-Handle 0x0004
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: Hewlett-Packard
-		Type: Desktop
-		Lock: Not Present
-		Version:  
-		Serial Number:  
-		Asset Tag:  
-		Boot-up State: Unknown
-		Power Supply State: Unknown
-		Thermal State: Unknown
-		Security Status: Unknown
-		OEM Information: 0x00000000
-Handle 0x0005
-	DMI type 4, 35 bytes.
-	Processor Information
-		Socket Designation: Socket A
-		Type: Central Processor
-		Family: Athlon XP
-		Manufacturer: AMD
-		ID: A0 06 00 00 FF FB 83 03
-		Signature: Family 6, Model A, Stepping 0
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			APIC (On-chip APIC hardware supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-		Version: AMD Athlon(tm) XP
-		Voltage: 3.3 V
-		External Clock: 167 MHz
-		Max Speed: 3000 MHz
-		Current Speed: 2088 MHz
-		Status: Populated, Enabled
-		Upgrade: ZIF Socket
-		L1 Cache Handle: 0x0009
-		L2 Cache Handle: 0x000A
-		L3 Cache Handle: Not Provided
-		Serial Number:  
-		Asset Tag:  
-		Part Number:  
-Handle 0x0006
-	DMI type 5, 20 bytes.
-	Memory Controller Information
-		Error Detecting Method: None
-		Error Correcting Capabilities:
-			None
-		Supported Interleave: One-way Interleave
-		Current Interleave: Four-way Interleave
-		Maximum Memory Module Size: 32 MB
-		Maximum Total Memory Size: 64 MB
-		Supported Speeds:
-			70 ns
-			60 ns
-		Supported Memory Types:
-			Standard
-			EDO
-		Memory Module Voltage: 5.0 V
-		Associated Memory Slots: 2
-			0x0007
-			0x0008
-		Enabled Error Correcting Capabilities: None
-Handle 0x0007
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: A0
-		Bank Connections: 0 1
-		Current Speed: 60 ns
-		Type: Other SDRAM
-		Installed Size: 512 MB (Double-bank Connection)
-		Enabled Size: 512 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0008
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: A1
-		Bank Connections: None
-		Current Speed: 60 ns
-		Type: Unknown
-		Installed Size: Not Installed (Single-bank Connection)
-		Enabled Size: Not Installed (Single-bank Connection)
-		Error Status: OK
-Handle 0x0009
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: Internal Cache
-		Configuration: Enabled, Not Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 128 KB
-		Maximum Size: 128 KB
-		Supported SRAM Types:
-			Synchronous
-		Installed SRAM Type: Synchronous
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Unknown
-		Associativity: Unknown
-Handle 0x000A
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: External Cache
-		Configuration: Enabled, Not Socketed, Level 2
-		Operational Mode: Write Back
-		Location: External
-		Installed Size: 512 KB
-		Maximum Size: 512 KB
-		Supported SRAM Types:
-			Synchronous
-		Installed SRAM Type: Synchronous
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Unknown
-		Associativity: Unknown
-Handle 0x000B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: PRIMARY IDE
-		Internal Connector Type: On Board IDE
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: Other
-Handle 0x000C
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: SECONDARY IDE
-		Internal Connector Type: On Board IDE
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: Other
-Handle 0x000D
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: FDD
-		Internal Connector Type: On Board Floppy
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: 8251 FIFO Compatible
-Handle 0x000E
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: COM1
-		Internal Connector Type: 9 Pin Dual Inline (pin 10 cut)
-		External Reference Designator:  
-		External Connector Type: DB-9 male
-		Port Type: Serial Port 16450 Compatible
-Handle 0x000F
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: COM2
-		Internal Connector Type: 9 Pin Dual Inline (pin 10 cut)
-		External Reference Designator:  
-		External Connector Type: DB-9 male
-		Port Type: Serial Port 16450 Compatible
-Handle 0x0010
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: LPT1
-		Internal Connector Type: DB-25 female
-		External Reference Designator:  
-		External Connector Type: DB-25 female
-		Port Type: Parallel Port ECP/EPP
-Handle 0x0011
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Keyboard
-		Internal Connector Type: PS/2
-		External Reference Designator:  
-		External Connector Type: PS/2
-		Port Type: Keyboard Port
-Handle 0x0012
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: PS/2 Mouse
-		Internal Connector Type: PS/2
-		External Reference Designator:  
-		External Connector Type: PS/2
-		Port Type: Mouse Port
-Handle 0x0013
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: USB0
-		External Connector Type: Other
-		Port Type: USB
-Handle 0x0014
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: VIDEO
-		External Connector Type: DB-15 female
-		Port Type: Video Port
-Handle 0x0015
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: AUDIO
-		External Connector Type: None
-		Port Type: Audio Port
-Handle 0x0016
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: ETHERNET
-		External Connector Type: RJ-45
-		Port Type: Network Port
-Handle 0x0017
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI0
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Long
-		ID: 1
-		Characteristics:
-			5.0 V is provided
-			PME signal is supported
-Handle 0x0018
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI1
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Long
-		ID: 2
-		Characteristics:
-			5.0 V is provided
-			PME signal is supported
-Handle 0x0019
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI2
-		Type: 32-bit PCI
-		Current Usage: In Use
-		Length: Long
-		ID: 3
-		Characteristics:
-			5.0 V is provided
-			PME signal is supported
-Handle 0x001A
-	DMI type 10, 12 bytes.
-	On Board Device 1 Information
-		Type: Other
-		Status: Enabled
-		Description:  
-	On Board Device 2 Information
-		Type: Video
-		Status: Enabled
-		Description:  
-	On Board Device 3 Information
-		Type: Ethernet
-		Status: Enabled
-		Description:  
-	On Board Device 4 Information
-		Type: Sound
-		Status: Enabled
-		Description:  
-Handle 0x001B
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: AGP
-		Type: 32-bit AGP 8x
-		Current Usage: Available
-		Length: Long
-		Characteristics:
-			5.0 V is provided
-Handle 0x001C
-	DMI type 13, 22 bytes.
-	BIOS Language Information
-		Installable Languages: 3
-			n|US|iso8859-1
-			n|US|iso8859-1
-			r|CA|iso8859-1
-		Currently Installed Language: n|US|iso8859-1
-Handle 0x001D
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 2 GB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x001E
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x001D
-		Error Information Handle: Not Provided
-		Total Width: Unknown
-		Data Width: Unknown
-		Size: 512 MB
-		Form Factor: DIMM
-		Set: None
-		Locator: A0
-		Bank Locator: Bank0/1
-		Type: Unknown
-		Type Detail: None
-		Speed: Unknown
-		Manufacturer: None
-		Serial Number: None
-		Asset Tag: None
-		Part Number: None
-Handle 0x001F
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x001D
-		Error Information Handle: Not Provided
-		Total Width: Unknown
-		Data Width: Unknown
-		Size: No Module Installed
-		Form Factor: DIMM
-		Set: None
-		Locator: A1
-		Bank Locator: Bank2/3
-		Type: Unknown
-		Type Detail: None
-		Speed: Unknown
-		Manufacturer: None
-		Serial Number: None
-		Asset Tag: None
-		Part Number: None
-Handle 0x0020
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Array Handle: 0x001D
-		Partition Width: 0
-Handle 0x0021
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Device Handle: 0x001E
-		Memory Array Mapped Address Handle: 0x0020
-		Partition Row Position: 1
-Handle 0x0022
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x000000003FF
-		Range Size: 1 kB
-		Physical Device Handle: 0x001F
-		Memory Array Mapped Address Handle: 0x0020
-		Partition Row Position: 1
-Handle 0x0023
-	DMI type 32, 11 bytes.
-	System Boot Information
-		Status: No errors detected
-Handle 0x0024
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Desktop.Intel-D865GBF b/test/dmidecode.Desktop.Intel-D865GBF
deleted file mode 100644
index 1a063aa2..00000000
--- a/test/dmidecode.Desktop.Intel-D865GBF
+++ /dev/null
@@ -1,775 +0,0 @@
-# dmidecode 2.3
-SMBIOS 2.3 present.
-75 structures occupying 2628 bytes.
-Table at 0x000FBBD0.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: Intel Corp.
-		Version: BF86510A.86A.0049.P11.0310141038
-		Release Date: 10/14/2003
-		Address: 0xF0000
-		Runtime Size: 64 kB
-		ROM Size: 512 kB
-		Characteristics:
-			PCI is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			Boot from CD is supported
-			Selectable boot is supported
-			EDD is supported
-			Japanese floppy for NEC 9800 1.2 MB is supported (int 13h)
-			Japanese floppy for Toshiba 1.2 MB is supported (int 13h)
-			5.25"/360 KB floppy services are supported (int 13h)
-			5.25"/1.2 MB floppy services are supported (int 13h)
-			3.5"/720 KB floppy services are supported (int 13h)
-			3.5"/2.88 MB floppy services are supported (int 13h)
-			Print screen service is supported (int 5h)
-			8042 keyboard services are supported (int 9h)
-			Serial services are supported (int 14h)
-			Printer services are supported (int 17h)
-			CGA/mono video services are supported (int 10h)
-			ACPI is supported
-			USB legacy is supported
-			AGP is supported
-			LS-120 boot is supported
-			ATAPI Zip drive boot is supported
-			BIOS boot specification is supported
-			Function key-initiated network boot is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer:                                
-		Product Name:                                
-		Version:                        
-		Serial Number:                                
-		UUID: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: Intel Corporation              
-		Product Name: D865GBF                        
-		Version: AAC25843-406           
-		Serial Number: ABBF34xxxxxx                   
-Handle 0x0003
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer:                                
-		Type: Unknown
-		Lock: Not Present
-		Version:                        
-		Serial Number:                                
-		Asset Tag:                                
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Other
-		Security Status: Other
-		OEM Information: 0x00000000
-Handle 0x0004
-	DMI type 4, 35 bytes.
-	Processor Information
-		Socket Designation: J2E1
-		Type: Central Processor
-		Family: Pentium 4
-		Manufacturer: Intel            
-		ID: 29 0F 00 00 FF FB EB BF
-		Signature: Type 0, Family 15, Model 2, Stepping 9
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			APIC (On-chip APIC hardware supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			CLFSH (CLFLUSH instruction supported)
-			DS (Debug store)
-			ACPI (ACPI supported)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-			SSE2 (Streaming SIMD extensions 2)
-			SS (Self-snoop)
-			HTT (Hyper-threading technology)
-			TM (Thermal monitor supported)
-			SBF (Signal break on FERR)
-		Version: Intel(R) Pentium(R) 4 processor                     
-		Voltage: 3.3 V 2.9 V
-		External Clock: 200 MHz
-		Max Speed: 3060 MHz
-		Current Speed: 2600 MHz
-		Status: Populated, Enabled
-		Upgrade: Socket 478
-		L1 Cache Handle: 0x0005
-		L2 Cache Handle: 0x0006
-		L3 Cache Handle: Not Provided
-		Serial Number: To Be Filled By O.E.M.
-		Asset Tag: To Be Filled By O.E.M.
-		Part Number: To Be Filled By O.E.M.
-Handle 0x0005
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: None
-		Configuration: Enabled, Not Socketed, Level 1
-		Operational Mode: Varies With Memory Address
-		Location: Internal
-		Installed Size: 8 KB
-		Maximum Size: 8 KB
-		Supported SRAM Types:
-			Pipeline Burst
-		Installed SRAM Type: Pipeline Burst
-		Speed: Unknown
-		Error Correction Type: Single-bit ECC
-		System Type: Data
-		Associativity: 4-way Set-associative
-Handle 0x0006
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: None
-		Configuration: Enabled, Not Socketed, Level 2
-		Operational Mode: Varies With Memory Address
-		Location: Internal
-		Installed Size: 512 KB
-		Maximum Size: 512 KB
-		Supported SRAM Types:
-			Pipeline Burst
-		Installed SRAM Type: Pipeline Burst
-		Speed: Unknown
-		Error Correction Type: Single-bit ECC
-		System Type: Unified
-		Associativity: 8-way Set-associative
-Handle 0x0007
-	DMI type 5, 24 bytes.
-	Memory Controller Information
-		Error Detecting Method: 64-bit ECC
-		Error Correcting Capabilities:
-			None
-		Supported Interleave: One-way Interleave
-		Current Interleave: One-way Interleave
-		Maximum Memory Module Size: 1024 MB
-		Maximum Total Memory Size: 4096 MB
-		Supported Speeds:
-			70 ns
-			60 ns
-		Supported Memory Types:
-			Other
-			Unknown
-			Standard
-			FPM
-			EDO
-			Parity
-			ECC
-			SIMM
-			DIMM
-			Burst EDO
-			SDRAM
-		Memory Module Voltage: 3.3 V
-		Associated Memory Slots: 4
-			0x0008
-			0x0009
-			0x000A
-			0x000B
-		Enabled Error Correcting Capabilities:
-			None
-Handle 0x0008
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM1
-		Bank Connections: 11 12
-		Current Speed: 2 ns
-		Type: DIMM
-		Installed Size: Not Installed (Single-bank Connection)
-		Enabled Size: Not Installed (Single-bank Connection)
-		Error Status: OK
-Handle 0x0009
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM2
-		Bank Connections: 11 12
-		Current Speed: 2 ns
-		Type: DIMM
-		Installed Size: Not Installed (Single-bank Connection)
-		Enabled Size: Not Installed (Single-bank Connection)
-		Error Status: OK
-Handle 0x000A
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM3
-		Bank Connections: 11 12
-		Current Speed: 2 ns
-		Type: DIMM
-		Installed Size: 512 MB (Double-bank Connection)
-		Enabled Size: 512 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x000B
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM4
-		Bank Connections: 11 12
-		Current Speed: 2 ns
-		Type: DIMM
-		Installed Size: 512 MB (Double-bank Connection)
-		Enabled Size: 512 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x000C
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J1A1
-		Internal Connector Type: None
-		External Reference Designator: PS2Mouse
-		External Connector Type: PS/2
-		Port Type: Mouse Port
-Handle 0x000D
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J1A1
-		Internal Connector Type: None
-		External Reference Designator: Keyboard
-		External Connector Type: PS/2
-		Port Type: Keyboard Port
-Handle 0x000E
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J2A1
-		Internal Connector Type: None
-		External Reference Designator: COM 1
-		External Connector Type: DB-9 female
-		Port Type: Serial Port 16550A Compatible
-Handle 0x000F
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J4A2
-		Internal Connector Type: None
-		External Reference Designator: LPT1
-		External Connector Type: DB-25 male
-		Port Type: Parallel Port ECP/EPP
-Handle 0x0010
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: JA5A1
-		Internal Connector Type: None
-		External Reference Designator: USB
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0011
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: JA5A1
-		Internal Connector Type: None
-		External Reference Designator: USB
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0012
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J4A1
-		Internal Connector Type: None
-		External Reference Designator: VIDEO
-		External Connector Type: DB-15 male
-		Port Type: Video Port
-Handle 0x0013
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J2A2
-		Internal Connector Type: None
-		External Reference Designator: USB
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0014
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J2A2
-		Internal Connector Type: None
-		External Reference Designator: USB
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0015
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: JA5A1
-		Internal Connector Type: None
-		External Reference Designator: RJ-45 Type
-		External Connector Type: RJ-45
-		Port Type: Network Port
-Handle 0x0016
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J6A1
-		Internal Connector Type: None
-		External Reference Designator: Audio Mic In
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x0017
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J6A1
-		Internal Connector Type: None
-		External Reference Designator: Audio Line In
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x0018
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J6A1
-		Internal Connector Type: None
-		External Reference Designator: Audio Line Out
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x0019
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J5C1 - +12V
-		Internal Connector Type: Other
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: Other
-Handle 0x001A
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J4H1 - FDD
-		Internal Connector Type: On Board Floppy
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: Other
-Handle 0x001B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J6H2 - PRI IDE
-		Internal Connector Type: On Board IDE
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: Other
-Handle 0x001C
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J6H1 - SEC IDE
-		Internal Connector Type: On Board IDE
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: Other
-Handle 0x001D
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J8B1 - CDIN
-		Internal Connector Type: On Board Sound Input From CD-ROM
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: Audio Port
-Handle 0x001E
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J6B1 - AUX IN
-		Internal Connector Type: Other
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: Audio Port
-Handle 0x001F
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J9G1 - FRONT PANEL HDR
-		Internal Connector Type: Other
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: Other
-Handle 0x0020
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J2F1 - CPU FAN
-		Internal Connector Type: Other
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: Other
-Handle 0x0021
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J9H3 - FNT PNL
-		Internal Connector Type: Other
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: Other
-Handle 0x0022
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J9H3 - FRONT CHASSIS FAN
-		Internal Connector Type: Other
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: Other
-Handle 0x0023
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J1B1 - REAR CHASSIS FAN
-		Internal Connector Type: Other
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: Other
-Handle 0x0024
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J9H2 - BIOS CONFIG
-		Internal Connector Type: Other
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: Other
-Handle 0x0025
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J8A1 - FP AUDIO
-		Internal Connector Type: Proprietary
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: Other
-Handle 0x0026
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J9F1 - FRONT PANEL USB
-		Internal Connector Type: Other
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: Other
-Handle 0x0027
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J2H1 - PS
-		Internal Connector Type: Other
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: Other
-Handle 0x0028
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J8H3 - CH INTR
-		Internal Connector Type: Other
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: Other
-Handle 0x0029
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J8H2 - SCSI
-		Internal Connector Type: Other
-		External Reference Designator: Not Specified
-		External Connector Type: None
-		Port Type: Other
-Handle 0x002A
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: J6C1
-		Type: 32-bit AGP 4x
-		Current Usage: Available
-		Length: Long
-		ID: 1
-		Characteristics:
-			3.3 V is provided
-Handle 0x002B
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: J7B1
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Long
-		ID: 2
-		Characteristics:
-			3.3 V is provided
-			PME signal is supported
-			SMBus signal is supported
-Handle 0x002C
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: J8B2
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Long
-		ID: 3
-		Characteristics:
-			3.3 V is provided
-			PME signal is supported
-			SMBus signal is supported
-Handle 0x002D
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: J9B1
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Long
-		ID: 4
-		Characteristics:
-			3.3 V is provided
-			PME signal is supported
-			SMBus signal is supported
-Handle 0x002E
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: J10B1
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Long
-		ID: 5
-		Characteristics:
-			3.3 V is provided
-			PME signal is supported
-			SMBus signal is supported
-Handle 0x002F
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: J10B2
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Long
-		ID: 6
-		Characteristics:
-			3.3 V is provided
-			PME signal is supported
-			SMBus signal is supported
-Handle 0x0030
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: J11B1
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Long
-		ID: 7
-		Characteristics:
-			3.3 V is provided
-			PME signal is supported
-			SMBus signal is supported
-Handle 0x0031
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Video
-		Status: Enabled
-		Description: Intel GMCH AGP Graphics Controller
-Handle 0x0032
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Ethernet
-		Status: Enabled
-		Description: Intel 82562 Ethernet Device
-Handle 0x0033
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Sound
-		Status: Enabled
-		Description: Intel ICH4 Audio Device
-Handle 0x0034
-	DMI type 12, 5 bytes.
-	System Configuration Options
-		Option 1: To Be Filled By O.E.M.
-		Option 2: To Be Filled By O.E.M.
-		Option 3: To Be Filled By O.E.M.
-Handle 0x0035
-	DMI type 13, 22 bytes.
-	BIOS Language Information
-		Installable Languages: 1
-			enUS
-		Currently Installed Language: enUS
-Handle 0x0036
-	DMI type 15, 35 bytes.
-	System Event Log
-		Area Length: 2048 bytes
-		Header Start Offset: 0x0000
-		Header Length: 16 bytes
-		Data Start Offset: 0x0010
-		Access Method: Memory-mapped physical 32-bit address
-		Access Address: 0xFFFEF7F0
-		Status: Valid, Not Full
-		Change Token: 0x00000000
-		Header Format: Type 1
-		Supported Log Type Descriptors: 6
-		Descriptor 1: POST error
-		Data Format 1: POST results bitmap
-		Descriptor 2: Parity memory error
-		Data Format 2: Multiple-event
-		Descriptor 3: I/O channel block
-		Data Format 3: Multiple-event
-		Descriptor 4: Single-bit ECC memory error
-		Data Format 4: Multiple-event
-		Descriptor 5: Multi-bit ECC memory error
-		Data Format 5: Multiple-event
-		Descriptor 6: System limit exceeded
-		Data Format 6: System management
-Handle 0x0037
-	DMI type 18, 23 bytes.
-	32-bit Memory Error Information
-		Type: Unknown
-		Granularity: Unknown
-		Operation: Unknown
-		Vendor Syndrome: Unknown
-		Memory Array Address: Unknown
-		Device Address: Unknown
-		Resolution: Unknown
-Handle 0x0038
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 4 GB
-		Error Information Handle: 0x0037
-		Number Of Devices: 4
-Handle 0x0039
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0003EFFFFFF
-		Range Size: 1008 MB
-		Physical Array Handle: 0x0038
-		Partition Width: 0
-Handle 0x003A
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0038
-		Error Information Handle: 0x0037
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: No Module Installed
-		Form Factor: DIMM
-		Set: None
-		Locator: J6G1
-		Bank Locator: CHANNEL A DIMM0
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: 400 MHz (2.5 ns)
-		Manufacturer: Manufacturer1
-		Serial Number: SerNum1
-		Asset Tag: AssetTagNum1
-		Part Number: PartNum1
-Handle 0x003B
-	DMI type 126, 19 bytes.
-	Inactive
-Handle 0x003C
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0038
-		Error Information Handle: 0x0037
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: No Module Installed
-		Form Factor: DIMM
-		Set: None
-		Locator: J6G2
-		Bank Locator: CHANNEL A DIMM1
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: 400 MHz (2.5 ns)
-		Manufacturer: Manufacturer2
-		Serial Number: SerNum2
-		Asset Tag: AssetTagNum2
-		Part Number: PartNum2
-Handle 0x003D
-	DMI type 126, 19 bytes.
-	Inactive
-Handle 0x003E
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0038
-		Error Information Handle: 0x0037
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 512 MB
-		Form Factor: DIMM
-		Set: None
-		Locator: J6H1
-		Bank Locator: CHANNEL B DIMM0
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: 400 MHz (2.5 ns)
-		Manufacturer: Manufacturer3
-		Serial Number: SerNum3
-		Asset Tag: AssetTagNum3
-		Part Number: PartNum3
-Handle 0x003F
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Device Handle: 0x003E
-		Memory Array Mapped Address Handle: 0x0039
-		Partition Row Position: 1
-Handle 0x0040
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0038
-		Error Information Handle: 0x0037
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 512 MB
-		Form Factor: DIMM
-		Set: None
-		Locator: J6H2
-		Bank Locator: CHANNEL B DIMM1
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: 400 MHz (2.5 ns)
-		Manufacturer: Manufacturer4
-		Serial Number: SerNum4
-		Asset Tag: AssetTagNum4
-		Part Number: PartNum4
-Handle 0x0041
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00020000000
-		Ending Address: 0x0003EFFFFFF
-		Range Size: 496 MB
-		Physical Device Handle: 0x0040
-		Memory Array Mapped Address Handle: 0x0039
-		Partition Row Position: 1
-Handle 0x0042
-	DMI type 23, 13 bytes.
-	System Reset
-		Status: Disabled
-		Watchdog Timer: No
-		Boot Option: <OUT OF SPEC>
-		Boot Option On Limit: <OUT OF SPEC>
-		Reset Count: Unknown
-		Reset Limit: Unknown
-		Timer Interval: Unknown
-		Timeout: Unknown
-Handle 0x0043
-	DMI type 126, 28 bytes.
-	Inactive
-Handle 0x0044
-	DMI type 32, 20 bytes.
-	System Boot Information
-		Status: No errors detected
-Handle 0x0045
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0046
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0047
-	DMI type 187, 9 bytes.
-	OEM-specific Type
-		Header and Data:
-			BB 09 47 00 3E 00 03 90 01
-Handle 0x0048
-	DMI type 187, 9 bytes.
-	OEM-specific Type
-		Header and Data:
-			BB 09 48 00 40 00 03 90 01
-Handle 0x0049
-	DMI type 131, 12 bytes.
-	OEM-specific Type
-		Header and Data:
-			83 0C 49 00 01 01 02 01 09 01 40 01
-		Strings:
-			Intel_ASF_001
-			Intel_ASF_001
-Handle 0x004A
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Laptop.Acer-TravelMate-244LC b/test/dmidecode.Laptop.Acer-TravelMate-244LC
deleted file mode 100644
index 0270870c..00000000
--- a/test/dmidecode.Laptop.Acer-TravelMate-244LC
+++ /dev/null
@@ -1,439 +0,0 @@
-# dmidecode 2.4
-SMBIOS 2.31 present.
-40 structures occupying 1249 bytes.
-Table at 0x000D8010.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: Phoenix Technologies LTD
-		Version: V1.14     
-		Release Date: 10/21/03  
-		Address: 0xE29F0
-		Runtime Size: 120336 bytes
-		ROM Size: 64 kB
-		Characteristics:
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			ESCD support is available
-			Boot from CD is supported
-			Selectable boot is supported
-			ACPI is supported
-			USB legacy is supported
-			LS-120 boot is supported
-			ATAPI Zip drive boot is supported
-			Smart battery is supported
-			BIOS boot specification is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: Acer           
-		Product Name: TravelMate 240 
-		Version: -1             
-		Serial Number: LXT300538241300404M000        
-		UUID: FE366BE0-7C82-11D8-A247-B93847BAD4E1
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: Acer           
-		Product Name: TravelMate 240 
-		Version: Rev.A          
-		Serial Number: LXT300538241300404M000        
-Handle 0x0003
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: Acer           
-		Type: Other
-		Lock: Not Present
-		Version: N/A            
-		Serial Number: None           
-		Asset Tag:                                 
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-		OEM Information: 0x00001234
-Handle 0x0004
-	DMI type 4, 35 bytes.
-	Processor Information
-		Socket Designation: U1
-		Type: Central Processor
-		Family: Pentium 4
-		Manufacturer: Intel
-		ID: 29 0F 00 00 FF F9 EB BF
-		Signature: Type 0, Family 15, Model 2, Stepping 9
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			CLFSH (CLFLUSH instruction supported)
-			DS (Debug store)
-			ACPI (ACPI supported)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-			SSE2 (Streaming SIMD extensions 2)
-			SS (Self-snoop)
-			HTT (Hyper-threading technology)
-			TM (Thermal monitor supported)
-			SBF (Signal break on FERR)
-		Version: Celeron(R)          
-		Voltage: 3.3 V
-		External Clock: Unknown
-		Max Speed: 3060 MHz
-		Current Speed: 2600 MHz
-		Status: Populated, Enabled
-		Upgrade: Slot 1
-		L1 Cache Handle: 0x0008
-		L2 Cache Handle: 0x0009
-		L3 Cache Handle: Not Provided
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0005
-	DMI type 5, 22 bytes.
-	Memory Controller Information
-		Error Detecting Method: None
-		Error Correcting Capabilities:
-			None
-		Supported Interleave: One-way Interleave
-		Current Interleave: One-way Interleave
-		Maximum Memory Module Size: 1024 MB
-		Maximum Total Memory Size: 3072 MB
-		Supported Speeds:
-			70 ns
-			60 ns
-		Supported Memory Types:
-			Other
-		Memory Module Voltage: 3.3 V
-		Associated Memory Slots: 3
-			0x0006
-			0x0007
-			0x0008
-		Enabled Error Correcting Capabilities:
-			None
-Handle 0x0006
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: M1
-		Bank Connections: 0 1
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 256 MB (Double-bank Connection)
-		Enabled Size: 256 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0007
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: M2
-		Bank Connections: 2 3
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 256 MB (Double-bank Connection)
-		Enabled Size: 256 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0008
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L1 Cache
-		Configuration: Enabled, Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 16 KB
-		Maximum Size: 16 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Asynchronous
-		Speed: Unknown
-		Error Correction Type: None
-		System Type: Other
-		Associativity: Other
-Handle 0x0009
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L2 Cache
-		Configuration: Enabled, Socketed, Level 2
-		Operational Mode: Write Back
-		Location: External
-		Installed Size: 128 KB
-		Maximum Size: 512 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Burst
-		Speed: Unknown
-		Error Correction Type: Single-bit ECC
-		System Type: Unified
-		Associativity: Other
-Handle 0x000A
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J23
-		Internal Connector Type: 25 Pin Dual Inline (pin 26 cut)
-		External Reference Designator: Parallel
-		External Connector Type: DB-25 female
-		Port Type: Parallel Port ECP/EPP
-Handle 0x000B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J11
-		Internal Connector Type: None
-		External Reference Designator: Keyboard
-		External Connector Type: Circular DIN-8 male
-		Port Type: Keyboard Port
-Handle 0x000C
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN5
-		Internal Connector Type: None
-		External Reference Designator: USB
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x000D
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN6
-		Internal Connector Type: None
-		External Reference Designator: USB
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x000E
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN26
-		Internal Connector Type: None
-		External Reference Designator: MODEM
-		External Connector Type: RJ-11
-		Port Type: Modem Port
-Handle 0x000F
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: U49
-		Internal Connector Type: None
-		External Reference Designator: LAN
-		External Connector Type: RJ-45
-		Port Type: Network Port
-Handle 0x0010
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN24
-		Internal Connector Type: None
-		External Reference Designator: LINE-IN JACK
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x0011
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN2
-		Internal Connector Type: None
-		External Reference Designator: EXTERNAL DISPLAY
-		External Connector Type: DB-15 female
-		Port Type: Video Port
-Handle 0x0012
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCMCIA Slot J07
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Unknown
-		Length: Long
-		ID: Adapter 0, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-Handle 0x0013
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Sound
-		Status: Disabled
-		Description: Intel
-Handle 0x0014
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Video
-		Status: Disabled
-		Description: Intel Montara GT
-Handle 0x0015
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: This is the Intel Montara
-		String 2: System CR Platform
-Handle 0x0016
-	DMI type 12, 5 bytes.
-	System Configuration Options
-		Option 1: Jumper settings can be described here.
-Handle 0x0017
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 3 GB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x0018
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0017
-		Error Information Handle: No Error
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 256 MB
-		Form Factor: SODIMM
-		Set: 1
-		Locator: M1
-		Bank Locator: Bank 0
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: Unknown
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0019
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0017
-		Error Information Handle: No Error
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 256 MB
-		Form Factor: SODIMM
-		Set: 1
-		Locator: M2
-		Bank Locator: Bank 1
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: Unknown
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x001A
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Array Handle: 0x0017
-		Partition Width: 0
-Handle 0x001B
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x0018
-		Memory Array Mapped Address Handle: 0x001A
-		Partition Row Position: 1
-Handle 0x001C
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00010000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x0019
-		Memory Array Mapped Address Handle: 0x001A
-		Partition Row Position: 1
-Handle 0x001D
-	DMI type 23, 13 bytes.
-	System Reset
-		Status: Enabled
-		Watchdog Timer: Present
-		Boot Option: Do Not Reboot
-		Boot Option On Limit: Do Not Reboot
-		Reset Count: Unknown
-		Reset Limit: Unknown
-		Timer Interval: Unknown
-		Timeout: Unknown
-Handle 0x001E
-	DMI type 24, 5 bytes.
-	Hardware Security
-		Power-On Password Status: Disabled
-		Keyboard Password Status: Unknown
-		Administrator Password Status: Not Implemented
-		Front Panel Reset Status: Unknown
-Handle 0x001F
-	DMI type 25, 9 bytes.
-	System Power Controls
-		Next Scheduled Power-on: 12-31 23:59:59
-Handle 0x0020
-	DMI type 26, 20 bytes.
-	Voltage Probe
-		Description: Voltage Probe
-		Location: Processor
-		Status: OK
-		Maximum Value: Unknown
-		Minimum Value: Unknown
-		Resolution: Unknown
-		Tolerance: Unknown
-		Accuracy: Unknown
-		OEM-specific Information: 0x00000000
-Handle 0x0021
-	DMI type 27, 12 bytes.
-	Cooling Device
-		Temperature Probe Handle: 0x0022
-		Type: Fan
-		Status: OK
-		OEM-specific Information: 0x00000000
-Handle 0x0022
-	DMI type 28, 20 bytes.
-	Temperature Probe
-		Description: Temperature Probe
-		Location: Processor
-		Status: OK
-		Maximum Value: Unknown
-		Minimum Value Unknown
-		Resolution: Unknown
-		Tolerance: Unknown
-		Accuracy: Unknown
-		OEM-specific Information: 0x00000000
-Handle 0x0023
-	DMI type 29, 20 bytes.
-	Electrical Current Probe
-		Description: Electrical Current Probe
-		Location: Processor
-		Status: OK
-		Maximum Value: Unknown
-		Minimum Value: Unknown
-		Resolution: Unknown
-		Tolerance: Unknown
-		Accuracy: Unknown
-		OEM-specific Information: 0x00000000
-Handle 0x0024
-	DMI type 30, 6 bytes.
-	Out-of-band Remote Access
-		Manufacturer Name: Intel
-		Inbound Connection: Enabled
-		Outbound Connection: Disabled
-Handle 0x0025
-	DMI type 32, 20 bytes.
-	System Boot Information
-		Status: <OUT OF SPEC>
-Handle 0x0026
-	DMI type 126, 4 bytes.
-	Inactive
-Handle 0x0027
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Laptop.Acer-TravelMate-610 b/test/dmidecode.Laptop.Acer-TravelMate-610
deleted file mode 100644
index 8efebf01..00000000
--- a/test/dmidecode.Laptop.Acer-TravelMate-610
+++ /dev/null
@@ -1,340 +0,0 @@
-# dmidecode 2.5 (=> Resolution: 1024x768) (=> Diagonal_size: 14.1)
-SMBIOS 2.31 present.
-28 structures occupying 971 bytes.
-Table at 0x000E0010.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: Phoenix Technologies LTD
-		Version: V1.0 R01-C6.
-		Release Date: 11/21/01  
-		Address: 0xE4B30
-		Runtime Size: 111824 bytes
-		ROM Size: 512 kB
-		Characteristics:
-			ISA is supported
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			ESCD support is available
-			Boot from CD is supported
-			ACPI is supported
-			USB legacy is supported
-			AGP is supported
-			Smart battery is supported
-			BIOS boot specification is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: ACER           
-		Product Name: TravelMate 610 
-		Version: -1
-		Serial Number: 9141Q0182X1390200AT000        
-		UUID: AFC22960-B211-11D5-BDA9-80901CAFFB8F
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: ACER           
-		Product Name: TravelMate 610 
-		Version: None
-		Serial Number: 9141Q0182X1390200AT000        
-Handle 0x0003
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: ACER           
-		Type: Other
-		Lock: Not Present
-		Version: N/A
-		Serial Number: None
-		Asset Tag:                                 
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-		OEM Information: 0x00001234
-Handle 0x0004
-	DMI type 4, 35 bytes.
-	Processor Information
-		Socket Designation: U1
-		Type: Central Processor
-		Family: Pentium III
-		Manufacturer: GenuineIntel
-		ID: 8A 06 00 00 FF F9 83 03
-		Signature: Type 0, Family 6, Model 8, Stepping 10
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-		Version: Pentium(R) III
-		Voltage: 3.3 V
-		External Clock: Unknown
-		Max Speed: 1000 MHz
-		Current Speed: 1000 MHz
-		Status: Populated, Enabled
-		Upgrade: Slot 1
-		L1 Cache Handle: 0x0008
-		L2 Cache Handle: 0x0009
-		L3 Cache Handle: Not Provided
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0005
-	DMI type 5, 22 bytes.
-	Memory Controller Information
-		Error Detecting Method: None
-		Error Correcting Capabilities:
-			None
-		Supported Interleave: One-way Interleave
-		Current Interleave: One-way Interleave
-		Maximum Memory Module Size: 256 MB
-		Maximum Total Memory Size: 768 MB
-		Supported Speeds:
-			70 ns
-			60 ns
-		Supported Memory Types:
-			DIMM
-			SDRAM
-		Memory Module Voltage: 3.3 V
-		Associated Memory Slots: 3
-			0x0006
-			0x0007
-			0x0008
-		Enabled Error Correcting Capabilities:
-			None
-Handle 0x0006
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: M1
-		Bank Connections: 0 1
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 128 MB (Double-bank Connection)
-		Enabled Size: 128 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0007
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: M2
-		Bank Connections: 2 3
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 128 MB (Double-bank Connection)
-		Enabled Size: 128 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0008
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L1 Cache
-		Configuration: Enabled, Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 16 KB
-		Maximum Size: 16 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Asynchronous
-		Speed: Unknown
-		Error Correction Type: None
-		System Type: Other
-		Associativity: Other
-Handle 0x0009
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L2 Cache
-		Configuration: Enabled, Socketed, Level 2
-		Operational Mode: Write Back
-		Location: External
-		Installed Size: 256 KB
-		Maximum Size: 512 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Burst
-		Speed: Unknown
-		Error Correction Type: Single-bit ECC
-		System Type: Unified
-		Associativity: Other
-Handle 0x000A
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J19
-		Internal Connector Type: 9 Pin Dual Inline (pin 10 cut)
-		External Reference Designator: COM 1
-		External Connector Type: DB-9 male
-		Port Type: Serial Port 16550A Compatible
-Handle 0x000B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J23
-		Internal Connector Type: 25 Pin Dual Inline (pin 26 cut)
-		External Reference Designator: Parallel
-		External Connector Type: DB-25 female
-		Port Type: Parallel Port ECP/EPP
-Handle 0x000C
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J11
-		Internal Connector Type: None
-		External Reference Designator: Keyboard
-		External Connector Type: Circular DIN-8 male
-		Port Type: Keyboard Port
-Handle 0x000D
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J12
-		Internal Connector Type: None
-		External Reference Designator: PS/2 Mouse
-		External Connector Type: Circular DIN-8 male
-		Port Type: Keyboard Port
-Handle 0x000E
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN4
-		Internal Connector Type: None
-		External Reference Designator: USB
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x000F
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN13
-		Internal Connector Type: None
-		External Reference Designator: Infrared
-		External Connector Type: Infrared
-		Port Type: Other
-Handle 0x0010
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: 2 CardBus Slots
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Unknown
-		Length: Other
-		ID: Adapter 0, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Zoom Video is supported
-Handle 0x0011
-	DMI type 10, 8 bytes.
-	On Board Device 1 Information
-		Type: Video
-		Status: Disabled
-		Description: Video (NeoMagic NM2200)
-	On Board Device 2 Information
-		Type: Sound
-		Status: Disabled
-		Description: ADI
-Handle 0x0012
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: This is the Intel Solano
-		String 2: System CR Platform
-Handle 0x0013
-	DMI type 12, 5 bytes.
-	System Configuration Options
-		Option 1: Jumper settings can be described here.
-Handle 0x0014
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 512 MB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x0015
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0014
-		Error Information Handle: No Error
-		Total Width: 32 bits
-		Data Width: 32 bits
-		Size: 128 MB
-		Form Factor: DIMM
-		Set: 1
-		Locator: M1
-		Bank Locator: Bank 0
-		Type: DRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0016
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0014
-		Error Information Handle: No Error
-		Total Width: 32 bits
-		Data Width: 32 bits
-		Size: 128 MB
-		Form Factor: DIMM
-		Set: 1
-		Locator: M2
-		Bank Locator: Bank 1
-		Type: DRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0017
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 256 MB
-		Physical Array Handle: 0x0014
-		Partition Width: 0
-Handle 0x0018
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x00007FFFFFF
-		Range Size: 128 MB
-		Physical Device Handle: 0x0015
-		Memory Array Mapped Address Handle: 0x0017
-		Partition Row Position: 1
-Handle 0x0019
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00008000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 128 MB
-		Physical Device Handle: 0x0016
-		Memory Array Mapped Address Handle: 0x0017
-		Partition Row Position: 1
-Handle 0x001A
-	DMI type 32, 20 bytes.
-	System Boot Information
-		Status: <OUT OF SPEC>
-Handle 0x001B
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Laptop.Acer-Travelmate-6003LCi b/test/dmidecode.Laptop.Acer-Travelmate-6003LCi
deleted file mode 100644
index 8c66dc4b..00000000
--- a/test/dmidecode.Laptop.Acer-Travelmate-6003LCi
+++ /dev/null
@@ -1,361 +0,0 @@
-# dmidecode 2.4
-SMBIOS 2.31 present.
-27 structures occupying 1211 bytes.
-Table at 0x000DF810.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: ACER   
-		Version: 3A14
-		Release Date: 04/20/2004
-		Address: 0xE5160
-		Runtime Size: 110240 bytes
-		ROM Size: 512 kB
-		Characteristics:
-			ISA is supported
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			ESCD support is available
-			Boot from CD is supported
-			3.5"/720 KB floppy services are supported (int 13h)
-			Print screen service is supported (int 5h)
-			8042 keyboard services are supported (int 9h)
-			Serial services are supported (int 14h)
-			Printer services are supported (int 17h)
-			ACPI is supported
-			USB legacy is supported
-			AGP is supported
-			Smart battery is supported
-			BIOS boot specification is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: Acer
-		Product Name: TravelMate 6000
-		Version: Rev 1                   
-		Serial Number: LXT41050014200085CEF00
-		UUID: E043E530-B1A3-D811-8AAC-00C09F3DF593
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: Acer
-		Product Name: TravelMate 6000
-		Version: Rev 1.0                 
-		Serial Number: LXT41050014200085CEF00
-Handle 0x0003
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: Acer
-		Type: Notebook
-		Lock: Not Present
-		Version: Rev.1                   
-		Serial Number: LXT41050014200085CEF00
-		Asset Tag: ................................     
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-		OEM Information: 0x00001234
-Handle 0x0004
-	DMI type 4, 35 bytes.
-	Processor Information
-		Socket Designation: uFCPGA2
-		Type: Central Processor
-		Family: Pentium M
-		Manufacturer: Intel
-		ID: 95 06 00 00 BF F9 E9 A7
-		Signature: Type 0, Family 6, Model 9, Stepping 5
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			CLFSH (CLFLUSH instruction supported)
-			DS (Debug store)
-			ACPI (ACPI supported)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-			SSE2 (Streaming SIMD extensions 2)
-			TM (Thermal monitor supported)
-			SBF (Signal break on FERR)
-		Version: Intel(R) Pentium(R) M processor
-		Voltage: 1.2 V
-		External Clock: 400 MHz
-		Max Speed: 1600 MHz
-		Current Speed: 1600 MHz
-		Status: Populated, Enabled
-		Upgrade: ZIF Socket
-		L1 Cache Handle: 0x0008
-		L2 Cache Handle: 0x0009
-		L3 Cache Handle: Not Provided
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0005
-	DMI type 5, 20 bytes.
-	Memory Controller Information
-		Error Detecting Method: None
-		Error Correcting Capabilities:
-			None
-		Supported Interleave: One-way Interleave
-		Current Interleave: One-way Interleave
-		Maximum Memory Module Size: 1024 MB
-		Maximum Total Memory Size: 2048 MB
-		Supported Speeds:
-			60 ns
-		Supported Memory Types:
-			DIMM
-		Memory Module Voltage: 3.3 V
-		Associated Memory Slots: 2
-			0x0006
-			0x0007
-		Enabled Error Correcting Capabilities:
-			None
-Handle 0x0006
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM 1
-		Bank Connections: 0 1
-		Current Speed: 75 ns
-		Type: DIMM SDRAM
-		Installed Size: 256 MB (Double-bank Connection)
-		Enabled Size: 256 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0007
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM 2
-		Bank Connections: 2 3
-		Current Speed: 75 ns
-		Type: DIMM SDRAM
-		Installed Size: 256 MB (Double-bank Connection)
-		Enabled Size: 256 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0008
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L1 Cache
-		Configuration: Enabled, Not Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 32 KB
-		Maximum Size: 32 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Asynchronous
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Unknown
-		Associativity: Unknown
-Handle 0x0009
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L2 Cache
-		Configuration: Enabled, Not Socketed, Level 2
-		Operational Mode: Write Back
-		Location: External
-		Installed Size: 1024 KB
-		Maximum Size: 1024 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Burst
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Unknown
-		Associativity: Unknown
-Handle 0x000A
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: LPT 1
-		Internal Connector Type: None
-		External Reference Designator: Parallel
-		External Connector Type: DB-25 female
-		Port Type: Parallel Port ECP/EPP
-Handle 0x000B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: U28
-		Internal Connector Type: None
-		External Reference Designator: PS/2 Mouse
-		External Connector Type: Circular DIN-8 male
-		Port Type: Keyboard Port
-Handle 0x000C
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCMCIA socket 0
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Unknown
-		Length: Long
-		ID: Adapter 0, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Modem ring resume is supported
-			PME signal is supported
-			Hot-plug devices are supported
-Handle 0x000D
-	DMI type 10, 10 bytes.
-	On Board Device 1 Information
-		Type: Video
-		Status: Disabled
-		Description: Montara-GME
-	On Board Device 2 Information
-		Type: Sound
-		Status: Disabled
-		Description: AC97 Audio
-	On Board Device 3 Information
-		Type: Other
-		Status: Disabled
-		Description: TI TSB43AB21 IEEE-1394 Controller
-Handle 0x000E
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: SMBIOS 2.3
-		String 2: Customer Reference Platform
-Handle 0x000F
-	DMI type 12, 5 bytes.
-	System Configuration Options
-		Option 1: No Jumper On This Platform.
-Handle 0x0010
-	DMI type 15, 29 bytes.
-	System Event Log
-		Area Length: 0 bytes
-		Header Start Offset: 0x0000
-		Header Length: 16 bytes
-		Data Start Offset: 0x0010
-		Access Method: Memory-mapped physical 32-bit address
-		Access Address: 0x00000000
-		Status: Invalid, Not Full
-		Change Token: 0x00000000
-		Header Format: Type 1
-		Supported Log Type Descriptors: 3
-		Descriptor 1: POST error
-		Data Format 1: POST results bitmap
-		Descriptor 2: Single-bit ECC memory error
-		Data Format 2: Multiple-event
-		Descriptor 3: Multi-bit ECC memory error
-		Data Format 3: Multiple-event
-Handle 0x0011
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 3 GB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x0012
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0011
-		Error Information Handle: No Error
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 256 MB
-		Form Factor: DIMM
-		Set: 1
-		Locator: DIMM 0
-		Bank Locator: Bank 0, 1
-		Type: SRAM
-		Type Detail: Synchronous
-		Speed: 333 MHz (3.0 ns)
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0013
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0011
-		Error Information Handle: No Error
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 256 MB
-		Form Factor: DIMM
-		Set: 1
-		Locator: DIMM 1
-		Bank Locator: Bank 2, 3
-		Type: SRAM
-		Type Detail: Synchronous
-		Speed: 333 MHz (3.0 ns)
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0014
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Array Handle: 0x0011
-		Partition Width: 0
-Handle 0x0015
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x0012
-		Memory Array Mapped Address Handle: 0x0014
-		Partition Row Position: 1
-		Interleave Position: 1
-Handle 0x0016
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00010000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x0013
-		Memory Array Mapped Address Handle: 0x0014
-		Partition Row Position: 1
-		Interleave Position: 1
-Handle 0x0017
-	DMI type 21, 7 bytes.
-	Built-in Pointing Device
-		Type: Mouse
-		Interface: PS/2
-		Buttons: 2
-Handle 0x0018
-	DMI type 22, 26 bytes.
-	Portable Battery
-		Location: Right Side
-		Manufacturer: Sanyo
-		Name: Sanyo
-		Chemistry: Lithium Ion
-		Design Capacity: 4400 mWh
-		Design Voltage: 14800 mV
-		SBDS Version: Bat123
-		Maximum Error: 6%
-		SBDS Serial Number: 04D2
-		SBDS Manufacture Date: 1985-08-25
-		OEM-specific Information: 0x00000000
-Handle 0x0019
-	DMI type 32, 20 bytes.
-	System Boot Information
-		Status: <OUT OF SPEC>
-Handle 0x001A
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Laptop.Compal-ACL10 b/test/dmidecode.Laptop.Compal-ACL10
deleted file mode 100644
index c3ae8933..00000000
--- a/test/dmidecode.Laptop.Compal-ACL10
+++ /dev/null
@@ -1,359 +0,0 @@
-# dmidecode 2.5 (=> Resolution: 1400x1050)
-SMBIOS 2.31 present.
-29 structures occupying 1009 bytes.
-Table at 0x000DC010.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: COMPAL
-		Version: V1.80A
-		Release Date: 10/21/2002
-		Address: 0xE5FE0
-		Runtime Size: 106528 bytes
-		ROM Size: 512 kB
-		Characteristics:
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			Boot from CD is supported
-			Selectable boot is supported
-			Japanese floppy for Toshiba 1.2 MB is supported (int 13h)
-			ACPI is supported
-			USB legacy is supported
-			AGP is supported
-			Smart battery is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: *
-		Product Name: *
-		Version: *
-		Serial Number: *
-		UUID: AF647A3B-D269-11D6-98DA-00023FB07335
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: COMPAL
-		Product Name: ACL10
-		Version: Null
-		Serial Number: 0123456789AB
-Handle 0x0003
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: COMPAL
-		Type: Other
-		Lock: Not Present
-		Version: N/A
-		Serial Number: None
-		Asset Tag: No Asset Tag
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-		OEM Information: 0x00001234
-Handle 0x0004
-	DMI type 4, 35 bytes.
-	Processor Information
-		Socket Designation: U9A
-		Type: Central Processor
-		Family: Pentium 4
-		Manufacturer: GenuineIntel
-		ID: 27 0F 00 00 FF F9 EB BF
-		Signature: Type 0, Family 15, Model 2, Stepping 7
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			CLFSH (CLFLUSH instruction supported)
-			DS (Debug store)
-			ACPI (ACPI supported)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-			SSE2 (Streaming SIMD extensions 2)
-			SS (Self-snoop)
-			HTT (Hyper-threading technology)
-			TM (Thermal monitor supported)
-			SBF (Signal break on FERR)
-		Version: Mobile Intel(R) P
-		Voltage: 3.3 V
-		External Clock: Unknown
-		Max Speed: 500 MHz
-		Current Speed: 1200 MHz
-		Status: Populated, Enabled
-		Upgrade: Slot 1
-		L1 Cache Handle: 0x0008
-		L2 Cache Handle: 0x0009
-		L3 Cache Handle: Not Provided
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0005
-	DMI type 5, 20 bytes.
-	Memory Controller Information
-		Error Detecting Method: None
-		Error Correcting Capabilities:
-			None
-		Supported Interleave: One-way Interleave
-		Current Interleave: One-way Interleave
-		Maximum Memory Module Size: 512 MB
-		Maximum Total Memory Size: 1024 MB
-		Supported Speeds:
-			70 ns
-			60 ns
-		Supported Memory Types: None
-		Memory Module Voltage: 3.3 V
-		Associated Memory Slots: 2
-			0x0006
-			0x0007
-		Enabled Error Correcting Capabilities:
-			None
-Handle 0x0006
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: JP26
-		Bank Connections: 0 1
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 256 MB (Single-bank Connection)
-		Enabled Size: 256 MB (Single-bank Connection)
-		Error Status: OK
-Handle 0x0007
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: JP27
-		Bank Connections: 2 3
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 512 MB (Double-bank Connection)
-		Enabled Size: 512 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0008
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L1 Cache
-		Configuration: Enabled, Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 32 KB
-		Maximum Size: 32 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Synchronous
-			Asynchronous
-		Installed SRAM Type: Asynchronous
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Unknown
-		Associativity: Unknown
-Handle 0x0009
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L2 Cache
-		Configuration: Enabled, Socketed, Level 2
-		Operational Mode: Write Back
-		Location: External
-		Installed Size: 512 KB
-		Maximum Size: 512 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Burst
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Unknown
-		Associativity: Unknown
-Handle 0x000A
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: U1
-		Internal Connector Type: None
-		External Reference Designator: Infrared
-		External Connector Type: Infrared
-		Port Type: Serial Port 16550A Compatible
-Handle 0x000B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: JP4
-		Internal Connector Type: 25 Pin Dual Inline (pin 26 cut)
-		External Reference Designator: Parallel
-		External Connector Type: DB-25 female
-		Port Type: Parallel Port ECP/EPP
-Handle 0x000C
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: JP3
-		Internal Connector Type: None
-		External Reference Designator: SVGA-Out
-		External Connector Type: DB-15 female
-		Port Type: Video Port
-Handle 0x000D
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: JP1/JP9
-		Internal Connector Type: None
-		External Reference Designator: USB
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x000E
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: JP12
-		Internal Connector Type: None
-		External Reference Designator: 1394
-		External Connector Type: IEEE 1394
-		Port Type: Firewire (IEEE P1394)
-Handle 0x000F
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: OZ6933-1
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Unknown
-		Length: Other
-		ID: Adapter 0, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			Cardbus is supported
-			Hot-plug devices are supported
-Handle 0x0010
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: OZ6933-2
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Unknown
-		Length: Other
-		ID: Adapter 0, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			Cardbus is supported
-			Hot-plug devices are supported
-Handle 0x0011
-	DMI type 10, 8 bytes.
-	On Board Device 1 Information
-		Type: Video
-		Status: Disabled
-		Description: nVIDIA SQ17
-	On Board Device 2 Information
-		Type: Sound
-		Status: Disabled
-		Description: Avance AC97
-Handle 0x0012
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1:                                                               
-Handle 0x0013
-	DMI type 12, 5 bytes.
-	System Configuration Options
-Handle 0x0014
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 512 MB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x0015
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0014
-		Error Information Handle: No Error
-		Total Width: 32 bits
-		Data Width: 32 bits
-		Size: 256 MB
-		Form Factor: SODIMM
-		Set: 1
-		Locator: JP26
-		Bank Locator: Bank 0/1
-		Type: SDRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0016
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0014
-		Error Information Handle: No Error
-		Total Width: 32 bits
-		Data Width: 32 bits
-		Size: 512 MB
-		Form Factor: SODIMM
-		Set: 1
-		Locator: JP27
-		Bank Locator: Bank 2/3
-		Type: SDRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0017
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0002FFFFFFF
-		Range Size: 768 MB
-		Physical Array Handle: 0x0014
-		Partition Width: 0
-Handle 0x0018
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x0015
-		Memory Array Mapped Address Handle: 0x0017
-		Partition Row Position: Unknown
-		Interleave Position: Unknown
-		Interleaved Data Depth: Unknown
-Handle 0x0019
-	DMI type 21, 7 bytes.
-	Built-in Pointing Device
-		Type: Track Point
-		Interface: PS/2
-		Buttons: 2
-Handle 0x001A
-	DMI type 22, 26 bytes.
-	Portable Battery
-		Location: 1st Battery
-		Manufacturer: PANASONIC 
-		Manufacture Date: 05/25/2001
-		Serial Number: 3658Q
-		Name: PA3098U
-		Chemistry: Lithium Ion
-		Design Capacity: 3900 mWh
-		Design Voltage: 14800 mV
-		SBDS Version: Not Specified
-		Maximum Error: 0%
-		OEM-specific Information: 0x00000000
-Handle 0x001B
-	DMI type 32, 20 bytes.
-	System Boot Information
-		Status: <OUT OF SPEC>
-Handle 0x001C
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Laptop.Compal-CL50 b/test/dmidecode.Laptop.Compal-CL50
deleted file mode 100644
index e33312c4..00000000
--- a/test/dmidecode.Laptop.Compal-CL50
+++ /dev/null
@@ -1,379 +0,0 @@
-# dmidecode 2.4 (Resolution can be 1400x1050 or 1024x768)
-SMBIOS 2.3 present.
-33 structures occupying 1500 bytes.
-Table at 0x000EB160.
-Handle 0x0000
-        DMI type 0, 20 bytes.
-        BIOS Information
-                Vendor: COMPAL
-                Version: V1.60
-                Release Date: 09/05/2002
-                Address: 0xEB000
-                Runtime Size: 84 kB
-                ROM Size: 512 kB
-                Characteristics:
-                        PCI is supported
-                        PC Card (PCMCIA) is supported
-                        PNP is supported
-                        BIOS is upgradeable
-                        BIOS shadowing is allowed
-                        Boot from CD is supported
-                        Selectable boot is supported
-                        Japanese floppy for Toshiba 1.2 MB is supported (int 13h)
-                        USB legacy is supported
-                        I2O boot is supported
-                        Function key-initiated network boot is supported
-Handle 0x0001
-        DMI type 1, 25 bytes.
-        System Information
-                Manufacturer: ................
-                Product Name: ................................
-                Version: ................................
-                Serial Number: ................................................................
-                UUID: FFFFFFFF-FFFF-FFFF-FFFF-00023FBADCBF
-                Wake-up Type: Unknown
-Handle 0x0002
-        DMI type 2, 17 bytes.
-        Base Board Information
-                Manufacturer: Compal
-                Product Name: CL50
-                Version: Null
-                Serial Number: 123456789AB
-                Asset Tag:
-                Features:
-                Board is a hosting board
-                Board requires at least one daughter board
-                Board is removable
-                Board is replaceable
-                Location In Chassis:
-                Chassis Handle: 0x0000
-                Type: Unknown
-                Contained Object Handlers: 0
-Handle 0x0003
-        DMI type 3, 24 bytes.
-        Chassis Information
-                Manufacturer: COMPAL
-                Type: Portable
-                Lock: Not Present
-                Version: N/A
-                Serial Number: None
-                Asset Tag: Not Assert Tag
-                Boot-up State: Safe
-                Power Supply State: Safe
-                Thermal State: Safe
-                Security Status: None
-                OEM Information: 0x00000000
-Heigth: Unspecified
-Number Of Power Cords: 1
-                Contained Elements: 0
-Handle 0x0004
-        DMI type 4, 35 bytes.
-        Processor Information
-                Socket Designation: mPGA478
-                Type: Central Processor
-                Family: Pentium
-                Manufacturer: 123456789ABC
-                ID: 00 00 00 00 00 00 00 00
-                Signature: Type 0, Family 0, Model 0, Stepping 0
-                Flags: None
-                Version: Banias
-                Voltage: 2.9 V
-                External Clock: 133 MHz
-                Max Speed: 1500 MHz
-                Current Speed: 1500 MHz
-                Status: Populated, Enabled
-                Upgrade: None
-                L1 Cache Handle: 0x0007
-                L2 Cache Handle: 0x0008
-                L3 Cache Handle: Not Provided
-                Serial Number: Processor Serial Number
-                Asset Tag: Asset_TAG
-                Part Number: Part Number
-Handle 0x0005
-        DMI type 6, 12 bytes.
-        Memory Module Information
-                Socket Designation: DRAM SLOT 0
-                Bank Connections: 0 1
-                Current Speed: 60 ns
-                Type: EDO DIMM
-                Installed Size: Not Installed (Single-bank Connection)
-                Enabled Size: Not Installed (Single-bank Connection)
-                Error Status: OK
-Handle 0x0006
-        DMI type 6, 12 bytes.
-        Memory Module Information
-                Socket Designation: DRAM SLOT 1
-                Bank Connections: 2 3
-                Current Speed: 60 ns
-                Type: EDO DIMM
-                Installed Size: 512 MB (Double-bank Connection)
-                Enabled Size: 512 MB (Double-bank Connection)
-                Error Status: OK
-Handle 0x0007
-        DMI type 7, 19 bytes.
-        Cache Information
-                Socket Designation: L1 Cache
-                Configuration: Enabled, Not Socketed, Level 1
-                Operational Mode: Write Back
-                Location: Internal
-                Installed Size: 32 KB
-                Maximum Size: 32 KB
-                Supported SRAM Types:
-                        Burst
-                        Pipeline Burst
-                Installed SRAM Type: Burst Pipeline Burst
-                Speed: Unknown
-                Error Correction Type: None
-                System Type: Unknown
-                Associativity: Unknown
-Handle 0x0008
-        DMI type 7, 19 bytes.
-        Cache Information
-                Socket Designation: L2 Cache
-                Configuration: Enabled, Not Socketed, Level 2
-                Operational Mode: Write Back
-                Location: Internal
-                Installed Size: 1024 KB
-                Maximum Size: 1024 KB
-                Supported SRAM Types:
-                        Burst
-                        Pipeline Burst
-                Installed SRAM Type: Burst Pipeline Burst
-                Speed: Unknown
-                Error Correction Type: None
-                System Type: Unknown
-                Associativity: Unknown
-Handle 0x0009
-        DMI type 8, 9 bytes.
-        Port Connector Information
-                Internal Reference Designator:
-                Internal Connector Type: None
-                External Reference Designator: Keyboard
-                External Connector Type: PS/2
-                Port Type: Keyboard Port
-Handle 0x000A
-        DMI type 8, 9 bytes.
-        Port Connector Information
-                Internal Reference Designator:
-                Internal Connector Type: None
-                External Reference Designator: Mouse
-                External Connector Type: PS/2
-                Port Type: Mouse Port
-Handle 0x000B
-        DMI type 8, 9 bytes.
-        Port Connector Information
-                Internal Reference Designator:
-                Internal Connector Type: None
-                External Reference Designator: Line Out
-                External Connector Type: Mini Jack (headphones)
-                Port Type: Audio Port
-Handle 0x000C
-        DMI type 8, 9 bytes.
-        Port Connector Information
-                Internal Reference Designator: VGA Conn.
-                Internal Connector Type: None
-                External Reference Designator: J7
-                External Connector Type: Other
-                Port Type: Serial Port 16550A Compatible
-Handle 0x000D
-        DMI type 8, 9 bytes.
-        Port Connector Information
-                Internal Reference Designator:
-                Internal Connector Type: None
-                External Reference Designator: USB 1
-                External Connector Type: Access Bus (USB)
-                Port Type: USB
-Handle 0x000E
-        DMI type 8, 9 bytes.
-        Port Connector Information
-                Internal Reference Designator:
-                Internal Connector Type: None
-                External Reference Designator: USB 2
-                External Connector Type: Access Bus (USB)
-                Port Type: USB
-Handle 0x000F
-        DMI type 8, 9 bytes.
-        Port Connector Information
-                Internal Reference Designator:
-                Internal Connector Type: None
-                External Reference Designator: USB 3
-                External Connector Type: Access Bus (USB)
-                Port Type: USB
-Handle 0x0010
-        DMI type 8, 9 bytes.
-        Port Connector Information
-                Internal Reference Designator: IDE1
-                Internal Connector Type: On Board IDE
-                External Reference Designator:
-                External Connector Type: None
-                Port Type: Other
-Handle 0x0011
-        DMI type 9, 13 bytes.
-        System Slot Information
-                Designation: PCI Slot
-                Type: 32-bit PCI
-                Current Usage: Available
-                Length: Long
-                ID: 4
-                Characteristics: Unknown
-Handle 0x0012
-        DMI type 10, 18 bytes.
-        On Board Device 1 Information
-                Type: Ethernet
-                Status: Enabled
-                Description: RTL8100L
-        On Board Device 2 Information
-                Type: Other
-                Status: Disabled
-                Description: 16550 UART
-        On Board Device 3 Information
-                Type: Other
-                Status: Disabled
-                Description: IrDA Port
-        On Board Device 4 Information
-                Type: Sound
-                Status: Enabled
-                Description: Audio Controller
-        On Board Device 5 Information
-                Type: Other
-                Status: Disabled
-                Description: CardBus Bridge
-        On Board Device 6 Information
-                Type: Other
-                Status: Enabled
-                Description: IDE Controller
-        On Board Device 7 Information
-                Type: Video
-                Status: Disabled
-                Description: VGA
-Handle 0x0013
-        DMI type 11, 5 bytes.
-        OEM Strings
-                String 1: Insyde Software SM-BIOS For Whitney
-Handle 0x0014
-        DMI type 13, 22 bytes.
-        BIOS Language Information
-                Installable Languages: 1
-                        en|US|iso8859-1
-                Currently Installed Language: en|US|iso8859-1
-Handle 0x0015
-        DMI type 16, 15 bytes.
-        Physical Memory Array
-                Location: System Board Or Motherboard
-                Use: System Memory
-                Error Correction Type: None
-                Maximum Capacity: 1 GB
-                Error Information Handle: Not Provided
-                Number Of Devices: 2
-Handle 0x0016
-        DMI type 16, 15 bytes.
-        Physical Memory Array
-                Location: System Board Or Motherboard
-                Use: Video Memory
-                Error Correction Type: None
-                Maximum Capacity: 2 MB
-                Error Information Handle: Not Provided
-                Number Of Devices: 1
-Handle 0x0017
-        DMI type 17, 27 bytes.
-        Memory Device
-                Array Handle: 0x0015
-                Error Information Handle: Not Provided
-                Total Width: 64 bits
-                Data Width: 64 bits
-                Size: No Module Installed
-                Form Factor: DIMM
-                Set: Unknown
-                Locator: DIMM0
-                Bank Locator: Banks 0/1
-                Type: DRAM
-                Type Detail: EDO
-                Speed: 1 MHz (1000.0 ns)
-                Manufacturer: NEC
-                Serial Number: 12345678
-                Asset Tag:
-                Part Number:
-Handle 0x0018
-        DMI type 17, 27 bytes.
-        Memory Device
-                Array Handle: 0x0015
-                Error Information Handle: Not Provided
-                Total Width: 64 bits
-                Data Width: 64 bits
-                Size: 512 MB
-                Form Factor: DIMM
-                Set: Unknown
-                Locator: DIMM1
-                Bank Locator: Banks 2/3
-                Type: DRAM
-                Type Detail: EDO
-                Speed: 1 MHz (1000.0 ns)
-                Manufacturer: NEC
-                Serial Number: 12345678
-                Asset Tag:
-                Part Number:
-Handle 0x0019
-        DMI type 17, 27 bytes.
-        Memory Device
-                Array Handle: 0x0016
-                Error Information Handle: Not Provided
-                Total Width: 8 bits
-                Data Width: 8 bits
-                Size: 512 kB
-                Form Factor: Unknown
-                Set: None
-                Locator: FROM
-                Bank Locator:
-                Type: Flash
-                Type Detail: Non-Volatile
-                Speed: Unknown
-                Manufacturer: SST
-                Serial Number: 12345678
-                Asset Tag:
-                Part Number:
-Handle 0x001A
-        DMI type 19, 15 bytes.
-        Memory Array Mapped Address
-                Starting Address: 0x00000000000
-                Ending Address: 0x0001FFFFFFF
-                Range Size: 512 MB
-                Physical Array Handle: 0x0015
-                Partition Width: 0
-Handle 0x001B
-        DMI type 19, 15 bytes.
-        Memory Array Mapped Address
-                Starting Address: 0x00000000000
-                Ending Address: 0x0000007FFFF
-                Range Size: 512 kB
-                Physical Array Handle: 0x0016
-                Partition Width: 0
-Handle 0x001C
-        DMI type 20, 19 bytes.
-        Memory Device Mapped Address
-                Starting Address: 0x00000000000
-                Ending Address: 0x000000003FF
-                Range Size: 1 kB
-                Physical Device Handle: 0x0017
-                Memory Array Mapped Address Handle: 0x001A
-                Partition Row Position: 1
-Handle 0x001D
-        DMI type 20, 19 bytes.
-        Memory Device Mapped Address
-                Starting Address: 0x00000000000
-                Ending Address: 0x0001FFFFFFF
-                Range Size: 512 MB
-                Physical Device Handle: 0x0018
-                Memory Array Mapped Address Handle: 0x001A
-                Partition Row Position: 1
-Handle 0x001E
-        DMI type 20, 19 bytes.
-        Memory Device Mapped Address
-                Starting Address: 0x00000000000
-                Ending Address: 0x0000007FFFF
-                Range Size: 512 kB
-                Physical Device Handle: 0x0019
-                Memory Array Mapped Address Handle: 0x001B
-                Partition Row Position: 1
-Handle 0x001F
-        DMI type 22, 26 bytes.
-        <TRUNCATED>
diff --git a/test/dmidecode.Laptop.Compal-CL56 b/test/dmidecode.Laptop.Compal-CL56
deleted file mode 100644
index 36a4af9d..00000000
--- a/test/dmidecode.Laptop.Compal-CL56
+++ /dev/null
@@ -1,381 +0,0 @@
-# dmidecode 2.5 (=> Resolution: 1400x1050)
-SMBIOS 2.3 present.
-33 structures occupying 1499 bytes.
-Table at 0x000EB160.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: COMPAL
-		Version: Version 1.20.00
-		Release Date: 06/16/2004
-		Address: 0xEB000
-		Runtime Size: 84 kB
-		ROM Size: 512 kB
-		Characteristics:
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			Boot from CD is supported
-			Selectable boot is supported
-			Japanese floppy for Toshiba 1.2 MB is supported (int 13h)
-			USB legacy is supported
-			I2O boot is supported
-			Function key-initiated network boot is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: <BAD INDEX>
-		Product Name: <BAD INDEX>
-		Version: <BAD INDEX>
-		Serial Number: <BAD INDEX>
-		UUID: 91126D1D-41DA-11D8-9599-00023F097581
-		Wake-up Type: Unknown
-Handle 0xFFFF
-	DMI type 0, 255 bytes.
-	BIOS Information
-		Vendor: <BAD INDEX>
-		Version: <BAD INDEX>
-		Release Date: <BAD INDEX>
-		Address: 0xFFFF0
-		Runtime Size: 16 bytes
-		ROM Size: 16384 kB
-		Characteristics:
-			BIOS characteristics not supported
-			ACPI is supported
-			USB legacy is supported
-			AGP is supported
-			I2O boot is supported
-			LS-120 boot is supported
-			ATAPI Zip drive boot is supported
-			IEEE 1394 boot is supported
-			Smart battery is supported
-			BIOS boot specification is supported
-			Function key-initiated network boot is supported
-Handle 0x0004
-	DMI type 4, 35 bytes.
-	Processor Information
-		Socket Designation: mPGA478
-		Type: Central Processor
-		Family: Pentium
-		Manufacturer: 123456789ABC
-		ID: 00 00 00 00 00 00 00 00
-		Signature: Type 0, Family 0, Model 0, Stepping 0
-		Flags: None
-		Version: Banias
-		Voltage: 2.9 V
-		External Clock: 133 MHz
-		Max Speed: 1700 MHz
-		Current Speed: 1700 MHz
-		Status: Populated, Enabled
-		Upgrade: None
-		L1 Cache Handle: 0x0007
-		L2 Cache Handle: 0x0008
-		L3 Cache Handle: Not Provided
-		Serial Number: Processor Serial Number
-		Asset Tag: Asset_TAG
-		Part Number: Part Number
-Handle 0x0005
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DRAM SLOT 0
-		Bank Connections: 0 1
-		Current Speed: 60 ns
-		Type: EDO DIMM
-		Installed Size: 512 MB (Double-bank Connection)
-		Enabled Size: 512 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0006
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DRAM SLOT 1
-		Bank Connections: 2 3
-		Current Speed: 60 ns
-		Type: EDO DIMM
-		Installed Size: Not Installed (Single-bank Connection)
-		Enabled Size: Not Installed (Single-bank Connection)
-		Error Status: OK
-Handle 0x0007
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L1 Cache
-		Configuration: Enabled, Not Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 32 KB
-		Maximum Size: 32 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-		Installed SRAM Type: Burst Pipeline Burst
-		Speed: Unknown
-		Error Correction Type: None
-		System Type: Unknown
-		Associativity: Unknown
-Handle 0x0008
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L2 Cache
-		Configuration: Enabled, Not Socketed, Level 2
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 2048 KB
-		Maximum Size: 2048 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-		Installed SRAM Type: Burst Pipeline Burst
-		Speed: Unknown
-		Error Correction Type: None
-		System Type: Unknown
-		Associativity: Unknown
-Handle 0x0009
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator:  
-		Internal Connector Type: None
-		External Reference Designator: Keyboard
-		External Connector Type: PS/2
-		Port Type: Keyboard Port
-Handle 0x000A
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator:  
-		Internal Connector Type: None
-		External Reference Designator: Mouse
-		External Connector Type: PS/2
-		Port Type: Mouse Port
-Handle 0x000B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator:            
-		Internal Connector Type: None
-		External Reference Designator: Line Out
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x000C
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: VGA Conn.
-		Internal Connector Type: None
-		External Reference Designator: J7
-		External Connector Type: Other
-		Port Type: Serial Port 16550A Compatible
-Handle 0x000D
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator:  
-		Internal Connector Type: None
-		External Reference Designator: USB 1
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x000E
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator:  
-		Internal Connector Type: None
-		External Reference Designator: USB 2
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x000F
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator:  
-		Internal Connector Type: None
-		External Reference Designator: USB 3
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0010
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: IDE1
-		Internal Connector Type: On Board IDE
-		External Reference Designator:    
-		External Connector Type: None
-		Port Type: Other
-Handle 0x0011
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI Slot
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Long
-		ID: 4
-		Characteristics: Unknown
-Handle 0x0012
-	DMI type 10, 18 bytes.
-	On Board Device 1 Information
-		Type: Ethernet
-		Status: Enabled
-		Description: RTL8100L
-	On Board Device 2 Information
-		Type: Other
-		Status: Enabled
-		Description: 16550 UART
-	On Board Device 3 Information
-		Type: Other
-		Status: Disabled
-		Description: IrDA Port
-	On Board Device 4 Information
-		Type: Sound
-		Status: Enabled
-		Description: Audio Controller
-	On Board Device 5 Information
-		Type: Other
-		Status: Disabled
-		Description: CardBus Bridge
-	On Board Device 6 Information
-		Type: Other
-		Status: Enabled
-		Description: IDE Controller
-	On Board Device 7 Information
-		Type: Video
-		Status: Disabled
-		Description: VGA
-Handle 0x0013
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: Insyde Software SM-BIOS For Whitney
-Handle 0x0014
-	DMI type 13, 22 bytes.
-	BIOS Language Information
-		Installable Languages: 1
-			en|US|iso8859-1
-		Currently Installed Language: en|US|iso8859-1
-Handle 0x0015
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 1 GB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x0016
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: Video Memory
-		Error Correction Type: None
-		Maximum Capacity: 2 MB
-		Error Information Handle: Not Provided
-		Number Of Devices: 1
-Handle 0x0017
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0015
-		Error Information Handle: Not Provided
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 512 MB
-		Form Factor: DIMM
-		Set: Unknown
-		Locator: DIMM0
-		Bank Locator: Banks 0/1
-		Type: DRAM
-		Type Detail: EDO
-		Speed: 1 MHz (1000.0 ns)
-		Manufacturer: NEC
-		Serial Number: 12345678
-		Asset Tag:         
-		Part Number:         
-Handle 0x0018
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0015
-		Error Information Handle: Not Provided
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: No Module Installed
-		Form Factor: DIMM
-		Set: Unknown
-		Locator: DIMM1
-		Bank Locator: Banks 2/3
-		Type: DRAM
-		Type Detail: EDO
-		Speed: 1 MHz (1000.0 ns)
-		Manufacturer: NEC
-		Serial Number: 12345678
-		Asset Tag:         
-		Part Number:         
-Handle 0x0019
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0016
-		Error Information Handle: Not Provided
-		Total Width: 8 bits
-		Data Width: 8 bits
-		Size: No Module Installed
-		Form Factor: Unknown
-		Set: None
-		Locator: FROM
-		Bank Locator:     
-		Type: Flash
-		Type Detail: Non-Volatile
-		Speed: Unknown
-		Manufacturer: SST
-		Serial Number: 12345678
-		Asset Tag:         
-		Part Number:         
-Handle 0x001A
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Array Handle: 0x0015
-		Partition Width: 0
-Handle 0x001B
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000007FFFF
-		Range Size: 512 kB
-		Physical Array Handle: 0x0016
-		Partition Width: 0
-Handle 0x001C
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Device Handle: 0x0017
-		Memory Array Mapped Address Handle: 0x001A
-		Partition Row Position: 1
-Handle 0x001D
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x000000003FF
-		Range Size: 1 kB
-		Physical Device Handle: 0x0018
-		Memory Array Mapped Address Handle: 0x001A
-		Partition Row Position: 1
-Handle 0x001E
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000007FFFF
-		Range Size: 512 kB
-		Physical Device Handle: 0x0019
-		Memory Array Mapped Address Handle: 0x001B
-		Partition Row Position: 1
-Handle 0x001F
-	DMI type 22, 26 bytes.
-	Portable Battery
-		Location: Battery Information
-		Manufacturer:         
-		Manufacture Date:         
-		Serial Number:     
-		Name:       
-		Design Capacity: 0 mWh
-		Design Voltage: 64764 mV
-		SBDS Version:         
-		Maximum Error: 6%
-		SBDS Chemistry: Not Specified
-		OEM-specific Information: 0x00000000
-Handle 0x0020
-	DMI type 127, 4 bytes.
-	End Of Table
-Wrong DMI structures count: 33 announced, only 32 decoded.
diff --git a/test/dmidecode.Laptop.Dell-Inspiron-4150 b/test/dmidecode.Laptop.Dell-Inspiron-4150
deleted file mode 100644
index 03050b40..00000000
--- a/test/dmidecode.Laptop.Dell-Inspiron-4150
+++ /dev/null
@@ -1,566 +0,0 @@
-# dmidecode 2.2 (=> Module: i8k) (=> Pkg: i8kutils)
-SMBIOS 2.3 present.
-61 structures occupying 2353 bytes.
-Table at 0x000F76A0.
-Handle 0xDA00
-	DMI type 218, 203 bytes.
-	OEM-specific Type
-		Header And Data:
-			DA CB 00 DA B2 00 0D 1F 0F 17 40 6F 00 00 00 01
-			00 70 00 00 00 00 00 71 00 02 00 01 00 72 00 02
-			00 00 00 7B 00 04 00 00 00 7C 00 06 00 00 00 79
-			00 08 00 00 00 7D 00 0A 00 00 00 7E 00 0C 00 00
-			00 78 00 0E 00 01 00 77 00 0E 00 00 00 73 00 10
-			00 01 00 74 00 10 00 00 00 7A 00 11 00 00 00 7F
-			00 12 00 00 00 40 00 13 00 01 00 41 00 13 00 00
-			00 1E 00 14 00 00 00 1F 00 14 00 01 00 20 00 14
-			00 02 00 21 00 14 00 03 00 75 00 15 00 01 00 76
-			00 15 00 00 00 00 80 00 80 00 00 00 A0 00 A0 01
-			00 05 80 05 80 01 00 01 F0 01 F0 00 00 02 F0 02
-			F0 00 00 03 F0 03 F0 00 00 04 F0 04 F0 00 00 05
-			F0 05 F0 00 00 FF FF 00 00 00 00
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: Dell Computer Corporation
-		Version: A06
-		Release Date: 05/15/2003
-		Address: 0xF0000
-		Runtime Size: 64 kB
-		ROM Size: 512 kB
-		Characteristics:
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			Boot from CD is supported
-			Selectable boot is supported
-			Boot from PC Card (PCMCIA) is supported
-			3.5'/720 KB floppy services are supported (int 13h)
-			Print screen service is supported (int 5h)
-			8042 keyboard services are supported (int 9h)
-			Serial services are supported (int 14h)
-			Printer services are supported (int 17h)
-			CGA/mono video services are supported (int 10h)
-			ACPI is supported
-			USB legacy is supported
-			AGP is supported
-			LS-120 boot is supported
-			ATAPI Zip drive boot is supported
-			Smart battery is supported
-			BIOS boot specification is supported
-Handle 0x0100
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: Dell Computer Corporation
-		Product Name: Inspiron 4150                   
-		Version: Not Specified
-		Serial Number: 5R0GP11
-		UUID: 44454C4C-5200-1030-8047-B5C04F503131
-		Wake-up Type: Power Switch
-Handle 0x0200
-	DMI type 2, 9 bytes.
-	Base Board Information
-		Manufacturer: Dell Computer Corporation
-		Product Name:       
-		Version:    
-		Serial Number: .5R0GP11.              .
-Handle 0x0300
-	DMI type 3, 13 bytes.
-	Chassis Information
-		Manufacturer: Dell Computer Corporation
-		Type: Portable
-		Lock: Not Present
-		Version: Not Specified
-		Serial Number: 5R0GP11
-		Asset Tag: Not Specified
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-Handle 0x0301
-	DMI type 126, 13 bytes.
-	Inactive
-Handle 0x0400
-	DMI type 4, 32 bytes.
-	Processor Information
-		Socket Designation: Microprocessor
-		Type: Central Processor
-		Family: Pentium 4
-		Manufacturer: Intel
-		ID: 24 0F 00 00 FF F9 EB 3F
-		Signature: Type 0, Family F, Model 2, Stepping 4
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			CLFSH (CLFLUSH instruction supported)
-			DS (Debug store)
-			ACPI (ACPI supported)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-			SSE2 (Streaming SIMD extensions 2)
-			SS (Self-snoop)
-			HTT (Hyper-threading technology)
-			TM (Thermal monitor supported)
-		Version: Not Specified
-		Voltage: 3.3 V
-		External Clock: 133 MHz
-		Max Speed: 2400 MHz
-		Current Speed: 1900 MHz
-		Status: Populated, Enabled
-		Upgrade: None
-		L1 Cache Handle: 0x0700
-		L2 Cache Handle: 0x0701
-		L3 Cache Handle: Not Provided
-Handle 0x0700
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: Not Specified
-		Configuration: Enabled, Not Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 8 KB
-		Maximum Size: 8 KB
-		Supported SRAM Types:
-			Unknown
-		Installed SRAM Type: Unknown
-		Speed: Unknown
-		Error Correction Type: None
-		System Type: Data
-		Associativity: 4-way Set-associative
-Handle 0x0701
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: Not Specified
-		Configuration: Enabled, Not Socketed, Level 2
-		Operational Mode: Varies With Memory Address
-		Location: Internal
-		Installed Size: 512 KB
-		Maximum Size: 512 KB
-		Supported SRAM Types:
-			Pipeline Burst
-		Installed SRAM Type: Pipeline Burst
-		Speed: 15 ns
-		Error Correction Type: None
-		System Type: Unified
-		Associativity: Other
-Handle 0x0800
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: PARALLEL
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: DB-25 female
-		Port Type: Parallel Port PS/2
-Handle 0x0801
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: SERIAL1
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: DB-9 male
-		Port Type: Serial Port 16550A Compatible
-Handle 0x0802
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: PS/2
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: Mini DIN
-		Port Type: Mouse Port
-Handle 0x0803
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0804
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: USB
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0805
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0806
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: MONITOR
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: DB-15 female
-		Port Type: Video Port
-Handle 0x0807
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0808
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0809
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: IrDA
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: Infrared
-		Port Type: Other
-Handle 0x080A
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: S-Video
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: Mini DIN
-		Port Type: Video Port
-Handle 0x080C
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Modem
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: RJ-11
-		Port Type: Modem Port
-Handle 0x080D
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Ethernet
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: RJ-45
-		Port Type: Network Port
-Handle 0x0900
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCMCIA 0
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Available
-		Length: Other
-		ID: Adapter 0, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Zoom Video is supported
-			Modem ring resume is supported
-Handle 0x0901
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCMCIA 1
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Available
-		Length: Other
-		ID: Adapter 10, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Modem ring resume is supported
-Handle 0x0902
-	DMI type 126, 13 bytes.
-	Inactive
-Handle 0x0903
-	DMI type 126, 13 bytes.
-	Inactive
-Handle 0x0904
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: MiniPCI
-		Type: 32-bit Other
-		Current Usage: Available
-		Length: Other
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x0A00
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Video
-		Status: Enabled
-		Description: ATI Mobility M7
-Handle 0x0A01
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Sound
-		Status: Enabled
-		Description: Crystal 4205
-Handle 0x0A02
-	DMI type 126, 6 bytes.
-	Inactive
-Handle 0x0A03
-	DMI type 126, 6 bytes.
-	Inactive
-Handle 0x0B00
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: Dell System
-		String 2: 5[0025]
-Handle 0x0D00
-	DMI type 13, 22 bytes.
-	BIOS Language Information
-		Installable Languages: 1
-			en|US|iso8859-1
-		Currently Installed Language: en|US|iso8859-1
-Handle 0x1000
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 1 GB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x1100
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x1000
-		Error Information Handle: Not Provided
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 512 MB
-		Form Factor: DIMM
-		Set: None
-		Locator: DIMM_A
-		Bank Locator: Not Specified
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: 266 MHz (3.8 ns)
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number:                 
-Handle 0x1101
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x1000
-		Error Information Handle: Not Provided
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 512 MB
-		Form Factor: DIMM
-		Set: None
-		Locator: DIMM_B
-		Bank Locator: Not Specified
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: 266 MHz (3.8 ns)
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number:                 
-Handle 0x1300
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000009FFFF
-		Range Size: 640 kB
-		Physical Array Handle: 0x1000
-		Partition Width: 0
-Handle 0x1301
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000100000
-		Ending Address: 0x0003FFFFFFF
-		Range Size: 1023 MB
-		Physical Array Handle: 0x1000
-		Partition Width: 0
-Handle 0x1400
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000009FFFF
-		Range Size: 640 kB
-		Physical Device Handle: 0x1100
-		Memory Array Mapped Address Handle: 0x1300
-		Partition Row Position: 1
-Handle 0x1401
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000100000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 511 MB
-		Physical Device Handle: 0x1100
-		Memory Array Mapped Address Handle: 0x1301
-		Partition Row Position: 1
-Handle 0x1402
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00020000000
-		Ending Address: 0x0003FFFFFFF
-		Range Size: 512 MB
-		Physical Device Handle: 0x1101
-		Memory Array Mapped Address Handle: 0x1301
-		Partition Row Position: 1
-Handle 0x1500
-	DMI type 21, 7 bytes.
-	Built-in Pointing Device
-		Type: Touch Pad
-		Interface: Bus Mouse
-		Buttons: 2
-Handle 0x1600
-	DMI type 22, 26 bytes.
-	Portable Battery
-		Location: Left Module Bay 
-		Manufacturer: SANYO           
-		Name: 0004M778        
-		Design Capacity: 66000 mWh
-		Design Voltage: 14800 mV
-		SBDS Version: 1.0
-		Maximum Error: 4%
-		SBDS Serial Number: 03C0
-		SBDS Manufacture Date: 2002-07-22
-		SBDS Chemistry: LION            
-		OEM-specific Information: 0x00000001
-Handle 0x1601
-	DMI type 22, 26 bytes.
-	Portable Battery
-		Location: Right Module Bay
-		Manufacturer: Sony Corp.      
-		Name: LIP8120DLP      
-		Design Capacity: 65120 mWh
-		Design Voltage: 14800 mV
-		SBDS Version: 1.0
-		Maximum Error: 4%
-		SBDS Serial Number: 1402
-		SBDS Manufacture Date: 2002-06-24
-		SBDS Chemistry: LION            
-		OEM-specific Information: 0x00000001
-Handle 0x1B00
-	DMI type 27, 12 bytes.
-	Cooling Device
-		Type: Fan
-		Status: OK
-		OEM-specific Information: 0x0000DD00
-Handle 0x1C00
-	DMI type 28, 20 bytes.
-	Temperature Probe
-		Description: CPU Internal Temperature
-		Location: Processor
-		Status: OK
-		Maximum Value: 127.0 deg C
-		Minimum Value 0.0 deg C
-		Resolution: 1.000 deg C
-		Tolerance: 0.5 deg C
-		Accuracy: Unknown
-		OEM-specific Information: 0x0000DC00
-Handle 0x2000
-	DMI type 32, 11 bytes.
-	System Boot Information
-		Status: No errors detected
-Handle 0xD000
-	DMI type 208, 10 bytes.
-	OEM-specific Type
-		Header And Data:
-			D0 0A 00 D0 01 04 FE 00 2B 01
-Handle 0xD100
-	DMI type 209, 12 bytes.
-	OEM-specific Type
-		Header And Data:
-			D1 0C 00 D1 00 00 00 03 04 07 80 05
-Handle 0xD200
-	DMI type 210, 12 bytes.
-	OEM-specific Type
-		Header And Data:
-			D2 0C 00 D2 F8 03 04 03 06 80 04 05
-Handle 0xD300
-	DMI type 211, 13 bytes.
-	OEM-specific Type
-		Header And Data:
-			D3 0D 00 D3 01 04 02 01 00 00 00 00 02
-		Strings:
-			Back of System
-			        
-			        
-Handle 0xD800
-	DMI type 216, 9 bytes.
-	OEM-specific Type
-		Header And Data:
-			D8 09 00 D8 01 03 01 F0 03
-		Strings:
-			ATI Technologies Inc.
-			 
-			.0 VR006.006.006.00
-			 
-Handle 0xD900
-	DMI type 217, 8 bytes.
-	OEM-specific Type
-		Header And Data:
-			D9 08 00 D9 01 02 01 03
-		Strings:
-			US-101
-			Proprietary
-Handle 0xDB00
-	DMI type 219, 8 bytes.
-	OEM-specific Type
-		Header And Data:
-			DB 08 00 DB 03 01 02 03
-		Strings:
-			System Device Bay
-			Floppy, Battery, CD-ROM, CD-RW, Hard Disk, LS-120, DVD, ZIP
-			Battery   
-Handle 0xDB01
-	DMI type 126, 8 bytes.
-	Inactive
-Handle 0xDC00
-	DMI type 220, 22 bytes.
-	OEM-specific Type
-		Header And Data:
-			DC 16 00 DC 01 F0 00 00 02 F0 00 00 00 00 03 F0
-			04 F0 00 00 00 00
-Handle 0xDD00
-	DMI type 221, 19 bytes.
-	OEM-specific Type
-		Header And Data:
-			DD 13 00 DD 00 00 00 00 00 05 F0 00 00 00 00 00
-			00 00 00
-Handle 0xD400
-	DMI type 212, 207 bytes.
-	OEM-specific Type
-		Header And Data:
-			D4 CF 00 D4 70 00 71 00 00 10 2D 2E 5C 00 78 BF
-			40 5D 00 78 BF 00 5E 00 23 FE 01 5F 00 23 FE 00
-			60 00 1D EF 10 61 00 1D EF 00 62 00 25 E7 00 63
-			00 25 E7 08 64 00 25 E7 10 65 00 21 F7 00 66 00
-			21 F7 08 67 00 25 DF 20 68 00 25 DF 00 1D 00 21
-			FE 00 1C 00 21 FE 01 0F 00 26 F8 00 11 00 26 F8
-			01 05 00 26 F8 02 12 00 26 F8 03 06 00 26 F8 04
-			31 00 26 8F 00 32 00 26 8F 10 33 00 26 8F 20 34
-			00 26 8F 30 35 00 26 8F 40 07 00 25 F8 00 0B 00
-			25 F8 01 0C 00 25 F8 02 0D 00 25 F8 04 28 00 23
-			F3 00 29 00 23 F3 04 2A 00 23 F3 08 2B 00 58 00
-			00 2C 00 59 00 00 88 00 23 FD 02 89 00 23 FD 00
-			08 00 1D DF 00 03 00 1D DF 00 FF FF 00 00 00
-Handle 0xD401
-	DMI type 212, 37 bytes.
-	OEM-specific Type
-		Header And Data:
-			D4 25 01 D4 70 00 71 00 03 40 49 4A 42 00 48 7F
-			80 43 00 48 7F 00 55 00 47 BF 00 6D 00 47 BF 40
-			FF FF 00 00 00
-Handle 0xDE00
-	DMI type 222, 13 bytes.
-	OEM-specific Type
-		Header And Data:
-			DE 0D 00 DE 01 02 FF FF 00 00 00 00 00
-Handle 0x7F00
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Laptop.Dell-Latitude-C810 b/test/dmidecode.Laptop.Dell-Latitude-C810
deleted file mode 100644
index 83bfc8d8..00000000
--- a/test/dmidecode.Laptop.Dell-Latitude-C810
+++ /dev/null
@@ -1,536 +0,0 @@
-# dmidecode 2.4 (=> Module: i8k) (=> Pkg: i8kutils)
-SMBIOS 2.3 present.
-60 structures occupying 2308 bytes.
-Table at 0x000F77E0.
-Handle 0xDA00
-	DMI type 218, 197 bytes.
-	OEM-specific Type
-		Header and Data:
-			DA C5 00 DA B2 00 0D 1F 0F 17 40 6F 00 00 00 01
-			00 70 00 00 00 00 00 71 00 02 00 01 00 72 00 02
-			00 00 00 7B 00 04 00 00 00 7C 00 06 00 00 00 79
-			00 08 00 00 00 7D 00 0A 00 00 00 7E 00 0C 00 00
-			00 78 00 0E 00 01 00 77 00 0E 00 00 00 73 00 10
-			00 01 00 74 00 10 00 00 00 7A 00 11 00 00 00 7F
-			00 12 00 00 00 40 00 13 00 01 00 41 00 13 00 00
-			00 1E 00 14 00 00 00 1F 00 14 00 01 00 20 00 14
-			00 02 00 21 00 14 00 03 00 75 00 15 00 01 00 76
-			00 15 00 00 00 00 80 00 80 00 00 00 A0 00 A0 01
-			00 05 80 05 80 01 00 01 F0 01 F0 00 00 02 F0 02
-			F0 00 00 03 F0 03 F0 00 00 04 F0 04 F0 00 00 FF
-			FF 00 00 00 00
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: Dell Computer Corporation
-		Version: A11
-		Release Date: 10/28/2002
-		Address: 0xF0000
-		Runtime Size: 64 kB
-		ROM Size: 512 kB
-		Characteristics:
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			Boot from CD is supported
-			Selectable boot is supported
-			Boot from PC Card (PCMCIA) is supported
-			3.5"/720 KB floppy services are supported (int 13h)
-			Print screen service is supported (int 5h)
-			8042 keyboard services are supported (int 9h)
-			Serial services are supported (int 14h)
-			Printer services are supported (int 17h)
-			CGA/mono video services are supported (int 10h)
-			ACPI is supported
-			USB legacy is supported
-			AGP is supported
-			LS-120 boot is supported
-			ATAPI Zip drive boot is supported
-			Smart battery is supported
-			BIOS boot specification is supported
-Handle 0x0100
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: Dell Computer Corporation
-		Product Name: Latitude C810                   
-		Version: Not Specified
-		Serial Number: C8D980J
-		UUID: 44454C4C-3800-1044-8039-C3C04F38304A
-		Wake-up Type: Power Switch
-Handle 0x0200
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: Dell Computer Corporation
-		Product Name: Latitude C810            
-		Version: Not Specified
-		Serial Number: Not Specified
-Handle 0x0300
-	DMI type 3, 13 bytes.
-	Chassis Information
-		Manufacturer: Dell Computer Corporation
-		Type: Portable
-		Lock: Not Present
-		Version: Not Specified
-		Serial Number: C8D980J
-		Asset Tag: Not Specified
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-Handle 0x0301
-	DMI type 126, 13 bytes.
-	Inactive
-Handle 0x0400
-	DMI type 4, 32 bytes.
-	Processor Information
-		Socket Designation: Microprocessor
-		Type: Central Processor
-		Family: Pentium II
-		Manufacturer: Intel
-		ID: B1 06 00 00 FF F9 83 03
-		Signature: Type 0, Family 6, Model 11, Stepping 1
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-		Version: Not Specified
-		Voltage: 3.3 V
-		External Clock: 133 MHz
-		Max Speed: 1200 MHz
-		Current Speed: 1133 MHz
-		Status: Populated, Enabled
-		Upgrade: None
-		L1 Cache Handle: 0x0700
-		L2 Cache Handle: 0x0701
-		L3 Cache Handle: Not Provided
-Handle 0x0700
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: Not Specified
-		Configuration: Enabled, Not Socketed, Level 1
-		Operational Mode: Varies With Memory Address
-		Location: Internal
-		Installed Size: 32 KB
-		Maximum Size: 32 KB
-		Supported SRAM Types:
-			Unknown
-		Installed SRAM Type: Unknown
-		Speed: Unknown
-		Error Correction Type: None
-		System Type: Unified
-		Associativity: 4-way Set-associative
-Handle 0x0701
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: Not Specified
-		Configuration: Enabled, Not Socketed, Level 2
-		Operational Mode: Varies With Memory Address
-		Location: Internal
-		Installed Size: 512 KB
-		Maximum Size: 512 KB
-		Supported SRAM Types:
-			Pipeline Burst
-		Installed SRAM Type: Pipeline Burst
-		Speed: 15 ns
-		Error Correction Type: None
-		System Type: Unified
-		Associativity: 4-way Set-associative
-Handle 0x0800
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: PARALLEL
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: DB-25 female
-		Port Type: Parallel Port PS/2
-Handle 0x0801
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: SERIAL1
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: DB-9 male
-		Port Type: Serial Port 16550A Compatible
-Handle 0x0802
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: PS/2
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: Mini DIN
-		Port Type: Mouse Port
-Handle 0x0803
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0804
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: USB
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0805
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0806
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: MONITOR
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: DB-15 female
-		Port Type: Video Port
-Handle 0x0807
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0808
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0809
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: IrDA
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: Infrared
-		Port Type: Other
-Handle 0x080A
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: S-Video
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: Mini DIN
-		Port Type: Video Port
-Handle 0x080B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: FireWire
-		Internal Connector Type: None
-		External Reference Designator: Not Specified
-		External Connector Type: IEEE 1394
-		Port Type: Firewire (IEEE P1394)
-Handle 0x0900
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCMCIA 0
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Available
-		Length: Other
-		ID: Adapter 0, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Zoom Video is supported
-			Modem ring resume is supported
-Handle 0x0901
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCMCIA 1
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Available
-		Length: Other
-		ID: Adapter 10, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Zoom Video is supported
-			Modem ring resume is supported
-Handle 0x0902
-	DMI type 126, 13 bytes.
-	Inactive
-Handle 0x0903
-	DMI type 126, 13 bytes.
-	Inactive
-Handle 0x0904
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: MiniPCI
-		Type: 32-bit Other
-		Current Usage: Available
-		Length: Other
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x0A00
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Video
-		Status: Enabled
-		Description: NVIDIA GeForce2 MX
-Handle 0x0A01
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Sound
-		Status: Enabled
-		Description: ESS Maestro 3i
-Handle 0x0A02
-	DMI type 126, 6 bytes.
-	Inactive
-Handle 0x0A03
-	DMI type 126, 6 bytes.
-	Inactive
-Handle 0x0B00
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: Dell System
-		String 2: 5[0019]
-Handle 0x0D00
-	DMI type 13, 22 bytes.
-	BIOS Language Information
-		Installable Languages: 1
-			en|US|iso8859-1
-		Currently Installed Language: en|US|iso8859-1
-Handle 0x1000
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 512 MB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x1100
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x1000
-		Error Information Handle: Not Provided
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 512 MB
-		Form Factor: DIMM
-		Set: None
-		Locator: DIMM_A
-		Bank Locator: Not Specified
-		Type: DRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number:                 
-Handle 0x1101
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x1000
-		Error Information Handle: Not Provided
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: No Module Installed
-		Form Factor: DIMM
-		Set: None
-		Locator: DIMM_B
-		Bank Locator: Not Specified
-		Type: DRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number:                 
-Handle 0x1300
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000009FFFF
-		Range Size: 640 kB
-		Physical Array Handle: 0x1000
-		Partition Width: 0
-Handle 0x1301
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000100000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 511 MB
-		Physical Array Handle: 0x1000
-		Partition Width: 0
-Handle 0x1400
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000009FFFF
-		Range Size: 640 kB
-		Physical Device Handle: 0x1100
-		Memory Array Mapped Address Handle: 0x1300
-		Partition Row Position: 1
-Handle 0x1401
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000100000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 511 MB
-		Physical Device Handle: 0x1100
-		Memory Array Mapped Address Handle: 0x1301
-		Partition Row Position: 1
-Handle 0x1402
-	DMI type 126, 19 bytes.
-	Inactive
-Handle 0x1500
-	DMI type 21, 7 bytes.
-	Built-in Pointing Device
-		Type: Touch Pad
-		Interface: Bus Mouse
-		Buttons: 2
-Handle 0x1600
-	DMI type 126, 26 bytes.
-	Inactive
-Handle 0x1601
-	DMI type 22, 26 bytes.
-	Portable Battery
-		Location: Right Module Bay
-		Manufacturer: Sony Corp.      
-		Name: LIP8084DLP      
-		Design Capacity: 57420 mWh
-		Design Voltage: 14800 mV
-		SBDS Version: 1.0
-		Maximum Error: 4%
-		SBDS Serial Number: C3D1
-		SBDS Manufacture Date: 2002-09-20
-		SBDS Chemistry: LION            
-		OEM-specific Information: 0x00000001
-Handle 0x1B00
-	DMI type 27, 12 bytes.
-	Cooling Device
-		Type: Fan
-		Status: OK
-		OEM-specific Information: 0x0000DD00
-Handle 0x1C00
-	DMI type 28, 20 bytes.
-	Temperature Probe
-		Description: CPU Internal Temperature
-		Location: Processor
-		Status: OK
-		Maximum Value: 127.0 deg C
-		Minimum Value 0.0 deg C
-		Resolution: 1.000 deg C
-		Tolerance: 0.5 deg C
-		Accuracy: Unknown
-		OEM-specific Information: 0x0000DC00
-Handle 0x2000
-	DMI type 32, 11 bytes.
-	System Boot Information
-		Status: No errors detected
-Handle 0xD000
-	DMI type 208, 10 bytes.
-	OEM-specific Type
-		Header and Data:
-			D0 0A 00 D0 01 04 E5 00 00 00
-Handle 0xD100
-	DMI type 209, 12 bytes.
-	OEM-specific Type
-		Header and Data:
-			D1 0C 00 D1 00 00 00 03 04 07 80 05
-Handle 0xD200
-	DMI type 210, 12 bytes.
-	OEM-specific Type
-		Header and Data:
-			D2 0C 00 D2 F8 03 04 03 06 80 04 05
-Handle 0xD300
-	DMI type 211, 13 bytes.
-	OEM-specific Type
-		Header and Data:
-			D3 0D 00 D3 01 04 02 01 00 00 00 00 02
-		Strings:
-			Back of System
-			        
-			        
-Handle 0xD800
-	DMI type 216, 9 bytes.
-	OEM-specific Type
-		Header and Data:
-			D8 09 00 D8 01 03 01 F0 03
-		Strings:
-			NVidia Corp.
-			          
-			3.11.01.44.B4 ..
-			Copyri
-			 
-Handle 0xD900
-	DMI type 217, 8 bytes.
-	OEM-specific Type
-		Header and Data:
-			D9 08 00 D9 01 02 01 03
-		Strings:
-			US-101
-			Proprietary
-Handle 0xDB00
-	DMI type 219, 8 bytes.
-	OEM-specific Type
-		Header and Data:
-			DB 08 00 DB 03 01 02 03
-		Strings:
-			System Device Bay
-			Floppy, Battery, CD-ROM, CD-RW, Hard Disk, LS-120, DVD, ZIP
-			EMPTY     
-Handle 0xDB01
-	DMI type 126, 8 bytes.
-	Inactive
-Handle 0xDC00
-	DMI type 220, 22 bytes.
-	OEM-specific Type
-		Header and Data:
-			DC 16 00 DC 01 F0 00 00 02 F0 00 00 00 00 03 F0
-			04 F0 00 00 00 00
-Handle 0xDD00
-	DMI type 221, 19 bytes.
-	OEM-specific Type
-		Header and Data:
-			DD 13 00 DD 00 00 00 00 00 00 00 00 00 00 00 00
-			00 00 00
-Handle 0xD400
-	DMI type 212, 197 bytes.
-	OEM-specific Type
-		Header and Data:
-			D4 C5 00 D4 70 00 71 00 00 10 2D 2E 5C 00 78 BF
-			40 5D 00 78 BF 00 5E 00 23 FE 01 5F 00 23 FE 00
-			60 00 1D EF 10 61 00 1D EF 00 62 00 25 E7 00 63
-			00 25 E7 08 64 00 25 E7 10 65 00 21 F7 00 66 00
-			21 F7 08 67 00 25 DF 20 68 00 25 DF 00 1D 00 21
-			FE 00 1C 00 21 FE 01 0F 00 26 F8 00 11 00 26 F8
-			01 05 00 26 F8 02 12 00 26 F8 03 06 00 26 F8 04
-			31 00 26 8F 00 32 00 26 8F 10 33 00 26 8F 20 34
-			00 26 8F 30 35 00 26 8F 40 07 00 25 F8 00 0B 00
-			25 F8 01 0C 00 25 F8 02 0D 00 25 F8 04 28 00 23
-			F3 00 29 00 23 F3 04 2A 00 23 F3 08 2B 00 58 00
-			00 2C 00 59 00 00 08 00 1D DF 00 03 00 1D DF 00
-			FF FF 00 00 00
-Handle 0xD401
-	DMI type 212, 37 bytes.
-	OEM-specific Type
-		Header and Data:
-			D4 25 01 D4 70 00 71 00 03 40 49 4A 42 00 48 7F
-			80 43 00 48 7F 00 55 00 47 BF 00 6D 00 47 BF 40
-			FF FF 00 00 00
-Handle 0xDE00
-	DMI type 222, 13 bytes.
-	OEM-specific Type
-		Header and Data:
-			DE 0D 00 DE 01 02 FF FF 00 00 00 00 00
-Handle 0x7F00
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Laptop.Fujitsu-Siemens-Amilo-7400 b/test/dmidecode.Laptop.Fujitsu-Siemens-Amilo-7400
deleted file mode 100644
index 7e44512d..00000000
--- a/test/dmidecode.Laptop.Fujitsu-Siemens-Amilo-7400
+++ /dev/null
@@ -1,416 +0,0 @@
-# dmidecode 2.4
-SMBIOS 2.31 present.
-37 structures occupying 1167 bytes.
-Table at 0x000D8010.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: Phoenix Technologies LTD
-		Version: R01-S0N   
-		Release Date: 08/29/03  
-		Address: 0xE2A70
-		Runtime Size: 120208 bytes
-		ROM Size: 64 kB
-		Characteristics:
-			ISA is supported
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			ESCD support is available
-			USB legacy is supported
-			Smart battery is supported
-			BIOS boot specification is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: FUJITSU SIEMENS
-		Product Name: AMILO M        
-		Version: -1             
-		Serial Number: 9142DZ1001339016ADKS00        
-		UUID: F9B346A0-EF6B-11D7-8E1A-87A09D85A3F4
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: FUJITSU SIEMENS
-		Product Name: AMILO M        
-		Version: Rev.A          
-		Serial Number: 9142DZ1001339016ADKS00        
-Handle 0x0003
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: FUJITSU SIEMENS
-		Type: Other
-		Lock: Not Present
-		Version: N/A            
-		Serial Number: None           
-		Asset Tag:                                 
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-		OEM Information: 0x00001234
-Handle 0x0004
-	DMI type 4, 35 bytes.
-	Processor Information
-		Socket Designation: U1
-		Type: Central Processor
-		Family: Pentium M
-		Manufacturer: Intel
-		ID: 95 06 00 00 BF F9 E9 A7
-		Signature: Type 0, Family 6, Model 9, Stepping 5
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			CLFSH (CLFLUSH instruction supported)
-			DS (Debug store)
-			ACPI (ACPI supported)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-			SSE2 (Streaming SIMD extensions 2)
-			TM (Thermal monitor supported)
-			SBF (Signal break on FERR)
-		Version: A0
-		Voltage: 3.3 V
-		External Clock: Unknown
-		Max Speed: 500 MHz
-		Current Speed: 1400 MHz
-		Status: Populated, Enabled
-		Upgrade: Slot 1
-		L1 Cache Handle: 0x0008
-		L2 Cache Handle: 0x0009
-		L3 Cache Handle: Not Provided
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0005
-	DMI type 5, 22 bytes.
-	Memory Controller Information
-		Error Detecting Method: None
-		Error Correcting Capabilities:
-			None
-		Supported Interleave: One-way Interleave
-		Current Interleave: One-way Interleave
-		Maximum Memory Module Size: 256 MB
-		Maximum Total Memory Size: 768 MB
-		Supported Speeds:
-			70 ns
-			60 ns
-		Supported Memory Types:
-			FPM
-			EDO
-			DIMM
-			SDRAM
-		Memory Module Voltage: 3.3 V
-		Associated Memory Slots: 3
-			0x0006
-			0x0007
-			0x0008
-		Enabled Error Correcting Capabilities:
-			None
-Handle 0x0006
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: M1
-		Bank Connections: 0 1
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 256 MB (Double-bank Connection)
-		Enabled Size: 256 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0007
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: M2
-		Bank Connections: 2 3
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 256 MB (Double-bank Connection)
-		Enabled Size: 256 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0008
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L1 Cache
-		Configuration: Enabled, Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 32 KB
-		Maximum Size: 32 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Asynchronous
-		Speed: Unknown
-		Error Correction Type: None
-		System Type: Other
-		Associativity: Other
-Handle 0x0009
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L2 Cache
-		Configuration: Enabled, Socketed, Level 2
-		Operational Mode: Write Back
-		Location: External
-		Installed Size: 1024 KB
-		Maximum Size: 2048 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Burst
-		Speed: Unknown
-		Error Correction Type: Single-bit ECC
-		System Type: Unified
-		Associativity: Other
-Handle 0x000A
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J19
-		Internal Connector Type: 9 Pin Dual Inline (pin 10 cut)
-		External Reference Designator: COM 1
-		External Connector Type: DB-9 male
-		Port Type: Serial Port 16550A Compatible
-Handle 0x000B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J23
-		Internal Connector Type: 25 Pin Dual Inline (pin 26 cut)
-		External Reference Designator: Parallel
-		External Connector Type: DB-25 female
-		Port Type: Parallel Port ECP/EPP
-Handle 0x000C
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J11
-		Internal Connector Type: None
-		External Reference Designator: Keyboard
-		External Connector Type: Circular DIN-8 male
-		Port Type: Keyboard Port
-Handle 0x000D
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J12
-		Internal Connector Type: None
-		External Reference Designator: PS/2 Mouse
-		External Connector Type: Circular DIN-8 male
-		Port Type: Keyboard Port
-Handle 0x000E
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI Slot J11
-		Type: 32-bit PCI
-		Current Usage: Unknown
-		Length: Long
-		ID: 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-Handle 0x000F
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI Slot J12
-		Type: 32-bit PCI
-		Current Usage: Unknown
-		Length: Long
-		ID: 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-Handle 0x0010
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI Slot J13
-		Type: 32-bit PCI
-		Current Usage: Unknown
-		Length: Long
-		ID: 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-Handle 0x0011
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Sound
-		Status: Disabled
-		Description: ADI
-Handle 0x0012
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: This is the Intel Montara
-		String 2: System CR Platform
-Handle 0x0013
-	DMI type 12, 5 bytes.
-	System Configuration Options
-		Option 1: Jumper settings can be described here.
-Handle 0x0014
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 1 GB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x0015
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0014
-		Error Information Handle: No Error
-		Total Width: 32 bits
-		Data Width: 32 bits
-		Size: 256 MB
-		Form Factor: SODIMM
-		Set: 1
-		Locator: M1
-		Bank Locator: Bank 0
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: Unknown
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0016
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0014
-		Error Information Handle: No Error
-		Total Width: 32 bits
-		Data Width: 32 bits
-		Size: 256 MB
-		Form Factor: SODIMM
-		Set: 1
-		Locator: M2
-		Bank Locator: Bank 1
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: Unknown
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0017
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Array Handle: 0x0014
-		Partition Width: 0
-Handle 0x0018
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x0015
-		Memory Array Mapped Address Handle: 0x0017
-		Partition Row Position: 1
-Handle 0x0019
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00010000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x0016
-		Memory Array Mapped Address Handle: 0x0017
-		Partition Row Position: 1
-Handle 0x001A
-	DMI type 23, 13 bytes.
-	System Reset
-		Status: Enabled
-		Watchdog Timer: Present
-		Boot Option: Do Not Reboot
-		Boot Option On Limit: Do Not Reboot
-		Reset Count: Unknown
-		Reset Limit: Unknown
-		Timer Interval: Unknown
-		Timeout: Unknown
-Handle 0x001B
-	DMI type 24, 5 bytes.
-	Hardware Security
-		Power-On Password Status: Enabled
-		Keyboard Password Status: Unknown
-		Administrator Password Status: Not Implemented
-		Front Panel Reset Status: Unknown
-Handle 0x001C
-	DMI type 25, 9 bytes.
-	System Power Controls
-		Next Scheduled Power-on: 12-31 23:59:59
-Handle 0x001D
-	DMI type 26, 20 bytes.
-	Voltage Probe
-		Description: Voltage Probe
-		Location: Processor
-		Status: OK
-		Maximum Value: Unknown
-		Minimum Value: Unknown
-		Resolution: Unknown
-		Tolerance: Unknown
-		Accuracy: Unknown
-		OEM-specific Information: 0x00000000
-Handle 0x001E
-	DMI type 27, 12 bytes.
-	Cooling Device
-		Temperature Probe Handle: 0x001F
-		Type: Fan
-		Status: OK
-		OEM-specific Information: 0x00000000
-Handle 0x001F
-	DMI type 28, 20 bytes.
-	Temperature Probe
-		Description: Temperature Probe
-		Location: Processor
-		Status: OK
-		Maximum Value: Unknown
-		Minimum Value Unknown
-		Resolution: Unknown
-		Tolerance: Unknown
-		Accuracy: Unknown
-		OEM-specific Information: 0x00000000
-Handle 0x0020
-	DMI type 29, 20 bytes.
-	Electrical Current Probe
-		Description: Electrical Current Probe
-		Location: Processor
-		Status: OK
-		Maximum Value: Unknown
-		Minimum Value: Unknown
-		Resolution: Unknown
-		Tolerance: Unknown
-		Accuracy: Unknown
-		OEM-specific Information: 0x00000000
-Handle 0x0021
-	DMI type 30, 6 bytes.
-	Out-of-band Remote Access
-		Manufacturer Name: Intel
-		Inbound Connection: Enabled
-		Outbound Connection: Disabled
-Handle 0x0022
-	DMI type 32, 20 bytes.
-	System Boot Information
-		Status: <OUT OF SPEC>
-Handle 0x0023
-	DMI type 126, 4 bytes.
-	Inactive
-Handle 0x0024
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Laptop.HP-OmniBook-6000 b/test/dmidecode.Laptop.HP-OmniBook-6000
deleted file mode 100644
index e5498837..00000000
--- a/test/dmidecode.Laptop.HP-OmniBook-6000
+++ /dev/null
@@ -1,402 +0,0 @@
-# dmidecode 2.5 (=> Resolution: 1024x768)
-SMBIOS 2.3 present.
-36 structures occupying 1161 bytes.
-Table at 0x000EFC90.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: Phoenix Technologies Ltd.
-		Version: EA.M1.80 
-		Release Date: 09/18/2001
-		Address: 0xE8720
-		Runtime Size: 96480 bytes
-		ROM Size: 512 kB
-		Characteristics:
-			ISA is supported
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			ESCD support is available
-			USB legacy is supported
-			Smart battery is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: Hewlett-Packard
-		Product Name: HP OmniBook PC         
-		Version: HP OmniBook 6000 EA    
-		Serial Number: TW13002229
-		UUID: Not Settable
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: Hewlett-Packard
-		Product Name: HP OmniBook PC         
-		Version: 6000EA
-		Serial Number: None
-Handle 0x0003
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: Hewlett-Packard
-		Type: Notebook
-		Lock: Not Present
-		Version: N/A
-		Serial Number: None
-		Asset Tag: No Asset Tag
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-		OEM Information: 0x00001234
-Handle 0x0004
-	DMI type 4, 32 bytes.
-	Processor Information
-		Socket Designation: Socket 5
-		Type: Central Processor
-		Family: Pentium III
-		Manufacturer: GenuineIntel
-		ID: 86 06 00 00 FF F9 83 03
-		Signature: Type 0, Family 6, Model 8, Stepping 6
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-		Version: Pentium(R) III
-		Voltage: 2.9 V
-		External Clock: Unknown
-		Max Speed: 700 MHz
-		Current Speed: 700 MHz
-		Status: Populated, Enabled
-		Upgrade: None
-		L1 Cache Handle: 0x0008
-		L2 Cache Handle: 0x0009
-		L3 Cache Handle: Not Provided
-Handle 0x0005
-	DMI type 5, 20 bytes.
-	Memory Controller Information
-		Error Detecting Method: None
-		Error Correcting Capabilities:
-			None
-		Supported Interleave: One-way Interleave
-		Current Interleave: One-way Interleave
-		Maximum Memory Module Size: 64 MB
-		Maximum Total Memory Size: 128 MB
-		Supported Speeds:
-			70 ns
-			60 ns
-		Supported Memory Types:
-			EDO
-			DIMM
-		Memory Module Voltage: 3.3 V
-		Associated Memory Slots: 2
-			0x0006
-			0x0007
-		Enabled Error Correcting Capabilities:
-			None
-Handle 0x0006
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM-1
-		Bank Connections: 0 1
-		Current Speed: 60 ns
-		Type: DIMM SDRAM
-		Installed Size: 256 MB (Double-bank Connection)
-		Enabled Size: 256 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0007
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM-2
-		Bank Connections: 2 3
-		Current Speed: 60 ns
-		Type: DIMM SDRAM
-		Installed Size: Not Installed (Single-bank Connection)
-		Enabled Size: Not Installed (Single-bank Connection)
-		Error Status: OK
-Handle 0x0008
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L1 Cache
-		Configuration: Enabled, Not Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 32 KB
-		Maximum Size: 32 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Asynchronous
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Unknown
-		Associativity: Unknown
-Handle 0x0009
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L2 Cache
-		Configuration: Enabled, Not Socketed, Level 2
-		Operational Mode: Write Back
-		Location: External
-		Installed Size: 256 KB
-		Maximum Size: 512 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Burst
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Unknown
-		Associativity: Unknown
-Handle 0x000A
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: NS
-		Internal Connector Type: 9 Pin Dual Inline (pin 10 cut)
-		External Reference Designator: COM 1
-		External Connector Type: DB-9 male
-		Port Type: Serial Port 16550A Compatible
-Handle 0x000B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: NS
-		Internal Connector Type: 9 Pin Dual Inline (pin 10 cut)
-		External Reference Designator: COM 2
-		External Connector Type: Infrared
-		Port Type: Serial Port 16550A Compatible
-Handle 0x000C
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: NS
-		Internal Connector Type: 25 Pin Dual Inline (pin 26 cut)
-		External Reference Designator: Parallel
-		External Connector Type: DB-25 female
-		Port Type: Parallel Port ECP/EPP
-Handle 0x000D
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN5
-		Internal Connector Type: None
-		External Reference Designator: Keyboard
-		External Connector Type: Circular DIN-8 male
-		Port Type: Keyboard Port
-Handle 0x000E
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN6
-		Internal Connector Type: None
-		External Reference Designator: PS/2 Mouse
-		External Connector Type: Circular DIN-8 male
-		Port Type: Keyboard Port
-Handle 0x000F
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: NS
-		Internal Connector Type: On Board Floppy
-		External Reference Designator: Floppy
-		External Connector Type: None
-		Port Type: None
-Handle 0x0010
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: PIIX4
-		Internal Connector Type: On Board IDE
-		External Reference Designator: Primary IDE
-		External Connector Type: None
-		Port Type: None
-Handle 0x0011
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCMCIA
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Unknown
-		Length: Long
-		ID: Adapter 1, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-Handle 0x0012
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCMCIA
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Unknown
-		Length: Long
-		ID: Adapter 2, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-Handle 0x0013
-	DMI type 10, 10 bytes.
-	On Board Device 1 Information
-		Type: Video
-		Status: Enabled
-		Description: ATI MOBILITY M/M1 AGP VGA
-	On Board Device 2 Information
-		Type: Sound
-		Status: Enabled
-		Description: ESS MAESTRO-3EM PCI Audio
-	On Board Device 3 Information
-		Type: Other
-		Status: Enabled
-		Description: NS SuperI/O
-Handle 0x0014
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: Hewlett-Packard OmniBook Series
-		String 2: Service ID: 11239
-Handle 0x0015
-	DMI type 12, 5 bytes.
-	System Configuration Options
-Handle 0x0016
-	DMI type 13, 22 bytes.
-	BIOS Language Information
-		Installable Languages: 1
-			en|US|iso8859-1
-		Currently Installed Language: Not Specified
-Handle 0x0017
-	DMI type 15, 23 bytes.
-	System Event Log
-		Area Length: 16 bytes
-		Header Start Offset: 0x0000
-		Header Length: 16 bytes
-		Data Start Offset: 0x0010
-		Access Method: OEM-specific
-		Access Address: Unknown
-		Status: Invalid, Not Full
-		Change Token: 0x00000080
-		Header Format: Type 1
-		Supported Log Type Descriptors: 0
-Handle 0x0018
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 1 GB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x0019
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x0018
-		Error Information Handle: No Error
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 256 MB
-		Form Factor: DIMM
-		Set: 1
-		Locator: J28
-		Bank Locator: Bank 0
-		Type: DRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-Handle 0x001A
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x0018
-		Error Information Handle: No Error
-		Total Width: Unknown
-		Data Width: Unknown
-		Size: No Module Installed
-		Form Factor: DIMM
-		Set: 1
-		Locator: J24
-		Bank Locator: Bank 1
-		Type: DRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-Handle 0x001B
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x000100003FF
-		Range Size: 262145 kB
-		Physical Array Handle: 0x0018
-		Partition Width: 0
-Handle 0x001C
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x0019
-		Memory Array Mapped Address Handle: 0x001B
-		Partition Row Position: Unknown
-		Interleave Position: Unknown
-		Interleaved Data Depth: Unknown
-Handle 0x001D
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00010000000
-		Ending Address: 0x000100003FF
-		Range Size: 1 kB
-		Physical Device Handle: 0x001A
-		Memory Array Mapped Address Handle: 0x001B
-		Partition Row Position: Unknown
-		Interleave Position: Unknown
-		Interleaved Data Depth: Unknown
-Handle 0x001E
-	DMI type 21, 7 bytes.
-	Built-in Pointing Device
-		Type: Track Point
-		Interface: PS/2
-		Buttons: 3
-Handle 0x001F
-	DMI type 21, 7 bytes.
-	Built-in Pointing Device
-		Type: Touch Pad
-		Interface: PS/2
-		Buttons: 3
-Handle 0x0020
-	DMI type 22, 26 bytes.
-	Portable Battery
-		Location: Left Front
-		Manufacturer: Not Specified
-		Name: <BAD INDEX>
-		Chemistry: Lithium Ion
-		Design Capacity: Unknown
-		Design Voltage: Unknown
-		SBDS Version: Not Specified
-		Maximum Error: 0%
-		SBDS Serial Number: 0000
-		SBDS Manufacture Date: 1980-00-00
-		OEM-specific Information: 0x00000000
-Handle 0x0021
-	DMI type 32, 20 bytes.
-	System Boot Information
-		Status: No errors detected
-Handle 0x0022
-	DMI type 128, 15 bytes.
-	OEM-specific Type
-		Header and Data:
-			80 0F 22 00 48 50 11 45 41 28 40 00 F0 93 00
-Handle 0x0023
-	DMI type 140, 36 bytes.
-	OEM-specific Type
-		Header and Data:
-			8C 24 23 00 00 00 00 00 00 60 01 7D 00 7C 01 7D
-			00 00 00 01 FF FF FF FF FF FF FF FF 00 00 00 00
-			00 00 00 00
-Wrong DMI structures length: 1161 bytes announced, structures occupy 1155 bytes.
diff --git a/test/dmidecode.Laptop.HP-Pavilion-dv1000 b/test/dmidecode.Laptop.HP-Pavilion-dv1000
deleted file mode 100644
index 69fdfce9..00000000
--- a/test/dmidecode.Laptop.HP-Pavilion-dv1000
+++ /dev/null
@@ -1,328 +0,0 @@
-# dmidecode 2.3 (=> Resolution: 1280x768) (=> Diagonal_size: 14.1)
-SMBIOS 2.31 present.
-28 structures occupying 815 bytes.
-Table at 0x000DF010.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: Hewlett-Packard
-		Version: F.14
-		Release Date: 01/28/2005
-		Address: 0xE67A0
-		Runtime Size: 104544 bytes
-		ROM Size: 512 kB
-		Characteristics:
-			ISA is supported
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			ESCD support is available
-			Boot from CD is supported
-			Print screen service is supported (int 5h)
-			8042 keyboard services are supported (int 9h)
-			Serial services are supported (int 14h)
-			Printer services are supported (int 17h)
-			ACPI is supported
-			USB legacy is supported
-			AGP is supported
-			Smart battery is supported
-			BIOS boot specification is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: Hewlett-Packard
-		Product Name: HP Pavilion dv1000 (PS600EA#ABF)
-		Version: Rev 1
-		Serial Number: CNF5041TNQ
-		UUID: 20E04318-8971-D911-8C87-00C09F77267C
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: Quanta
-		Product Name: 09B8
-		Version: 34.20
-		Serial Number: None
-Handle 0x0003
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: Quanta
-		Type: Notebook
-		Lock: Not Present
-		Version: N/A
-		Serial Number: None
-		Asset Tag:
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-		OEM Information: 0x00001234
-Handle 0x0004
-	DMI type 4, 35 bytes.
-	Processor Information
-		Socket Designation: U1
-		Type: Central Processor
-		Family: Pentium M
-		Manufacturer: Intel
-		ID: D6 06 00 00 BF FB E9 AF
-		Signature: Type 0, Family 6, Model 13, Stepping 6
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			APIC (On-chip APIC hardware supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			CLFSH (CLFLUSH instruction supported)
-			DS (Debug store)
-			ACPI (ACPI supported)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-			SSE2 (Streaming SIMD extensions 2)
-			SS (Self-snoop)
-			TM (Thermal monitor supported)
-			SBF (Signal break on FERR)
-		Version: Intel(R) Pentium(R) M processor 1.70GHz
-		Voltage: 3.3 V
-		External Clock: 100 MHz
-		Max Speed: 1700 MHz
-		Current Speed: 1700 MHz
-		Status: Populated, Enabled
-		Upgrade: ZIF Socket
-		L1 Cache Handle: 0x0005
-		L2 Cache Handle: 0x0006
-		L3 Cache Handle: Not Provided
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0005
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L1 Cache
-		Configuration: Enabled, Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 32 KB
-		Maximum Size: 32 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Asynchronous
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Unknown
-		Associativity: Unknown
-Handle 0x0006
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L2 Cache
-		Configuration: Enabled, Socketed, Level 2
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 2048 KB
-		Maximum Size: 2048 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Burst
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Unknown
-		Associativity: Unknown
-Handle 0x0007
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI Slot 1
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Long
-		ID: 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-Handle 0x0008
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Video
-		Status: Enabled
-		Description:  32
-Handle 0x0009
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: $HP$
-Handle 0x000A
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 2 GB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x000B
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x000A
-		Error Information Handle: No Error
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 256 MB
-		Form Factor: DIMM
-		Set: 1
-		Locator: J5G3
-		Bank Locator: DIMM 0
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: Unknown
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x000C
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x000A
-		Error Information Handle: No Error
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 256 MB
-		Form Factor: DIMM
-		Set: 1
-		Locator: J5G2
-		Bank Locator: DIMM 1
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: Unknown
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x000D
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Array Handle: 0x000A
-		Partition Width: 0
-Handle 0x000E
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x000B
-		Memory Array Mapped Address Handle: 0x000D
-		Partition Row Position: 2
-		Interleave Position: 2
-		Interleaved Data Depth: 2
-Handle 0x000F
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00010000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x000C
-		Memory Array Mapped Address Handle: 0x000D
-		Partition Row Position: 2
-		Interleave Position: 2
-		Interleaved Data Depth: 2
-Handle 0x0010
-	DMI type 23, 13 bytes.
-	System Reset
-		Status: Enabled
-		Watchdog Timer: Present
-		Boot Option: Do Not Reboot
-		Boot Option On Limit: Do Not Reboot
-		Reset Count: Unknown
-		Reset Limit: Unknown
-		Timer Interval: Unknown
-		Timeout: Unknown
-Handle 0x0011
-	DMI type 24, 5 bytes.
-	Hardware Security
-		Power-On Password Status: Enabled
-		Keyboard Password Status: Unknown
-		Administrator Password Status: Enabled
-		Front Panel Reset Status: Unknown
-Handle 0x0012
-	DMI type 25, 9 bytes.
-	System Power Controls
-		Next Scheduled Power-on: 12-31 23:59:59
-Handle 0x0013
-	DMI type 26, 20 bytes.
-	Voltage Probe
-		Description: Voltage Probe
-		Location: Processor
-		Status: OK
-		Maximum Value: Unknown
-		Minimum Value: Unknown
-		Resolution: Unknown
-		Tolerance: Unknown
-		Accuracy: Unknown
-		OEM-specific Information: 0x00000000
-Handle 0x0014
-	DMI type 27, 12 bytes.
-	Cooling Device
-		Temperature Probe Handle: 0x0015
-		Type: Fan
-		Status: OK
-		OEM-specific Information: 0x00000000
-Handle 0x0015
-	DMI type 28, 20 bytes.
-	Temperature Probe
-		Description: Temperature Probe
-		Location: Processor
-		Status: OK
-		Maximum Value: Unknown
-		Minimum Value Unknown
-		Resolution: Unknown
-		Tolerance: Unknown
-		Accuracy: Unknown
-		OEM-specific Information: 0x00000000
-Handle 0x0016
-	DMI type 29, 20 bytes.
-	Electrical Current Probe
-		Description: Electrical Current Probe
-		Location: Processor
-		Status: OK
-		Maximum Value: Unknown
-		Minimum Value: Unknown
-		Resolution: Unknown
-		Tolerance: Unknown
-		Accuracy: Unknown
-		OEM-specific Information: 0x00000000
-Handle 0x0017
-	DMI type 30, 6 bytes.
-	Out-of-band Remote Access
-		Manufacturer Name: Intel
-		Inbound Connection: Enabled
-		Outbound Connection: Disabled
-Handle 0x0018
-	DMI type 32, 20 bytes.
-	System Boot Information
-		Status: <OUT OF SPEC>
-Handle 0x0019
-	DMI type 126, 4 bytes.
-	Inactive
-Handle 0x001A
-	DMI type 127, 4 bytes.
-	End Of Table
-Handle 0x001B
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Laptop.HP-nx9010 b/test/dmidecode.Laptop.HP-nx9010
deleted file mode 100644
index 31f60f77..00000000
--- a/test/dmidecode.Laptop.HP-nx9010
+++ /dev/null
@@ -1,376 +0,0 @@
-# dmidecode 2.3 (=> Resolution: 1024x768) (=> Diagonal_size: 15)
-SMBIOS 2.3 present.
-31 structures occupying 1166 bytes.
-Table at 0x000DB010.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: Phoenix Technologies Ltd.
-		Version: KF_KH.F.18
-		Release Date: 11/13/2003
-		Address: 0xE4AA0
-		Runtime Size: 111968 bytes
-		ROM Size: 512 kB
-		Characteristics:
-			ISA is supported
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			ESCD support is available
-			Boot from CD is supported
-			Selectable boot is supported
-			BIOS ROM is socketed
-			Boot from PC Card (PCMCIA) is supported
-			EDD is supported
-			Japanese floppy for NEC 9800 1.2 MB is supported (int 13h)
-			Japanese floppy for Toshiba 1.2 MB is supported (int 13h)
-			Print screen service is supported (int 5h)
-			8042 keyboard services are supported (int 9h)
-			Serial services are supported (int 14h)
-			Printer services are supported (int 17h)
-			CGA/mono video services are supported (int 10h)
-			ACPI is supported
-			USB legacy is supported
-			AGP is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: Hewlett-Packard        
-		Product Name: HP nx9010 (DJ124A)       
-		Version: KH.F.18                  
-		Serial Number: CNF3460GWW
-		UUID: E02B0BC8-97FA-D711-8576-000D9D8A6F26
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: Hewlett-Packard        
-		Product Name: 0850                   
-		Version: NS570 Version PQ1B60   
-		Serial Number: None
-Handle 0x0003
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: Hewlett-Packard        
-		Type: Notebook
-		Lock: Not Present
-		Version: N/A
-		Serial Number: None
-		Asset Tag: No Asset Tag
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-		OEM Information: 0x00000000
-Handle 0x0004
-	DMI type 4, 32 bytes.
-	Processor Information
-		Socket Designation: WMT478/NWD
-		Type: Central Processor
-		Family: Pentium 4
-		Manufacturer: Intel
-		ID: 29 0F 00 00 FF F9 EB BF
-		Signature: Type 0, Family 15, Model 2, Stepping 9
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			CLFSH (CLFLUSH instruction supported)
-			DS (Debug store)
-			ACPI (ACPI supported)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-			SSE2 (Streaming SIMD extensions 2)
-			SS (Self-snoop)
-			HTT (Hyper-threading technology)
-			TM (Thermal monitor supported)
-			SBF (Signal break on FERR)
-		Version: Intel(R) Pentium(R) 4
-		Voltage: 1.2 V
-		External Clock: Unknown
-		Max Speed: 2400 MHz
-		Current Speed: 2400 MHz
-		Status: Populated, Enabled
-		Upgrade: Slot 1
-		L1 Cache Handle: Not Provided
-		L2 Cache Handle: 0x0008
-		L3 Cache Handle: Not Provided
-Handle 0x0005
-	DMI type 5, 20 bytes.
-	Memory Controller Information
-		Error Detecting Method: None
-		Error Correcting Capabilities:
-			Other
-		Supported Interleave: One-way Interleave
-		Current Interleave: One-way Interleave
-		Maximum Memory Module Size: 512 MB
-		Maximum Total Memory Size: 1024 MB
-		Supported Speeds:
-			70 ns
-			60 ns
-		Supported Memory Types:
-			FPM
-			EDO
-			DIMM
-			SDRAM
-		Memory Module Voltage: 3.3 V
-		Associated Memory Slots: 2
-			0x0000
-			0x0001
-		Enabled Error Correcting Capabilities:
-			None
-Handle 0x0006
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM 1
-		Bank Connections: 0 1
-		Current Speed: 60 ns
-		Type: DIMM SDRAM
-		Installed Size: Not Installed (Single-bank Connection)
-		Enabled Size: Not Installed (Single-bank Connection)
-		Error Status: OK
-Handle 0x0007
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM 2
-		Bank Connections: 2 3
-		Current Speed: 60 ns
-		Type: DIMM SDRAM
-		Installed Size: Not Installed (Single-bank Connection)
-		Enabled Size: Not Installed (Single-bank Connection)
-		Error Status: OK
-Handle 0x0008
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L2 Cache
-		Configuration: Enabled, Socketed, Level 2
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 512 KB
-		Maximum Size: 1024 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-		Installed SRAM Type: Burst
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Unknown
-		Associativity: 2-way Set-associative
-Handle 0x0009
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI Slot 1
-		Type: 32-bit PCI
-		Current Usage: Unknown
-		Length: Long
-		ID: 0
-		Characteristics:
-			5.0 V is provided
-			PME signal is supported
-Handle 0x000A
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Sound
-		Status: Disabled
-		Description: ALi 1535 Sound
-Handle 0x000B
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: Hewlett-Packard Notebook Series
-		String 2: Service ID: 14005
-		String 3: $MODEL: DJ124
-		String 4: $OS:   
-		String 5: $LOCAL: ABB
-		String 6: $OPTION:    
-		String 7: $DC:  
-Handle 0x000C
-	DMI type 12, 5 bytes.
-	System Configuration Options
-		Option 1: Jumper settings can be described here.
-Handle 0x000D
-	DMI type 15, 29 bytes.
-	System Event Log
-		Area Length: 16 bytes
-		Header Start Offset: 0x0000
-		Header Length: 16 bytes
-		Data Start Offset: 0x0010
-		Access Method: General-purpose non-volatile data functions
-		Access Address: 0x0000
-		Status: Valid, Not Full
-		Change Token: 0x000000E4
-		Header Format: Type 1
-		Supported Log Type Descriptors: 3
-		Descriptor 1: POST error
-		Data Format 1: POST results bitmap
-		Descriptor 2: Single-bit ECC memory error
-		Data Format 2: Multiple-event
-		Descriptor 3: Multi-bit ECC memory error
-		Data Format 3: Multiple-event
-Handle 0x000E
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 1 GB
-		Error Information Handle: Not Provided
-		Number Of Devices: 3
-Handle 0x000F
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x000E
-		Error Information Handle: No Error
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 256 MB
-		Form Factor: DIMM
-		Set: 1
-		Locator: J400
-		Bank Locator: DIMM 1
-		Type: DRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-Handle 0x0010
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x000E
-		Error Information Handle: No Error
-		Total Width: Unknown
-		Data Width: Unknown
-		Size: No Module Installed
-		Form Factor: DIMM
-		Set: 1
-		Locator: J401
-		Bank Locator: DIMM 2
-		Type: DRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-Handle 0x0011
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 256 MB
-		Physical Array Handle: 0x000E
-		Partition Width: 0
-Handle 0x0012
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x000F
-		Memory Array Mapped Address Handle: 0x0011
-		Partition Row Position: 1
-Handle 0x0013
-	DMI type 23, 13 bytes.
-	System Reset
-		Status: Enabled
-		Watchdog Timer: Present
-		Boot Option: Do Not Reboot
-		Boot Option On Limit: Do Not Reboot
-		Reset Count: Unknown
-		Reset Limit: Unknown
-		Timer Interval: Unknown
-		Timeout: Unknown
-Handle 0x0014
-	DMI type 24, 5 bytes.
-	Hardware Security
-		Power-On Password Status: Disabled
-		Keyboard Password Status: Unknown
-		Administrator Password Status: Enabled
-		Front Panel Reset Status: Unknown
-Handle 0x0015
-	DMI type 25, 9 bytes.
-	System Power Controls
-		Next Scheduled Power-on: 12-31 23:59:59
-Handle 0x0016
-	DMI type 26, 20 bytes.
-	Voltage Probe
-		Description: Voltage Probe
-		Location: Processor
-		Status: OK
-		Maximum Value: Unknown
-		Minimum Value: Unknown
-		Resolution: Unknown
-		Tolerance: Unknown
-		Accuracy: Unknown
-		OEM-specific Information: 0x00000000
-Handle 0x0017
-	DMI type 27, 14 bytes.
-	Cooling Device
-		Temperature Probe Handle: 0x0018
-		Type: Fan
-		Status: OK
-		OEM-specific Information: 0x00000000
-		Nominal Speed: Unknown Or Non-rotating
-Handle 0x0018
-	DMI type 28, 20 bytes.
-	Temperature Probe
-		Description: Temperature Probe
-		Location: Processor
-		Status: OK
-		Maximum Value: Unknown
-		Minimum Value Unknown
-		Resolution: Unknown
-		Tolerance: Unknown
-		Accuracy: Unknown
-		OEM-specific Information: 0x00000000
-Handle 0x0019
-	DMI type 29, 20 bytes.
-	Electrical Current Probe
-		Description: Electrical Current Probe
-		Location: Processor
-		Status: OK
-		Maximum Value: Unknown
-		Minimum Value: Unknown
-		Resolution: Unknown
-		Tolerance: Unknown
-		Accuracy: Unknown
-		OEM-specific Information: 0x00000000
-Handle 0x001A
-	DMI type 30, 6 bytes.
-	Out-of-band Remote Access
-		Manufacturer Name: Intel
-		Inbound Connection: Enabled
-		Outbound Connection: Disabled
-Handle 0x001B
-	DMI type 32, 20 bytes.
-	System Boot Information
-		Status: <OUT OF SPEC>
-Handle 0x001C
-	DMI type 133, 34 bytes.
-	OEM-specific Type
-		Header and Data:
-			85 22 1C 00 01 30 11 7E 10 7E 10 02 00 06 00 1E
-			00 EB 40 00 00 D0 39 02 E0 00 9A 4C 00 00 00 00
-			00 00
-		Strings:
-			20430 10/23/2003
-			SANYO     
-Handle 0x001D
-	DMI type 140, 36 bytes.
-	OEM-specific Type
-		Header and Data:
-			8C 24 1D 00 00 00 00 00 00 60 01 7D 00 7C 01 7D
-			00 00 00 01 FF FF FF FF FF FF FF FF 00 00 00 00
-			00 00 00 00
-Handle 0x001E
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Laptop.HP-nx9105 b/test/dmidecode.Laptop.HP-nx9105
deleted file mode 100644
index 4804eddb..00000000
--- a/test/dmidecode.Laptop.HP-nx9105
+++ /dev/null
@@ -1,284 +0,0 @@
-# dmidecode 2.5 (Resolution can be 1680x1050 1280x800 1024x768)
-SMBIOS 2.31 present.
-20 structures occupying 631 bytes.
-Table at 0x000F09F0.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: Hewlett-Packard 
-		Version: F.21
-		Release Date: 09/02/2004
-		Address: 0xE3460
-		Runtime Size: 117664 bytes
-		ROM Size: 512 kB
-		Characteristics:
-			PCI is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			ESCD support is available
-			Boot from CD is supported
-			Selectable boot is supported
-			EDD is supported
-			5.25"/360 KB floppy services are supported (int 13h)
-			5.25"/1.2 MB floppy services are supported (int 13h)
-			3.5"/720 KB floppy services are supported (int 13h)
-			3.5"/2.88 MB floppy services are supported (int 13h)
-			Print screen service is supported (int 5h)
-			8042 keyboard services are supported (int 9h)
-			Serial services are supported (int 14h)
-			Printer services are supported (int 17h)
-			CGA/mono video services are supported (int 10h)
-			ACPI is supported
-			USB legacy is supported
-			AGP is supported
-			LS-120 boot is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: Hewlett-Packard 
-		Product Name: hp compaq nx9105 (DU430EA#ABF)
-		Version: F.21
-		Serial Number: CND4431SF8
-		UUID: 43DD01DE-212B-11D9-A555-000FB03F4CE8
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: Compal 
-		Product Name: 08A0
-		Version: 32.30
-		Serial Number: CND4431SF8
-Handle 0x0003
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: Compal 
-		Type: Notebook
-		Lock: Not Present
-		Version: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Boot-up State: Unknown
-		Power Supply State: Unknown
-		Thermal State: Unknown
-		Security Status: Unknown
-		OEM Information: 0x00000000
-Handle 0x0004
-	DMI type 4, 35 bytes.
-	Processor Information
-		Socket Designation: Socket A
-		Type: Central Processor
-		Family: Athlon 64
-		Manufacturer: AMD
-		ID: 4A 0F 00 00 FF F9 8B 07
-		Signature: Extended Family 0, Model 4, Stepping A
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			CLFSH (CLFLUSH instruction supported)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-			SSE2 (Streaming SIMD extensions 2)
-		Version: AMD Athlon(tm) 64
-		Voltage: 1.6 V
-		External Clock: 133 MHz
-		Max Speed: 2200 MHz
-		Current Speed: 800 MHz
-		Status: Populated, Enabled
-		Upgrade: None
-		L1 Cache Handle: 0x0008
-		L2 Cache Handle: 0x0009
-		L3 Cache Handle: Not Provided
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0005
-	DMI type 5, 20 bytes.
-	Memory Controller Information
-		Error Detecting Method: 128-bit ECC
-		Error Correcting Capabilities:
-			Other
-		Supported Interleave: One-way Interleave
-		Current Interleave: One-way Interleave
-		Maximum Memory Module Size: 4096 MB
-		Maximum Total Memory Size: 8192 MB
-		Supported Speeds:
-			Other
-		Supported Memory Types: None
-		Memory Module Voltage: 3.3 V
-		Associated Memory Slots: 2
-			0x0006
-			0x0007
-		Enabled Error Correcting Capabilities:
-			Unknown
-Handle 0x0006
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIM0
-		Bank Connections: 1 0
-		Current Speed: 10 ns
-		Type: DIMM SDRAM
-		Installed Size: 256 MB (Double-bank Connection)
-		Enabled Size: 256 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0007
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIM1
-		Bank Connections: 3 2
-		Current Speed: 10 ns
-		Type: DIMM SDRAM
-		Installed Size: 256 MB (Double-bank Connection)
-		Enabled Size: 256 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0008
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L1 Cache
-		Configuration: Enabled, Not Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 64 KB
-		Maximum Size: 64 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Asynchronous
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Unknown
-		Associativity: Unknown
-Handle 0x0009
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L2 Cache
-		Configuration: Enabled, Not Socketed, Level 2
-		Operational Mode: Write Through
-		Location: Internal
-		Installed Size: 1024 KB
-		Maximum Size: 512 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Synchronous
-		Installed SRAM Type: Synchronous
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Unified
-		Associativity: Unknown
-Handle 0x000A
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: AGP Slot
-		Type: 32-bit AGP 2x
-		Current Usage: Unknown
-		Length: Long
-		ID: 0
-		Characteristics:
-			3.3 V is provided
-			PME signal is supported
-Handle 0x000B
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: 0
-		String 2: 0
-		String 3: .........................
-Handle 0x000C
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 4 GB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x000D
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x000C
-		Error Information Handle: No Error
-		Total Width: 32 bits
-		Data Width: 32 bits
-		Size: 256 MB
-		Form Factor: DIMM
-		Set: 1
-		Locator: S1
-		Bank Locator: Bank 1
-		Type: DRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x000E
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x000C
-		Error Information Handle: No Error
-		Total Width: 32 bits
-		Data Width: 32 bits
-		Size: 256 MB
-		Form Factor: DIMM
-		Set: 2
-		Locator: S2
-		Bank Locator: Bank 2
-		Type: DRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x000F
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Array Handle: 0x000C
-		Partition Width: 0
-Handle 0x0010
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x000D
-		Memory Array Mapped Address Handle: 0x000F
-		Partition Row Position: 1
-		Interleaved Data Depth: 1
-Handle 0x0011
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00010000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x000E
-		Memory Array Mapped Address Handle: 0x000F
-		Partition Row Position: 1
-		Interleaved Data Depth: 1
-Handle 0x0012
-	DMI type 32, 20 bytes.
-	System Boot Information
-		Status: <OUT OF SPEC>
-Handle 0x0013
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Laptop.IBM-Thinkpad-390X b/test/dmidecode.Laptop.IBM-Thinkpad-390X
deleted file mode 100644
index 7733d5b7..00000000
--- a/test/dmidecode.Laptop.IBM-Thinkpad-390X
+++ /dev/null
@@ -1,364 +0,0 @@
-# dmidecode 2.5 (=> Resolution: 1024x768)
-SMBIOS 2.3 present.
-32 structures occupying 984 bytes.
-Table at 0x000E9B60.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: IBM
-		Version: ISB055WW
-		Release Date: 11/30/1999
-		Address: 0xE8B10
-		Runtime Size: 95472 bytes
-		ROM Size: 512 kB
-		Characteristics:
-			ISA is supported
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			Boot from CD is supported
-			Selectable boot is supported
-			ACPI is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: IBM
-		Product Name: 2626JNG
-		Version: Not Available
-		Serial Number: 555961M
-		UUID: AC281B80-B82A-11D3-ABFC-C50FDCD6CF6A
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: IBM
-		Product Name: 2626JNG
-		Version: Not Available
-		Serial Number: J15G1s6001g
-Handle 0x0003
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: IBM
-		Type: Notebook
-		Lock: Not Present
-		Version: Not Available
-		Serial Number: Not Available
-		Asset Tag: Not Available
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-		OEM Information: 0x00001234
-Handle 0x0004
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: IBM
-		Type: Docking Station
-		Lock: Not Present
-		Version: Not Available
-		Serial Number: Not Available
-		Asset Tag: Not Available
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-		OEM Information: 0x00001234
-Handle 0x0005
-	DMI type 4, 32 bytes.
-	Processor Information
-		Socket Designation: MMC 2
-		Type: Central Processor
-		Family: Pentium II
-		Manufacturer: GenuineIntel
-		ID: 6A 06 00 00 FF F9 83 01
-		Signature: Type 0, Family 6, Model 6, Stepping 10
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-		Version: Dixon(TM) II processor          
-		Voltage: 2.5 V
-		External Clock: Unknown
-		Max Speed: 500 MHz
-		Current Speed: 400 MHz
-		Status: Populated, Enabled
-		Upgrade: Replaceable Piggy Back
-		L1 Cache Handle: 0x0009
-		L2 Cache Handle: 0x000A
-		L3 Cache Handle: Not Provided
-Handle 0x0006
-	DMI type 5, 20 bytes.
-	Memory Controller Information
-		Error Detecting Method: None
-		Error Correcting Capabilities:
-			None
-		Supported Interleave: One-way Interleave
-		Current Interleave: One-way Interleave
-		Maximum Memory Module Size: 256 MB
-		Maximum Total Memory Size: 512 MB
-		Supported Speeds:
-			70 ns
-			60 ns
-		Supported Memory Types:
-			FPM
-			DIMM
-			SDRAM
-		Memory Module Voltage: 3.3 V
-		Associated Memory Slots: 2
-			0x0007
-			0x0008
-		Enabled Error Correcting Capabilities:
-			Unknown
-Handle 0x0007
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: CN24
-		Bank Connections: 0 1
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 128 MB (Double-bank Connection)
-		Enabled Size: 128 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0008
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: CN25
-		Bank Connections: 2 3
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 128 MB (Double-bank Connection)
-		Enabled Size: 128 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0009
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L1 Cache
-		Configuration: Enabled, Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 32 KB
-		Maximum Size: 32 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Asynchronous
-		Speed: Unknown
-		Error Correction Type: None
-		System Type: Unified
-		Associativity: Fully Associative
-Handle 0x000A
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L2 Cache
-		Configuration: Enabled, Socketed, Level 2
-		Operational Mode: Write Back
-		Location: External
-		Installed Size: 256 KB
-		Maximum Size: 256 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Unknown
-		Speed: Unknown
-		Error Correction Type: None
-		System Type: Unified
-		Associativity: Fully Associative
-Handle 0x000B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN7
-		Internal Connector Type: 9 Pin Dual Inline (pin 10 cut)
-		External Reference Designator: COM 1
-		External Connector Type: DB-9 male
-		Port Type: Serial Port 16550A Compatible
-Handle 0x000C
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN1
-		Internal Connector Type: 25 Pin Dual Inline (pin 26 cut)
-		External Reference Designator: Parallel
-		External Connector Type: DB-25 female
-		Port Type: Parallel Port ECP/EPP
-Handle 0x000D
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN14
-		Internal Connector Type: None
-		External Reference Designator: Keyboard
-		External Connector Type: Circular DIN-8 male
-		Port Type: Keyboard Port
-Handle 0x000E
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN14
-		Internal Connector Type: None
-		External Reference Designator: PS/2 Mouse
-		External Connector Type: Circular DIN-8 male
-		Port Type: Mouse Port
-Handle 0x000F
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN4
-		Internal Connector Type: None
-		External Reference Designator: USB
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0010
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN13
-		Internal Connector Type: None
-		External Reference Designator: Infrared
-		External Connector Type: Infrared
-		Port Type: Other
-Handle 0x0011
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: SM1
-		Internal Connector Type: None
-		External Reference Designator: Lucent Modem
-		External Connector Type: RJ-11
-		Port Type: Modem Port
-Handle 0x0012
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: 2 CardBus Slots
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Unknown
-		Length: Other
-		ID: Adapter 0, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Zoom Video is supported
-Handle 0x0013
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: 2 CardBus Slots (Dock)
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Unknown
-		Length: Other
-		ID: Adapter 0, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-Handle 0x0014
-	DMI type 10, 8 bytes.
-	On Board Device 1 Information
-		Type: Video
-		Status: Disabled
-		Description: Video (NeoMagic NM2200)
-	On Board Device 2 Information
-		Type: Sound
-		Status: Disabled
-		Description: ESS 1946
-Handle 0x0015
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: Intel 440BX NoteBook
-		String 2: IBM ThinkPad
-Handle 0x0016
-	DMI type 12, 5 bytes.
-	System Configuration Options
-Handle 0x0017
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 1 GB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x0018
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x0017
-		Error Information Handle: No Error
-		Total Width: 32 bits
-		Data Width: 32 bits
-		Size: 128 MB
-		Form Factor: DIMM
-		Set: 1
-		Locator: CN24
-		Bank Locator: Bank 0
-		Type: DRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-Handle 0x0019
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x0017
-		Error Information Handle: No Error
-		Total Width: 32 bits
-		Data Width: 32 bits
-		Size: 128 MB
-		Form Factor: DIMM
-		Set: 1
-		Locator: CN25
-		Bank Locator: Bank 1
-		Type: DRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-Handle 0x001A
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x000100003FF
-		Range Size: 262145 kB
-		Physical Array Handle: 0x0017
-		Partition Width: 0
-Handle 0x001B
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x00007FFFFFF
-		Range Size: 128 MB
-		Physical Device Handle: 0x0018
-		Memory Array Mapped Address Handle: 0x001A
-		Partition Row Position: 2
-Handle 0x001C
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00008000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 128 MB
-		Physical Device Handle: 0x0019
-		Memory Array Mapped Address Handle: 0x001A
-		Partition Row Position: 2
-Handle 0x001D
-	DMI type 21, 7 bytes.
-	Built-in Pointing Device
-		Type: Mouse
-		Interface: PS/2
-		Buttons: 2
-Handle 0x001E
-	DMI type 32, 20 bytes.
-	System Boot Information
-		Status: <OUT OF SPEC>
-Handle 0x001F
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Laptop.IBM-Thinkpad-390x b/test/dmidecode.Laptop.IBM-Thinkpad-390x
deleted file mode 100644
index 7733d5b7..00000000
--- a/test/dmidecode.Laptop.IBM-Thinkpad-390x
+++ /dev/null
@@ -1,364 +0,0 @@
-# dmidecode 2.5 (=> Resolution: 1024x768)
-SMBIOS 2.3 present.
-32 structures occupying 984 bytes.
-Table at 0x000E9B60.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: IBM
-		Version: ISB055WW
-		Release Date: 11/30/1999
-		Address: 0xE8B10
-		Runtime Size: 95472 bytes
-		ROM Size: 512 kB
-		Characteristics:
-			ISA is supported
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			Boot from CD is supported
-			Selectable boot is supported
-			ACPI is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: IBM
-		Product Name: 2626JNG
-		Version: Not Available
-		Serial Number: 555961M
-		UUID: AC281B80-B82A-11D3-ABFC-C50FDCD6CF6A
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: IBM
-		Product Name: 2626JNG
-		Version: Not Available
-		Serial Number: J15G1s6001g
-Handle 0x0003
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: IBM
-		Type: Notebook
-		Lock: Not Present
-		Version: Not Available
-		Serial Number: Not Available
-		Asset Tag: Not Available
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-		OEM Information: 0x00001234
-Handle 0x0004
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: IBM
-		Type: Docking Station
-		Lock: Not Present
-		Version: Not Available
-		Serial Number: Not Available
-		Asset Tag: Not Available
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-		OEM Information: 0x00001234
-Handle 0x0005
-	DMI type 4, 32 bytes.
-	Processor Information
-		Socket Designation: MMC 2
-		Type: Central Processor
-		Family: Pentium II
-		Manufacturer: GenuineIntel
-		ID: 6A 06 00 00 FF F9 83 01
-		Signature: Type 0, Family 6, Model 6, Stepping 10
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-		Version: Dixon(TM) II processor          
-		Voltage: 2.5 V
-		External Clock: Unknown
-		Max Speed: 500 MHz
-		Current Speed: 400 MHz
-		Status: Populated, Enabled
-		Upgrade: Replaceable Piggy Back
-		L1 Cache Handle: 0x0009
-		L2 Cache Handle: 0x000A
-		L3 Cache Handle: Not Provided
-Handle 0x0006
-	DMI type 5, 20 bytes.
-	Memory Controller Information
-		Error Detecting Method: None
-		Error Correcting Capabilities:
-			None
-		Supported Interleave: One-way Interleave
-		Current Interleave: One-way Interleave
-		Maximum Memory Module Size: 256 MB
-		Maximum Total Memory Size: 512 MB
-		Supported Speeds:
-			70 ns
-			60 ns
-		Supported Memory Types:
-			FPM
-			DIMM
-			SDRAM
-		Memory Module Voltage: 3.3 V
-		Associated Memory Slots: 2
-			0x0007
-			0x0008
-		Enabled Error Correcting Capabilities:
-			Unknown
-Handle 0x0007
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: CN24
-		Bank Connections: 0 1
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 128 MB (Double-bank Connection)
-		Enabled Size: 128 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0008
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: CN25
-		Bank Connections: 2 3
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 128 MB (Double-bank Connection)
-		Enabled Size: 128 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0009
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L1 Cache
-		Configuration: Enabled, Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 32 KB
-		Maximum Size: 32 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Asynchronous
-		Speed: Unknown
-		Error Correction Type: None
-		System Type: Unified
-		Associativity: Fully Associative
-Handle 0x000A
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L2 Cache
-		Configuration: Enabled, Socketed, Level 2
-		Operational Mode: Write Back
-		Location: External
-		Installed Size: 256 KB
-		Maximum Size: 256 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Unknown
-		Speed: Unknown
-		Error Correction Type: None
-		System Type: Unified
-		Associativity: Fully Associative
-Handle 0x000B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN7
-		Internal Connector Type: 9 Pin Dual Inline (pin 10 cut)
-		External Reference Designator: COM 1
-		External Connector Type: DB-9 male
-		Port Type: Serial Port 16550A Compatible
-Handle 0x000C
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN1
-		Internal Connector Type: 25 Pin Dual Inline (pin 26 cut)
-		External Reference Designator: Parallel
-		External Connector Type: DB-25 female
-		Port Type: Parallel Port ECP/EPP
-Handle 0x000D
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN14
-		Internal Connector Type: None
-		External Reference Designator: Keyboard
-		External Connector Type: Circular DIN-8 male
-		Port Type: Keyboard Port
-Handle 0x000E
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN14
-		Internal Connector Type: None
-		External Reference Designator: PS/2 Mouse
-		External Connector Type: Circular DIN-8 male
-		Port Type: Mouse Port
-Handle 0x000F
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN4
-		Internal Connector Type: None
-		External Reference Designator: USB
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0010
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN13
-		Internal Connector Type: None
-		External Reference Designator: Infrared
-		External Connector Type: Infrared
-		Port Type: Other
-Handle 0x0011
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: SM1
-		Internal Connector Type: None
-		External Reference Designator: Lucent Modem
-		External Connector Type: RJ-11
-		Port Type: Modem Port
-Handle 0x0012
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: 2 CardBus Slots
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Unknown
-		Length: Other
-		ID: Adapter 0, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Zoom Video is supported
-Handle 0x0013
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: 2 CardBus Slots (Dock)
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Unknown
-		Length: Other
-		ID: Adapter 0, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-Handle 0x0014
-	DMI type 10, 8 bytes.
-	On Board Device 1 Information
-		Type: Video
-		Status: Disabled
-		Description: Video (NeoMagic NM2200)
-	On Board Device 2 Information
-		Type: Sound
-		Status: Disabled
-		Description: ESS 1946
-Handle 0x0015
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: Intel 440BX NoteBook
-		String 2: IBM ThinkPad
-Handle 0x0016
-	DMI type 12, 5 bytes.
-	System Configuration Options
-Handle 0x0017
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 1 GB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x0018
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x0017
-		Error Information Handle: No Error
-		Total Width: 32 bits
-		Data Width: 32 bits
-		Size: 128 MB
-		Form Factor: DIMM
-		Set: 1
-		Locator: CN24
-		Bank Locator: Bank 0
-		Type: DRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-Handle 0x0019
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x0017
-		Error Information Handle: No Error
-		Total Width: 32 bits
-		Data Width: 32 bits
-		Size: 128 MB
-		Form Factor: DIMM
-		Set: 1
-		Locator: CN25
-		Bank Locator: Bank 1
-		Type: DRAM
-		Type Detail: Synchronous
-		Speed: Unknown
-Handle 0x001A
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x000100003FF
-		Range Size: 262145 kB
-		Physical Array Handle: 0x0017
-		Partition Width: 0
-Handle 0x001B
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x00007FFFFFF
-		Range Size: 128 MB
-		Physical Device Handle: 0x0018
-		Memory Array Mapped Address Handle: 0x001A
-		Partition Row Position: 2
-Handle 0x001C
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00008000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 128 MB
-		Physical Device Handle: 0x0019
-		Memory Array Mapped Address Handle: 0x001A
-		Partition Row Position: 2
-Handle 0x001D
-	DMI type 21, 7 bytes.
-	Built-in Pointing Device
-		Type: Mouse
-		Interface: PS/2
-		Buttons: 2
-Handle 0x001E
-	DMI type 32, 20 bytes.
-	System Boot Information
-		Status: <OUT OF SPEC>
-Handle 0x001F
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Laptop.IBM-Thinkpad-R40 b/test/dmidecode.Laptop.IBM-Thinkpad-R40
deleted file mode 100644
index fd78ba09..00000000
--- a/test/dmidecode.Laptop.IBM-Thinkpad-R40
+++ /dev/null
@@ -1,470 +0,0 @@
-# dmidecode 2.5 (=> Resolution: 1400x1050)
-SMBIOS 2.31 present.
-53 structures occupying 1832 bytes.
-Table at 0x000E0010.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: IBM
-		Version: 1PET49WW (1.17 )
-		Release Date: 10/13/2003
-		Address: 0xDC000
-		Runtime Size: 144 kB
-		ROM Size: 1024 kB
-		Characteristics:
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			ESCD support is available
-			Boot from CD is supported
-			Selectable boot is supported
-			EDD is supported
-			3.5"/720 KB floppy services are supported (int 13h)
-			Print screen service is supported (int 5h)
-			8042 keyboard services are supported (int 9h)
-			Serial services are supported (int 14h)
-			Printer services are supported (int 17h)
-			CGA/mono video services are supported (int 10h)
-			ACPI is supported
-			USB legacy is supported
-			AGP is supported
-			LS-120 boot is supported
-			BIOS boot specification is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: IBM
-		Product Name: 2722DG1
-		Version: Not Available
-		Serial Number: KBK8642
-		UUID: 7933F501-464F-11CB-9242-9E2D9F5A2DDF
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: IBM
-		Product Name: 2722DG1
-		Version: Not Available
-		Serial Number: 1Z7UH37C724
-Handle 0x0003
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: IBM
-		Type: Notebook
-		Lock: Not Present
-		Version: Not Available
-		Serial Number: Not Available
-		Asset Tag: No Asset Information
-		Boot-up State: Unknown
-		Power Supply State: Unknown
-		Thermal State: Unknown
-		Security Status: Unknown
-		OEM Information: 0x00000000
-Handle 0x0004
-	DMI type 126, 17 bytes.
-	Inactive
-Handle 0x0005
-	DMI type 126, 17 bytes.
-	Inactive
-Handle 0x0006
-	DMI type 4, 35 bytes.
-	Processor Information
-		Socket Designation: None
-		Type: Central Processor
-		Family: Itanium 2
-		Manufacturer: GenuineIntel
-		ID: 95 06 00 00 BF F9 E9 A7
-		Version: Intel(R) Pentium(R) M processor
-		Voltage: 1.5 V
-		External Clock: 400 MHz
-		Max Speed: 1500 MHz
-		Current Speed: 1500 MHz
-		Status: Populated, Enabled
-		Upgrade: None
-		L1 Cache Handle: 0x000A
-		L2 Cache Handle: 0x000B
-		L3 Cache Handle: Not Provided
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0007
-	DMI type 5, 20 bytes.
-	Memory Controller Information
-		Error Detecting Method: None
-		Error Correcting Capabilities:
-			None
-		Supported Interleave: One-way Interleave
-		Current Interleave: One-way Interleave
-		Maximum Memory Module Size: 1024 MB
-		Maximum Total Memory Size: 2048 MB
-		Supported Speeds:
-			Other
-		Supported Memory Types:
-			DIMM
-			SDRAM
-		Memory Module Voltage: 2.9 V
-		Associated Memory Slots: 2
-			0x0008
-			0x0009
-		Enabled Error Correcting Capabilities:
-			None
-Handle 0x0008
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM Slot 1
-		Bank Connections: 0 1
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 512 MB (Double-bank Connection)
-		Enabled Size: 512 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0009
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM Slot 2
-		Bank Connections: 2 3
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 512 MB (Double-bank Connection)
-		Enabled Size: 512 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x000A
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: Internal L1 Cache
-		Configuration: Enabled, Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 32 KB
-		Maximum Size: 32 KB
-		Supported SRAM Types:
-			Synchronous
-		Installed SRAM Type: Synchronous
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Other
-		Associativity: 8-way Set-associative
-Handle 0x000B
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: Internal L2 Cache
-		Configuration: Enabled, Socketed, Level 2
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 1024 KB
-		Maximum Size: 1024 KB
-		Supported SRAM Types:
-			Burst
-		Installed SRAM Type: Burst
-		Speed: Unknown
-		Error Correction Type: Multi-bit ECC
-		System Type: Unified
-		Associativity: 8-way Set-associative
-Handle 0x000C
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x000D
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: Infrared
-		External Connector Type: Infrared
-		Port Type: Other
-Handle 0x000E
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x000F
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0010
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0011
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0012
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: Line-In Jack
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x0013
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0014
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: Microphone Jack
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x0015
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: Headphone Jack
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x0016
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: S-Video-Out
-		External Connector Type: Other
-		Port Type: Video Port
-Handle 0x0017
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0018
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: Modem
-		External Connector Type: RJ-11
-		Port Type: Modem Port
-Handle 0x0019
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: Ethernet
-		External Connector Type: RJ-45
-		Port Type: Network Port
-Handle 0x001A
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: USB 1
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x001B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: USB 2
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x001C
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x001D
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x001E
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x001F
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: IEEE1394
-		External Connector Type: IEEE 1394
-		Port Type: Firewire (IEEE P1394)
-Handle 0x0020
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: CardBus Slot 1
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Available
-		Length: Other
-		ID: Adapter 0, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Zoom Video is supported
-			Modem ring resume is supported
-			PME signal is supported
-			Hot-plug devices are supported
-Handle 0x0021
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: Mini-PCI Slot 1
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Other
-		ID: 1
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-			SMBus signal is supported
-Handle 0x0022
-	DMI type 126, 13 bytes.
-	Inactive
-Handle 0x0023
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Other
-		Status: Disabled
-		Description: IBM Embedded Security hardware
-Handle 0x0024
-	DMI type 13, 22 bytes.
-	BIOS Language Information
-		Installable Languages: 1
-			enUS
-		Currently Installed Language: enUS
-Handle 0x0025
-	DMI type 15, 25 bytes.
-	System Event Log
-		Area Length: 16 bytes
-		Header Start Offset: 0x0000
-		Header Length: 16 bytes
-		Data Start Offset: 0x0010
-		Access Method: General-purpose non-volatile data functions
-		Access Address: 0x0000
-		Status: Valid, Not Full
-		Change Token: 0x00000008
-		Header Format: Type 1
-		Supported Log Type Descriptors: 1
-		Descriptor 1: POST error
-		Data Format 1: POST results bitmap
-Handle 0x0026
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 1 GB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x0027
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0026
-		Error Information Handle: No Error
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 512 MB
-		Form Factor: SODIMM
-		Set: None
-		Locator: DIMM 1
-		Bank Locator: Bank 0/1
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: Unknown
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0028
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0026
-		Error Information Handle: No Error
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 512 MB
-		Form Factor: SODIMM
-		Set: None
-		Locator: DIMM 2
-		Bank Locator: Bank 2/3
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: Unknown
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0029
-	DMI type 18, 23 bytes.
-	32-bit Memory Error Information
-		Type: OK
-		Granularity: Unknown
-		Operation: Unknown
-		Vendor Syndrome: Unknown
-		Memory Array Address: Unknown
-		Device Address: Unknown
-		Resolution: Unknown
-Handle 0x002A
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0003FFFFFFF
-		Range Size: 1 GB
-		Physical Array Handle: 0x0026
-		Partition Width: 0
-Handle 0x002B
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Device Handle: 0x0027
-		Memory Array Mapped Address Handle: 0x002A
-		Partition Row Position: 1
-Handle 0x002C
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00020000000
-		Ending Address: 0x0003FFFFFFF
-		Range Size: 512 MB
-		Physical Device Handle: 0x0028
-		Memory Array Mapped Address Handle: 0x002A
-		Partition Row Position: 1
-Handle 0x002D
-	DMI type 21, 7 bytes.
-	Built-in Pointing Device
-		Type: Track Point
-		Interface: PS/2
-		Buttons: 3
-Handle 0x002E
-	DMI type 21, 7 bytes.
-	Built-in Pointing Device
-		Type: Touch Pad
-		Interface: PS/2
-		Buttons: 0
-Handle 0x002F
-	DMI type 24, 5 bytes.
-	Hardware Security
-		Power-On Password Status: Disabled
-		Keyboard Password Status: Disabled
-		Administrator Password Status: Enabled
-		Front Panel Reset Status: Unknown
-Handle 0x0030
-	DMI type 32, 11 bytes.
-	System Boot Information
-		Status: No errors detected
-Handle 0x0031
-	DMI type 131, 102 bytes.
-	OEM-specific Type
-		Header and Data:
-			83 66 31 00 01 00 00 00 00 01 72 03 40 00 AE 80
-			00 02 00 00 00 00 00 2A 00 40 2A 00 00 00 00 00
-			00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-			00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-			00 00 00 00 00 00 00 00 00 00 16 00 80 16 00 00
-			00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-			00 00 00 00 00 00
-		Strings:
-			IBMCFGDATA
-Handle 0x0032
-	DMI type 132, 7 bytes.
-	OEM-specific Type
-		Header and Data:
-			84 07 32 00 01 D8 36
-Handle 0x0033
-	DMI type 133, 5 bytes.
-	OEM-specific Type
-		Header and Data:
-			85 05 33 00 01
-		Strings:
-			KHOIHGIUCCHHII
-Handle 0x0034
-	DMI type 127, 4 bytes.
-	End Of Table
-
diff --git a/test/dmidecode.Laptop.IBM-Thinkpad-T41p b/test/dmidecode.Laptop.IBM-Thinkpad-T41p
deleted file mode 100644
index 7e1f0133..00000000
--- a/test/dmidecode.Laptop.IBM-Thinkpad-T41p
+++ /dev/null
@@ -1,533 +0,0 @@
-# dmidecode 2.5 (=> Resolution: 1400x1050)
-SMBIOS 2.33 present.
-61 structures occupying 2127 bytes.
-Table at 0x000E0010.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: IBM
-		Version: 1RETD4WW (3.08a)
-		Release Date: 08/05/2004
-		Address: 0xDC000
-		Runtime Size: 144 kB
-		ROM Size: 1024 kB
-		Characteristics:
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			ESCD support is available
-			Boot from CD is supported
-			Selectable boot is supported
-			EDD is supported
-			3.5"/720 KB floppy services are supported (int 13h)
-			Print screen service is supported (int 5h)
-			8042 keyboard services are supported (int 9h)
-			Serial services are supported (int 14h)
-			Printer services are supported (int 17h)
-			CGA/mono video services are supported (int 10h)
-			ACPI is supported
-			USB legacy is supported
-			AGP is supported
-			BIOS boot specification is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: IBM
-		Product Name: 2373GHG
-		Version: ThinkPad T41p
-		Serial Number: 9994PGZ
-		UUID: 796DE681-475C-11CB-A07F-DD87E54CD6AF
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: IBM
-		Product Name: 2373GHG
-		Version: Not Available
-		Serial Number: J1V9448221F
-Handle 0x0003
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: IBM
-		Type: Notebook
-		Lock: Not Present
-		Version: Not Available
-		Serial Number: Not Available
-		Asset Tag: No Asset Information
-		Boot-up State: Unknown
-		Power Supply State: Unknown
-		Thermal State: Unknown
-		Security Status: Unknown
-		OEM Information: 0x00000000
-Handle 0x0004
-	DMI type 126, 17 bytes.
-	Inactive
-Handle 0x0005
-	DMI type 126, 17 bytes.
-	Inactive
-Handle 0x0006
-	DMI type 4, 35 bytes.
-	Processor Information
-		Socket Designation: None
-		Type: Central Processor
-		Family: Pentium M
-		Manufacturer: GenuineIntel
-		ID: 95 06 00 00 BF F9 E9 A7
-		Signature: Type 0, Family 6, Model 9, Stepping 5
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			CLFSH (CLFLUSH instruction supported)
-			DS (Debug store)
-			ACPI (ACPI supported)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-			SSE2 (Streaming SIMD extensions 2)
-			TM (Thermal monitor supported)
-			SBF (Signal break on FERR)
-		Version: Intel(R) Pentium(R) M processor
-		Voltage: 1.5 V
-		External Clock: 400 MHz
-		Max Speed: 1700 MHz
-		Current Speed: 1700 MHz
-		Status: Populated, Enabled
-		Upgrade: None
-		L1 Cache Handle: 0x000A
-		L2 Cache Handle: 0x000B
-		L3 Cache Handle: Not Provided
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0007
-	DMI type 5, 20 bytes.
-	Memory Controller Information
-		Error Detecting Method: None
-		Error Correcting Capabilities:
-			None
-		Supported Interleave: One-way Interleave
-		Current Interleave: One-way Interleave
-		Maximum Memory Module Size: 1024 MB
-		Maximum Total Memory Size: 2048 MB
-		Supported Speeds:
-			Other
-		Supported Memory Types:
-			DIMM
-			SDRAM
-		Memory Module Voltage: 2.9 V
-		Associated Memory Slots: 2
-			0x0008
-			0x0009
-		Enabled Error Correcting Capabilities:
-			None
-Handle 0x0008
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM Slot 1
-		Bank Connections: 0 1
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 512 MB (Double-bank Connection)
-		Enabled Size: 512 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0009
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM Slot 2
-		Bank Connections: 2 3
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: Not Installed (Single-bank Connection)
-		Enabled Size: Not Installed (Single-bank Connection)
-		Error Status: OK
-Handle 0x000A
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: Internal L1 Cache
-		Configuration: Enabled, Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 32 KB
-		Maximum Size: 32 KB
-		Supported SRAM Types:
-			Synchronous
-		Installed SRAM Type: Synchronous
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Other
-		Associativity: 8-way Set-associative
-Handle 0x000B
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: Internal L2 Cache
-		Configuration: Enabled, Socketed, Level 2
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 1024 KB
-		Maximum Size: 1024 KB
-		Supported SRAM Types:
-			Burst
-		Installed SRAM Type: Burst
-		Speed: Unknown
-		Error Correction Type: Multi-bit ECC
-		System Type: Unified
-		Associativity: 8-way Set-associative
-Handle 0x000C
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x000D
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: Infrared
-		External Connector Type: Infrared
-		Port Type: Other
-Handle 0x000E
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: Parallel
-		External Connector Type: DB-25 female
-		Port Type: Parallel Port ECP/EPP
-Handle 0x000F
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: External Monitor
-		External Connector Type: DB-15 female
-		Port Type: Video Port
-Handle 0x0010
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0011
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0012
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0013
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0014
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0015
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: Microphone Jack
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x0016
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: Headphone Jack
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x0017
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: S-Video-Out
-		External Connector Type: Other
-		Port Type: Video Port
-Handle 0x0018
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0019
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: Modem
-		External Connector Type: RJ-11
-		Port Type: Modem Port
-Handle 0x001A
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: Ethernet
-		External Connector Type: RJ-45
-		Port Type: Network Port
-Handle 0x001B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: USB 1
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x001C
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: USB 2
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x001D
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x001E
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x001F
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0020
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0021
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0022
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: CardBus Slot 1
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Available
-		Length: Other
-		ID: Adapter 0, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Zoom Video is supported
-			Modem ring resume is supported
-			PME signal is supported
-			Hot-plug devices are supported
-Handle 0x0023
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: CardBus Slot 2
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Available
-		Length: Other
-		ID: Adapter 1, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Zoom Video is supported
-			Modem ring resume is supported
-			PME signal is supported
-			Hot-plug devices are supported
-Handle 0x0024
-	DMI type 126, 13 bytes.
-	Inactive
-Handle 0x0025
-	DMI type 126, 13 bytes.
-	Inactive
-Handle 0x0026
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: Mini-PCI Slot 1
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Other
-		ID: 1
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-			SMBus signal is supported
-Handle 0x0027
-	DMI type 126, 13 bytes.
-	Inactive
-Handle 0x0028
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Other
-		Status: Disabled
-		Description: IBM Embedded Security hardware
-Handle 0x0029
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: IBM ThinkPad Embedded Controller -[1RHT70WW-3.03    ]-
-Handle 0x002A
-	DMI type 13, 22 bytes.
-	BIOS Language Information
-		Installable Languages: 1
-			enUS
-		Currently Installed Language: enUS
-Handle 0x002B
-	DMI type 15, 25 bytes.
-	System Event Log
-		Area Length: 0 bytes
-		Header Start Offset: 0x0000
-		Header Length: 16 bytes
-		Data Start Offset: 0x0010
-		Access Method: General-purpose non-volatile data functions
-		Access Address: 0x0000
-		Status: Invalid, Not Full
-		Change Token: 0x00000000
-		Header Format: Type 1
-		Supported Log Type Descriptors: 1
-		Descriptor 1: POST error
-		Data Format 1: POST results bitmap
-Handle 0x002C
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 1 GB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x002D
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x002C
-		Error Information Handle: No Error
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 512 MB
-		Form Factor: SODIMM
-		Set: None
-		Locator: DIMM 1
-		Bank Locator: Bank 0/1
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: Unknown
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x002E
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x002C
-		Error Information Handle: No Error
-		Total Width: Unknown
-		Data Width: Unknown
-		Size: No Module Installed
-		Form Factor: SODIMM
-		Set: None
-		Locator: DIMM 2
-		Bank Locator: Bank 2/3
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: Unknown
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x002F
-	DMI type 18, 23 bytes.
-	32-bit Memory Error Information
-		Type: OK
-		Granularity: Unknown
-		Operation: Unknown
-		Vendor Syndrome: Unknown
-		Memory Array Address: Unknown
-		Device Address: Unknown
-		Resolution: Unknown
-Handle 0x0030
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Array Handle: 0x002C
-		Partition Width: 0
-Handle 0x0031
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Device Handle: 0x002D
-		Memory Array Mapped Address Handle: 0x0030
-		Partition Row Position: 1
-Handle 0x0032
-	DMI type 126, 19 bytes.
-	Inactive
-Handle 0x0033
-	DMI type 21, 7 bytes.
-	Built-in Pointing Device
-		Type: Track Point
-		Interface: PS/2
-		Buttons: 3
-Handle 0x0034
-	DMI type 21, 7 bytes.
-	Built-in Pointing Device
-		Type: Touch Pad
-		Interface: PS/2
-		Buttons: 0
-Handle 0x0035
-	DMI type 24, 5 bytes.
-	Hardware Security
-		Power-On Password Status: Disabled
-		Keyboard Password Status: Disabled
-		Administrator Password Status: Disabled
-		Front Panel Reset Status: Unknown
-Handle 0x0036
-	DMI type 32, 11 bytes.
-	System Boot Information
-		Status: No errors detected
-Handle 0x0037
-	DMI type 131, 102 bytes.
-	OEM-specific Type
-		Header and Data:
-			83 66 37 00 01 00 00 00 00 01 72 03 40 00 AE 80
-			00 02 00 00 00 00 00 2A 00 40 2A 00 00 00 00 00
-			00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-			00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-			00 00 00 00 00 00 00 00 00 00 16 00 80 16 00 00
-			00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-			00 00 00 00 00 00
-		Strings:
-			IBMCFGDATA
-Handle 0x0038
-	DMI type 131, 17 bytes.
-	OEM-specific Type
-		Header and Data:
-			83 11 38 00 01 02 03 FF FF 1F 00 00 00 00 00 02
-			00
-		Strings:
-			BOOTINF 20h
-			BOOTDEV 21h
-			KEYPTRS 23h
-Handle 0x0039
-	DMI type 132, 7 bytes.
-	OEM-specific Type
-		Header and Data:
-			84 07 39 00 01 D8 36
-Handle 0x003A
-	DMI type 133, 5 bytes.
-	OEM-specific Type
-		Header and Data:
-			85 05 3A 00 01
-		Strings:
-			KHOIHGIUCCHHII
-Handle 0x003B
-	DMI type 126, 13 bytes.
-	Inactive
-Handle 0x003C
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Laptop.IBM-Thinkpad-X31 b/test/dmidecode.Laptop.IBM-Thinkpad-X31
deleted file mode 100644
index 95ef5b07..00000000
--- a/test/dmidecode.Laptop.IBM-Thinkpad-X31
+++ /dev/null
@@ -1,524 +0,0 @@
-# dmidecode 2.4
-SMBIOS 2.33 present.
-57 structures occupying 2013 bytes.
-Table at 0x000E0010.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: IBM
-		Version: 1QET73WW (2.11 )
-		Release Date: 02/13/2004
-		Address: 0xDC000
-		Runtime Size: 144 kB
-		ROM Size: 1024 kB
-		Characteristics:
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			ESCD support is available
-			Boot from CD is supported
-			Selectable boot is supported
-			EDD is supported
-			3.5"/720 KB floppy services are supported (int 13h)
-			Print screen service is supported (int 5h)
-			8042 keyboard services are supported (int 9h)
-			Serial services are supported (int 14h)
-			Printer services are supported (int 17h)
-			CGA/mono video services are supported (int 10h)
-			ACPI is supported
-			USB legacy is supported
-			AGP is supported
-			BIOS boot specification is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: IBM
-		Product Name: 2672IEV
-		Version: ThinkPad X31
-		Serial Number: 99WTXBF
-		UUID: 9215C801-469A-11CB-9D02-892C73EE32E8
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: IBM
-		Product Name: 2672IEV
-		Version: Not Available
-		Serial Number: J1T7Y3AH1H6
-Handle 0x0003
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: IBM
-		Type: Notebook
-		Lock: Not Present
-		Version: Not Available
-		Serial Number: Not Available
-		Asset Tag: No Asset Information
-		Boot-up State: Unknown
-		Power Supply State: Unknown
-		Thermal State: Unknown
-		Security Status: Unknown
-		OEM Information: 0x00000000
-Handle 0x0004
-	DMI type 126, 17 bytes.
-	Inactive
-Handle 0x0005
-	DMI type 126, 17 bytes.
-	Inactive
-Handle 0x0006
-	DMI type 4, 35 bytes.
-	Processor Information
-		Socket Designation: None
-		Type: Central Processor
-		Family: Pentium M
-		Manufacturer: GenuineIntel
-		ID: 95 06 00 00 BF F9 E9 A7
-		Signature: Type 0, Family 6, Model 9, Stepping 5
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			CLFSH (CLFLUSH instruction supported)
-			DS (Debug store)
-			ACPI (ACPI supported)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-			SSE2 (Streaming SIMD extensions 2)
-			TM (Thermal monitor supported)
-			SBF (Signal break on FERR)
-		Version: Intel(R) Pentium(R) M processor
-		Voltage: 1.5 V
-		External Clock: 400 MHz
-		Max Speed: 1400 MHz
-		Current Speed: 1400 MHz
-		Status: Populated, Enabled
-		Upgrade: None
-		L1 Cache Handle: 0x000A
-		L2 Cache Handle: 0x000B
-		L3 Cache Handle: Not Provided
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0007
-	DMI type 5, 20 bytes.
-	Memory Controller Information
-		Error Detecting Method: None
-		Error Correcting Capabilities:
-			None
-		Supported Interleave: One-way Interleave
-		Current Interleave: One-way Interleave
-		Maximum Memory Module Size: 1024 MB
-		Maximum Total Memory Size: 2048 MB
-		Supported Speeds:
-			Other
-		Supported Memory Types:
-			DIMM
-			SDRAM
-		Memory Module Voltage: 2.9 V
-		Associated Memory Slots: 2
-			0x0008
-			0x0009
-		Enabled Error Correcting Capabilities:
-			None
-Handle 0x0008
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM Slot 1
-		Bank Connections: 0 1
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 512 MB (Double-bank Connection)
-		Enabled Size: 512 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0009
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM Slot 2
-		Bank Connections: 2 3
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 512 MB (Double-bank Connection)
-		Enabled Size: 512 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x000A
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: Internal L1 Cache
-		Configuration: Enabled, Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 32 KB
-		Maximum Size: 32 KB
-		Supported SRAM Types:
-			Synchronous
-		Installed SRAM Type: Synchronous
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Other
-		Associativity: 8-way Set-associative
-Handle 0x000B
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: Internal L2 Cache
-		Configuration: Enabled, Socketed, Level 2
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 1024 KB
-		Maximum Size: 1024 KB
-		Supported SRAM Types:
-			Burst
-		Installed SRAM Type: Burst
-		Speed: Unknown
-		Error Correction Type: Multi-bit ECC
-		System Type: Unified
-		Associativity: 8-way Set-associative
-Handle 0x000C
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x000D
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: Infrared
-		External Connector Type: Infrared
-		Port Type: Other
-Handle 0x000E
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: Parallel
-		External Connector Type: DB-25 female
-		Port Type: Parallel Port ECP/EPP
-Handle 0x000F
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: External Monitor
-		External Connector Type: DB-15 female
-		Port Type: Video Port
-Handle 0x0010
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0011
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0012
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0013
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: Line-In Jack
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x0014
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x0015
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: Microphone Jack
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x0016
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: Headphone Jack
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x0017
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: Modem
-		External Connector Type: RJ-11
-		Port Type: Modem Port
-Handle 0x0018
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: Ethernet
-		External Connector Type: RJ-45
-		Port Type: Network Port
-Handle 0x0019
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: USB 1
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x001A
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: USB 2
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x001B
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x001C
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x001D
-	DMI type 126, 9 bytes.
-	Inactive
-Handle 0x001E
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Available
-		Internal Connector Type: None
-		External Reference Designator: IEEE1394
-		External Connector Type: IEEE 1394
-		Port Type: Firewire (IEEE P1394)
-Handle 0x001F
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: CardBus Slot 1
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Available
-		Length: Other
-		ID: Adapter 0, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Zoom Video is supported
-			Modem ring resume is supported
-			PME signal is supported
-			Hot-plug devices are supported
-Handle 0x0020
-	DMI type 126, 13 bytes.
-	Inactive
-Handle 0x0021
-	DMI type 126, 13 bytes.
-	Inactive
-Handle 0x0022
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: Compact Flash Slot 1
-		Type: 32-bit Other
-		Current Usage: Available
-		Length: Other
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-			Hot-plug devices are supported
-Handle 0x0023
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: Mini-PCI Slot 1
-		Type: 32-bit PCI
-		Current Usage: Available
-		Length: Other
-		ID: 1
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-			SMBus signal is supported
-Handle 0x0024
-	DMI type 126, 13 bytes.
-	Inactive
-Handle 0x0025
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Other
-		Status: Disabled
-		Description: IBM Embedded Security hardware
-Handle 0x0026
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: IBM ThinkPad Embedded Controller -[1QHT16WW-1.03    ]-
-Handle 0x0027
-	DMI type 13, 22 bytes.
-	BIOS Language Information
-		Installable Languages: 1
-			enUS
-		Currently Installed Language: enUS
-Handle 0x0028
-	DMI type 15, 25 bytes.
-	System Event Log
-		Area Length: 0 bytes
-		Header Start Offset: 0x0000
-		Header Length: 16 bytes
-		Data Start Offset: 0x0010
-		Access Method: General-purpose non-volatile data functions
-		Access Address: 0x0000
-		Status: Invalid, Not Full
-		Change Token: 0x00000000
-		Header Format: Type 1
-		Supported Log Type Descriptors: 1
-		Descriptor 1: POST error
-		Data Format 1: POST results bitmap
-Handle 0x0029
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 1 GB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x002A
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0029
-		Error Information Handle: No Error
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 512 MB
-		Form Factor: SODIMM
-		Set: None
-		Locator: DIMM 1
-		Bank Locator: Bank 0/1
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: Unknown
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x002B
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0029
-		Error Information Handle: No Error
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 512 MB
-		Form Factor: SODIMM
-		Set: None
-		Locator: DIMM 2
-		Bank Locator: Bank 2/3
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: Unknown
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x002C
-	DMI type 18, 23 bytes.
-	32-bit Memory Error Information
-		Type: OKBad Read
-		Granularity: Unknown
-		Operation: Unknown
-		Vendor Syndrome: Unknown
-		Memory Array Address: Unknown
-		Device Address: Unknown
-		Resolution: Unknown
-Handle 0x002D
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0003FFFFFFF
-		Range Size: 1 GB
-		Physical Array Handle: 0x0029
-		Partition Width: 0
-Handle 0x002E
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Device Handle: 0x002A
-		Memory Array Mapped Address Handle: 0x002D
-		Partition Row Position: 1
-Handle 0x002F
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00020000000
-		Ending Address: 0x0003FFFFFFF
-		Range Size: 512 MB
-		Physical Device Handle: 0x002B
-		Memory Array Mapped Address Handle: 0x002D
-		Partition Row Position: 1
-Handle 0x0030
-	DMI type 21, 7 bytes.
-	Built-in Pointing Device
-		Type: Track Point
-		Interface: PS/2
-		Buttons: 3
-Handle 0x0031
-	DMI type 126, 7 bytes.
-	Inactive
-Handle 0x0032
-	DMI type 24, 5 bytes.
-	Hardware Security
-		Power-On Password Status: Disabled
-		Keyboard Password Status: Disabled
-		Administrator Password Status: Disabled
-		Front Panel Reset Status: Unknown
-Handle 0x0033
-	DMI type 32, 11 bytes.
-	System Boot Information
-		Status: No errors detected
-Handle 0x0034
-	DMI type 131, 102 bytes.
-	OEM-specific Type
-		Header and Data:
-			83 66 34 00 01 00 00 00 00 01 72 03 40 00 AE 80
-			00 02 00 00 00 00 00 2A 00 40 2A 00 00 00 00 00
-			00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-			00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-			00 00 00 00 00 00 00 00 00 00 16 00 80 16 00 00
-			00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-			00 00 00 00 00 00
-		Strings:
-			IBMCFGDATA
-Handle 0x0035
-	DMI type 131, 17 bytes.
-	OEM-specific Type
-		Header and Data:
-			83 11 35 00 01 02 03 FE 1F 00 00 00 00 00 00 02
-			00
-		Strings:
-			BOOTINF 20h
-			BOOTDEV 21h
-			KEYPTRS 23h
-Handle 0x0036
-	DMI type 132, 7 bytes.
-	OEM-specific Type
-		Header and Data:
-			84 07 36 00 01 D8 36
-Handle 0x0037
-	DMI type 133, 5 bytes.
-	OEM-specific Type
-		Header and Data:
-			85 05 37 00 01
-		Strings:
-			KHOIHGIUCCHHII
-Handle 0x0038
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Laptop.Maxdata-Pro-6100X b/test/dmidecode.Laptop.Maxdata-Pro-6100X
deleted file mode 100644
index d1858943..00000000
--- a/test/dmidecode.Laptop.Maxdata-Pro-6100X
+++ /dev/null
@@ -1,336 +0,0 @@
-# dmidecode 2.5 (=> Resolution: 1024x768) (=> Diagonal_size: 15)
-SMBIOS 2.31 present.
-27 structures occupying 1084 bytes.
-Table at 0x000DF810.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: MAXDATA
-		Version: M3B11   
-		Release Date: 09/15/2004
-		Address: 0xE5FA0
-		Runtime Size: 106592 bytes
-		ROM Size: 512 kB
-		Characteristics:
-			ISA is supported
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			ESCD support is available
-			Boot from CD is supported
-			3.5"/720 KB floppy services are supported (int 13h)
-			Print screen service is supported (int 5h)
-			8042 keyboard services are supported (int 9h)
-			Serial services are supported (int 14h)
-			Printer services are supported (int 17h)
-			ACPI is supported
-			USB legacy is supported
-			AGP is supported
-			Smart battery is supported
-			BIOS boot specification is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: MAXDATA
-		Product Name: Pro 6100X
-		Version: 5123660003
-		Serial Number: 45648770001
-		UUID: F24D4963-BDCB-4AFE-B53B-6BB31B298A9D
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: MAXDATA
-		Product Name: Pro 6100X
-		Version: WB002                   
-		Serial Number: ZW6TFCCWI4390116......
-Handle 0x0003
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: QUANTA                          
-		Type: Notebook
-		Lock: Not Present
-		Version: WB002                   
-		Serial Number: ZW6TFCCWI4390116......
-		Asset Tag:          
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-		OEM Information: 0x00001234
-Handle 0x0004
-	DMI type 4, 35 bytes.
-	Processor Information
-		Socket Designation: uFCPGA2
-		Type: Central Processor
-		Family: Unknown
-		Manufacturer: Intel
-		ID: D6 06 00 00 BF F9 E9 AF
-		Version: Intel(R) Pentium(R) M processor
-		Voltage: 1.2 V
-		External Clock: 400 MHz
-		Max Speed: 1600 MHz
-		Current Speed: 1600 MHz
-		Status: Populated, Enabled
-		Upgrade: ZIF Socket
-		L1 Cache Handle: 0x0008
-		L2 Cache Handle: 0x0009
-		L3 Cache Handle: Not Provided
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0005
-	DMI type 5, 20 bytes.
-	Memory Controller Information
-		Error Detecting Method: None
-		Error Correcting Capabilities:
-			None
-		Supported Interleave: One-way Interleave
-		Current Interleave: One-way Interleave
-		Maximum Memory Module Size: 1024 MB
-		Maximum Total Memory Size: 2048 MB
-		Supported Speeds:
-			60 ns
-		Supported Memory Types:
-			DIMM
-		Memory Module Voltage: 3.3 V
-		Associated Memory Slots: 2
-			0x0006
-			0x0007
-		Enabled Error Correcting Capabilities:
-			None
-Handle 0x0006
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM 1
-		Bank Connections: 0 1
-		Current Speed: 75 ns
-		Type: DIMM SDRAM
-		Installed Size: Not Installed (Single-bank Connection)
-		Enabled Size: Not Installed (Single-bank Connection)
-		Error Status: OK
-Handle 0x0007
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DIMM 2
-		Bank Connections: 2 3
-		Current Speed: 75 ns
-		Type: DIMM SDRAM
-		Installed Size: 512 MB (Double-bank Connection)
-		Enabled Size: 512 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0008
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L1 Cache
-		Configuration: Enabled, Not Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 32 KB
-		Maximum Size: 32 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Asynchronous
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Unknown
-		Associativity: Unknown
-Handle 0x0009
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L2 Cache
-		Configuration: Enabled, Not Socketed, Level 2
-		Operational Mode: Write Back
-		Location: External
-		Installed Size: 2048 KB
-		Maximum Size: 2048 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Burst
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Unknown
-		Associativity: Unknown
-Handle 0x000A
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: LPT 1
-		Internal Connector Type: None
-		External Reference Designator: Parallel
-		External Connector Type: DB-25 female
-		Port Type: Parallel Port ECP/EPP
-Handle 0x000B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: U28
-		Internal Connector Type: None
-		External Reference Designator: PS/2 Mouse
-		External Connector Type: Circular DIN-8 male
-		Port Type: Keyboard Port
-Handle 0x000C
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCMCIA socket 0
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Unknown
-		Length: Long
-		ID: Adapter 0, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Modem ring resume is supported
-			PME signal is supported
-			Hot-plug devices are supported
-Handle 0x000D
-	DMI type 10, 10 bytes.
-	On Board Device 1 Information
-		Type: Video
-		Status: Disabled
-		Description: Montara-GME
-	On Board Device 2 Information
-		Type: Sound
-		Status: Disabled
-		Description: AC97 Audio
-	On Board Device 3 Information
-		Type: Other
-		Status: Disabled
-		Description: TI TSB43AB21 IEEE-1394 Controller
-Handle 0x000E
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: SMBIOS 2.3
-		String 2: Customer Reference Platform
-Handle 0x000F
-	DMI type 12, 5 bytes.
-	System Configuration Options
-		Option 1: No Jumper On This Platform.
-Handle 0x0010
-	DMI type 15, 29 bytes.
-	System Event Log
-		Area Length: 0 bytes
-		Header Start Offset: 0x0000
-		Header Length: 16 bytes
-		Data Start Offset: 0x0010
-		Access Method: Memory-mapped physical 32-bit address
-		Access Address: 0x00000000
-		Status: Invalid, Not Full
-		Change Token: 0x00000001
-		Header Format: Type 1
-		Supported Log Type Descriptors: 3
-		Descriptor 1: POST error
-		Data Format 1: POST results bitmap
-		Descriptor 2: Single-bit ECC memory error
-		Data Format 2: Multiple-event
-		Descriptor 3: Multi-bit ECC memory error
-		Data Format 3: Multiple-event
-Handle 0x0011
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 3 GB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x0012
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0011
-		Error Information Handle: No Error
-		Total Width: Unknown
-		Data Width: Unknown
-		Size: No Module Installed
-		Form Factor: DIMM
-		Set: 1
-		Locator: DIMM 0
-		Bank Locator: Bank 0, 1
-		Type: SRAM
-		Type Detail: Synchronous
-		Speed: 333 MHz (3.0 ns)
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0013
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0011
-		Error Information Handle: No Error
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 512 MB
-		Form Factor: DIMM
-		Set: 1
-		Locator: DIMM 1
-		Bank Locator: Bank 2, 3
-		Type: SRAM
-		Type Detail: Synchronous
-		Speed: 333 MHz (3.0 ns)
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0014
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Array Handle: 0x0011
-		Partition Width: 0
-Handle 0x0015
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x000000003FF
-		Range Size: 1 kB
-		Physical Device Handle: 0x0012
-		Memory Array Mapped Address Handle: 0x0014
-		Partition Row Position: 1
-		Interleave Position: 1
-Handle 0x0016
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Device Handle: 0x0013
-		Memory Array Mapped Address Handle: 0x0014
-		Partition Row Position: 1
-		Interleave Position: 1
-Handle 0x0017
-	DMI type 21, 7 bytes.
-	Built-in Pointing Device
-		Type: Mouse
-		Interface: PS/2
-		Buttons: 2
-Handle 0x0018
-	DMI type 22, 26 bytes.
-	Portable Battery
-		Location: Right Side
-		Manufacturer: Sanyo
-		Name: Sanyo
-		Chemistry: Lithium Ion
-		Design Capacity: 4400 mWh
-		Design Voltage: 14800 mV
-		SBDS Version: Bat123
-		Maximum Error: 6%
-		SBDS Serial Number: 04D2
-		SBDS Manufacture Date: 1985-08-25
-		OEM-specific Information: 0x00000000
-Handle 0x0019
-	DMI type 32, 20 bytes.
-	System Boot Information
-		Status: <OUT OF SPEC>
-Handle 0x001A
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Laptop.Maxdata-Pro-7000X b/test/dmidecode.Laptop.Maxdata-Pro-7000X
deleted file mode 100644
index e62f095f..00000000
--- a/test/dmidecode.Laptop.Maxdata-Pro-7000X
+++ /dev/null
@@ -1,416 +0,0 @@
-# dmidecode 2.4 (=> Resolution: 1024x768) (=> Diagonal_size: 15)
-SMBIOS 2.31 present.
-37 structures occupying 1167 bytes.
-Table at 0x000D8010.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: Phoenix Technologies LTD
-		Version: R01-M0Vf  
-		Release Date: 10/23/03  
-		Address: 0xE30A0
-		Runtime Size: 118624 bytes
-		ROM Size: 64 kB
-		Characteristics:
-			ISA is supported
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			ESCD support is available
-			USB legacy is supported
-			Smart battery is supported
-			BIOS boot specification is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: MAXDATA        
-		Product Name: Pro 7000X      
-		Version: 5123660003     
-		Serial Number: 9147XZ1M0140300199KS00        
-		UUID: 948AC960-5122-11D8-A64D-DDFF30894EF0
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: MAXDATA        
-		Product Name: Pro 7000X      
-		Version: Rev.A          
-		Serial Number: 9147XZ1M0140300199KS00        
-Handle 0x0003
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: MAXDATA        
-		Type: Other
-		Lock: Not Present
-		Version: N/A            
-		Serial Number: None           
-		Asset Tag:                                 
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-		OEM Information: 0x00001234
-Handle 0x0004
-	DMI type 4, 35 bytes.
-	Processor Information
-		Socket Designation: U1
-		Type: Central Processor
-		Family: Pentium M
-		Manufacturer: Intel
-		ID: 95 06 00 00 BF F9 E9 A7
-		Signature: Type 0, Family 6, Model 9, Stepping 5
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			CLFSH (CLFLUSH instruction supported)
-			DS (Debug store)
-			ACPI (ACPI supported)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-			SSE2 (Streaming SIMD extensions 2)
-			TM (Thermal monitor supported)
-			SBF (Signal break on FERR)
-		Version: A0
-		Voltage: 3.3 V
-		External Clock: Unknown
-		Max Speed: 500 MHz
-		Current Speed: 1666 MHz
-		Status: Populated, Enabled
-		Upgrade: Slot 1
-		L1 Cache Handle: 0x0008
-		L2 Cache Handle: 0x0009
-		L3 Cache Handle: Not Provided
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0005
-	DMI type 5, 22 bytes.
-	Memory Controller Information
-		Error Detecting Method: None
-		Error Correcting Capabilities:
-			None
-		Supported Interleave: One-way Interleave
-		Current Interleave: One-way Interleave
-		Maximum Memory Module Size: 256 MB
-		Maximum Total Memory Size: 768 MB
-		Supported Speeds:
-			70 ns
-			60 ns
-		Supported Memory Types:
-			FPM
-			EDO
-			DIMM
-			SDRAM
-		Memory Module Voltage: 3.3 V
-		Associated Memory Slots: 3
-			0x0006
-			0x0007
-			0x0008
-		Enabled Error Correcting Capabilities:
-			None
-Handle 0x0006
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: M1
-		Bank Connections: 0 1
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: Not Installed (Single-bank Connection)
-		Enabled Size: Not Installed (Single-bank Connection)
-		Error Status: OK
-Handle 0x0007
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: M2
-		Bank Connections: 2 3
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 512 MB (Double-bank Connection)
-		Enabled Size: 512 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0008
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L1 Cache
-		Configuration: Enabled, Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 32 KB
-		Maximum Size: 32 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Asynchronous
-		Speed: Unknown
-		Error Correction Type: None
-		System Type: Other
-		Associativity: Other
-Handle 0x0009
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L2 Cache
-		Configuration: Enabled, Socketed, Level 2
-		Operational Mode: Write Back
-		Location: External
-		Installed Size: 1024 KB
-		Maximum Size: 1024 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Burst
-		Speed: Unknown
-		Error Correction Type: Single-bit ECC
-		System Type: Unified
-		Associativity: Other
-Handle 0x000A
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J19
-		Internal Connector Type: 9 Pin Dual Inline (pin 10 cut)
-		External Reference Designator: COM 1
-		External Connector Type: DB-9 male
-		Port Type: Serial Port 16550A Compatible
-Handle 0x000B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J23
-		Internal Connector Type: 25 Pin Dual Inline (pin 26 cut)
-		External Reference Designator: Parallel
-		External Connector Type: DB-25 female
-		Port Type: Parallel Port ECP/EPP
-Handle 0x000C
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J11
-		Internal Connector Type: None
-		External Reference Designator: Keyboard
-		External Connector Type: Circular DIN-8 male
-		Port Type: Keyboard Port
-Handle 0x000D
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J12
-		Internal Connector Type: None
-		External Reference Designator: PS/2 Mouse
-		External Connector Type: Circular DIN-8 male
-		Port Type: Keyboard Port
-Handle 0x000E
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI Slot J11
-		Type: 32-bit PCI
-		Current Usage: Unknown
-		Length: Long
-		ID: 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-Handle 0x000F
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI Slot J12
-		Type: 32-bit PCI
-		Current Usage: Unknown
-		Length: Long
-		ID: 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-Handle 0x0010
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI Slot J13
-		Type: 32-bit PCI
-		Current Usage: Unknown
-		Length: Long
-		ID: 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-Handle 0x0011
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Sound
-		Status: Disabled
-		Description: ADI
-Handle 0x0012
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: This is the Intel Montara
-		String 2: System CR Platform
-Handle 0x0013
-	DMI type 12, 5 bytes.
-	System Configuration Options
-		Option 1: Jumper settings can be described here.
-Handle 0x0014
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 1 GB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x0015
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0014
-		Error Information Handle: No Error
-		Total Width: Unknown
-		Data Width: Unknown
-		Size: No Module Installed
-		Form Factor: SODIMM
-		Set: 1
-		Locator: M1
-		Bank Locator: Bank 0
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: Unknown
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0016
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0014
-		Error Information Handle: No Error
-		Total Width: 32 bits
-		Data Width: 32 bits
-		Size: 512 MB
-		Form Factor: SODIMM
-		Set: 1
-		Locator: M2
-		Bank Locator: Bank 1
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: Unknown
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0017
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Array Handle: 0x0014
-		Partition Width: 0
-Handle 0x0018
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x000000003FF
-		Range Size: 1 kB
-		Physical Device Handle: 0x0015
-		Memory Array Mapped Address Handle: 0x0017
-		Partition Row Position: 1
-Handle 0x0019
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Device Handle: 0x0016
-		Memory Array Mapped Address Handle: 0x0017
-		Partition Row Position: 1
-Handle 0x001A
-	DMI type 23, 13 bytes.
-	System Reset
-		Status: Enabled
-		Watchdog Timer: Present
-		Boot Option: Do Not Reboot
-		Boot Option On Limit: Do Not Reboot
-		Reset Count: Unknown
-		Reset Limit: Unknown
-		Timer Interval: Unknown
-		Timeout: Unknown
-Handle 0x001B
-	DMI type 24, 5 bytes.
-	Hardware Security
-		Power-On Password Status: Enabled
-		Keyboard Password Status: Unknown
-		Administrator Password Status: Not Implemented
-		Front Panel Reset Status: Unknown
-Handle 0x001C
-	DMI type 25, 9 bytes.
-	System Power Controls
-		Next Scheduled Power-on: 12-31 23:59:59
-Handle 0x001D
-	DMI type 26, 20 bytes.
-	Voltage Probe
-		Description: Voltage Probe
-		Location: Processor
-		Status: OK
-		Maximum Value: Unknown
-		Minimum Value: Unknown
-		Resolution: Unknown
-		Tolerance: Unknown
-		Accuracy: Unknown
-		OEM-specific Information: 0x00000000
-Handle 0x001E
-	DMI type 27, 12 bytes.
-	Cooling Device
-		Temperature Probe Handle: 0x001F
-		Type: Fan
-		Status: OK
-		OEM-specific Information: 0x00000000
-Handle 0x001F
-	DMI type 28, 20 bytes.
-	Temperature Probe
-		Description: Temperature Probe
-		Location: Processor
-		Status: OK
-		Maximum Value: Unknown
-		Minimum Value Unknown
-		Resolution: Unknown
-		Tolerance: Unknown
-		Accuracy: Unknown
-		OEM-specific Information: 0x00000000
-Handle 0x0020
-	DMI type 29, 20 bytes.
-	Electrical Current Probe
-		Description: Electrical Current Probe
-		Location: Processor
-		Status: OK
-		Maximum Value: Unknown
-		Minimum Value: Unknown
-		Resolution: Unknown
-		Tolerance: Unknown
-		Accuracy: Unknown
-		OEM-specific Information: 0x00000000
-Handle 0x0021
-	DMI type 30, 6 bytes.
-	Out-of-band Remote Access
-		Manufacturer Name: Intel
-		Inbound Connection: Enabled
-		Outbound Connection: Disabled
-Handle 0x0022
-	DMI type 32, 20 bytes.
-	System Boot Information
-		Status: <OUT OF SPEC>
-Handle 0x0023
-	DMI type 126, 4 bytes.
-	Inactive
-Handle 0x0024
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Laptop.Medion-MD2884 b/test/dmidecode.Laptop.Medion-MD2884
deleted file mode 100644
index 747a5d0b..00000000
--- a/test/dmidecode.Laptop.Medion-MD2884
+++ /dev/null
@@ -1,528 +0,0 @@
-# dmidecode 2.4
-SMBIOS 2.3 present.
-49 structures occupying 1797 bytes.
-Table at 0x000D7010.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: MEDION
-		Version: NOTE BIOS Version/M7850100
-		Release Date: 08/12/2003
-		Address: 0xF0000
-		Runtime Size: 64 kB
-		ROM Size: 512 kB
-		Characteristics:
-			ISA is supported
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			ESCD support is available
-			Boot from CD is supported
-			Selectable boot is supported
-			EDD is supported
-			Japanese floppy for NEC 9800 1.2 MB is supported (int 13h)
-			Japanese floppy for Toshiba 1.2 MB is supported (int 13h)
-			5.25"/1.2 MB floppy services are supported (int 13h)
-			Print screen service is supported (int 5h)
-			8042 keyboard services are supported (int 9h)
-			Serial services are supported (int 14h)
-			Printer services are supported (int 17h)
-			CGA/mono video services are supported (int 10h)
-			ACPI is supported
-			AGP is supported
-			Function key-initiated network boot is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: MEDION
-		Product Name: FID2030+
-		Version:                                 
-		Serial Number: SN-1234567890
-		UUID: Not Settable
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: MEDION
-		Product Name:                                 
-		Version:                                 
-		Serial Number:                                 
-Handle 0x0003
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: MEDION
-		Type: Notebook
-		Lock: Not Present
-		Version:                                 
-		Serial Number:                                 
-		Asset Tag:                                 
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-		OEM Information: 0x00001234
-Handle 0x0004
-	DMI type 4, 32 bytes.
-	Processor Information
-		Socket Designation: Socket 479
-		Type: Central Processor
-		Family: Pentium 4
-		Manufacturer: GenuineIntel
-		ID: 13 0F 00 00 FF F9 EB 3F
-		Signature: Type 0, Family 15, Model 1, Stepping 3
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			CLFSH (CLFLUSH instruction supported)
-			DS (Debug store)
-			ACPI (ACPI supported)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-			SSE2 (Streaming SIMD extensions 2)
-			SS (Self-snoop)
-			HTT (Hyper-threading technology)
-			TM (Thermal monitor supported)
-		Version: Intel(R) Celeron(
-		Voltage: 1.7 V
-		External Clock: 133 MHz
-		Max Speed: 2800 MHz
-		Current Speed: 1700 MHz
-		Status: Populated, Enabled
-		Upgrade: None
-		L1 Cache Handle: 0x0008
-		L2 Cache Handle: 0x0009
-		L3 Cache Handle: Not Provided
-Handle 0x0005
-	DMI type 5, 20 bytes.
-	Memory Controller Information
-		Error Detecting Method: None
-		Error Correcting Capabilities:
-			Other
-		Supported Interleave: One-way Interleave
-		Current Interleave: One-way Interleave
-		Maximum Memory Module Size: 256 MB
-		Maximum Total Memory Size: 512 MB
-		Supported Speeds:
-			70 ns
-			60 ns
-		Supported Memory Types:
-			DIMM
-			SDRAM
-		Memory Module Voltage: 3.3 V
-		Associated Memory Slots: 2
-			0x0001
-			0x0002
-		Enabled Error Correcting Capabilities:
-			Unknown
-Handle 0x0006
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: Memory Slot1
-		Bank Connections: 0 1
-		Current Speed: 70 ns
-		Type: DIMM SDRAM
-		Installed Size: 256 MB (Single-bank Connection)
-		Enabled Size: 256 MB (Single-bank Connection)
-		Error Status: OK
-Handle 0x0007
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: Memory Slot2
-		Bank Connections: 2 3
-		Current Speed: 70 ns
-		Type: DIMM
-		Installed Size: Not Installed (Single-bank Connection)
-		Enabled Size: Not Installed (Single-bank Connection)
-		Error Status: OK
-Handle 0x0008
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: Internal
-		Configuration: Enabled, Not Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 32 KB
-		Maximum Size: 32 KB
-		Supported SRAM Types:
-			Other
-		Installed SRAM Type: Other
-		Speed: Unknown
-		Error Correction Type: None
-		System Type: Other
-		Associativity: 4-way Set-associative
-Handle 0x0009
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: Internal
-		Configuration: Enabled, Not Socketed, Level 2
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 128 KB
-		Maximum Size: 512 KB
-		Supported SRAM Types:
-			Pipeline Burst
-		Installed SRAM Type: Burst
-		Speed: Unknown
-		Error Correction Type: None
-		System Type: Other
-		Associativity: Other
-Handle 0x000A
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: USB0
-		External Connector Type: PS/2
-		Port Type: Other
-Handle 0x000B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: USB1
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x000C
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: USB2
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x000D
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: IEEE1394
-		External Connector Type: IEEE 1394
-		Port Type: Firewire (IEEE P1394)
-Handle 0x000E
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: Mic In
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x000F
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: Head Phone/Line Out
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x0010
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: Serial Port
-		External Connector Type: DB-9 male
-		Port Type: Serial Port 16550A Compatible
-Handle 0x0011
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: Infrared Device
-		External Connector Type: Infrared
-		Port Type: Other
-Handle 0x0012
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: Parallel port
-		External Connector Type: DB-25 female
-		Port Type: Parallel Port ECP/EPP
-Handle 0x0013
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: Telephone Line
-		External Connector Type: RJ-11
-		Port Type: Modem Port
-Handle 0x0014
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: Network
-		External Connector Type: RJ-45
-		Port Type: Network Port
-Handle 0x0015
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: Not Specified
-		Internal Connector Type: None
-		External Reference Designator: TV-OUT
-		External Connector Type: Mini DIN
-		Port Type: Video Port
-Handle 0x0016
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: Socket 1
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Unknown
-		Length: Unknown
-		ID: Adapter 0, Socket 1
-		Characteristics:
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Zoom Video is supported
-			Modem ring resume is supported
-Handle 0x0017
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: Socket 2
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Unknown
-		Length: Unknown
-		ID: Adapter 0, Socket 2
-		Characteristics:
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Zoom Video is supported
-			Modem ring resume is supported
-Handle 0x0018
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Video
-		Status: Enabled
-		Description: SIS M650
-Handle 0x0019
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Sound
-		Status: Enabled
-		Description: Avance AC97
-Handle 0x001A
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Other
-		Status: Enabled
-		Description: Lucent Soft
-Handle 0x001B
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Other
-		Status: Enabled
-		Description: SiS 962
-Handle 0x001C
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Other
-		Status: Enabled
-		Description: ENE1410
-Handle 0x001D
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Ethernet
-		Status: Enabled
-		Description: SiS 962
-Handle 0x001E
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Other
-		Status: Enabled
-		Description: LNL030/Lucent
-Handle 0x001F
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1:                                                                 
-		String 2:                                                                 
-		String 3:                                                                 
-		String 4:                                                                 
-		String 5:                                                                 
-Handle 0x0020
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: Flash Memory
-		Error Correction Type: None
-		Maximum Capacity: 512 kB
-		Error Information Handle: Not Provided
-		Number Of Devices: 1
-Handle 0x0021
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: Video Memory
-		Error Correction Type: None
-		Maximum Capacity: 8 MB
-		Error Information Handle: Not Provided
-		Number Of Devices: 1
-Handle 0x0022
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 512 MB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x0023
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x0022
-		Error Information Handle: Not Provided
-		Total Width: 4 bits
-		Data Width: 4 bits
-		Size: 512 kB
-		Form Factor: Other
-		Set: None
-		Locator: U32
-		Bank Locator: NULL
-		Type: Flash
-		Type Detail: Non-Volatile
-		Speed: 100 MHz (10.0 ns)
-Handle 0x0024
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x0022
-		Error Information Handle: Not Provided
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: No Module Installed
-		Form Factor: Other
-		Set: None
-		Locator: U15
-		Bank Locator: NULL
-		Type: Other
-		Type Detail: Synchronous
-		Speed: 166 MHz (6.0 ns)
-Handle 0x0025
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x0022
-		Error Information Handle: No Error
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 256 MB
-		Form Factor: DIMM
-		Set: None
-		Locator: CN30
-		Bank Locator: NULL
-		Type: SDRAM
-		Type Detail: Synchronous
-		Speed: 133 MHz (7.5 ns)
-Handle 0x0026
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x0022
-		Error Information Handle: No Error
-		Total Width: Unknown
-		Data Width: Unknown
-		Size: No Module Installed
-		Form Factor: DIMM
-		Set: None
-		Locator: CN31
-		Bank Locator: NULL
-		Type: SDRAM
-		Type Detail: Synchronous
-		Speed: 133 MHz (7.5 ns)
-Handle 0x0027
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000007FFFF
-		Range Size: 512 kB
-		Physical Array Handle: 0x0022
-		Partition Width: 0
-Handle 0x0028
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x000007FFFFF
-		Range Size: 8 MB
-		Physical Array Handle: 0x0022
-		Partition Width: 0
-Handle 0x0029
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x00017FFFFFF
-		Range Size: 384 MB
-		Physical Array Handle: 0x0022
-		Partition Width: 0
-Handle 0x002A
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000007FFFF
-		Range Size: 512 kB
-		Physical Device Handle: 0x0023
-		Memory Array Mapped Address Handle: 0x0001
-		Partition Row Position: 1
-Handle 0x002B
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x000003FFFFF
-		Range Size: 4 MB
-		Physical Device Handle: 0x0024
-		Memory Array Mapped Address Handle: 0x0001
-		Partition Row Position: 1
-Handle 0x002C
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x000000003FF
-		Range Size: 1 kB
-		Physical Device Handle: 0x0025
-		Memory Array Mapped Address Handle: 0x0001
-		Partition Row Position: 1
-Handle 0x002D
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x00017FFFFFF
-		Range Size: 384 MB
-		Physical Device Handle: 0x0026
-		Memory Array Mapped Address Handle: 0x0001
-		Partition Row Position: 1
-Handle 0x002E
-	DMI type 22, 26 bytes.
-	Portable Battery
-		Location: In the Front, on the left-hand side
-		Manufacturer: FIC
-		Manufacture Date: 01/01/1998
-		Serial Number:   34
-		Name: OP-570-74001
-		Chemistry: Lithium Ion
-		Design Capacity: 518400 mWh
-		Design Voltage: 14400 mV
-		SBDS Version: Bat123
-		Maximum Error: 6%
-		OEM-specific Information: 0x00000000
-Handle 0x002F
-	DMI type 32, 20 bytes.
-	System Boot Information
-		Status: <OUT OF SPEC>
-Handle 0x0030
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Laptop.Medion-MD40100 b/test/dmidecode.Laptop.Medion-MD40100
deleted file mode 100644
index 6f96ebbd..00000000
--- a/test/dmidecode.Laptop.Medion-MD40100
+++ /dev/null
@@ -1,309 +0,0 @@
-# dmidecode 1.8
-SMBIOS 2.31 present.
-DMI 2.31 present.
-39 structures occupying 1272 bytes.
-DMI table at 0x000E8340.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information Block
-		Vendor: Phoenix Technologies LTD
-		Version: V1.0 R01-A1B   
-		Release: 09/10/2003
-		BIOS base: 0xE2200
-		ROM size: 512K
-		Capabilities:
-			Flags: 0x0000000700005F90
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information Block
-		Vendor: MEDIONNB       
-		Product: WID2000        
-		Version: Revision A0
-		Serial Number:     9141D01ND0340026ECK000        
-Handle 0x0003
-	DMI type 3, 17 bytes.
-	Chassis Information Block
-		Vendor: Wistron        
-		Chassis Type: Other
-		Version: N/A
-		Serial Number: None
-		Asset Tag: No Asset Tag                    
-Handle 0x0004
-	DMI type 4, 35 bytes.
-	Processor
-		Socket Designation: WMT478/NWD
-		Processor Type: Central Processor
-		Processor Family: 
-		Processor Manufacturer: Intel
-		Processor Version: D0
-		Serial Number: 
-		Asset Tag: 
-		Vendor Part Number: 
-Handle 0x0005
-	DMI type 7, 19 bytes.
-	Cache
-		Socket: L1 Cache
-		L1 socketed Internal Cache: write-back
-		L1 Cache Size: 16K
-		L1 Cache Maximum: 16K
-		L1 Cache Type: Asynchronous 
-Handle 0x0006
-	DMI type 7, 19 bytes.
-	Cache
-		Socket: L2 Cache
-		L2 socketed Internal Cache: write-back
-		L2 Cache Size: 512K
-		L2 Cache Maximum: 512K
-		L2 Cache Type: Burst 
-Handle 0x0007
-	DMI type 7, 19 bytes.
-	Cache
-		Socket: L3 Cache
-		L3 socketed Internal Cache: write-back
-		L3 Cache Size: 512K
-		L3 Cache Maximum: 512K
-		L3 Cache Type: Burst 
-Handle 0x0008
-	DMI type 8, 9 bytes.
-	Port Connector
-		Internal Designator: J2A1
-		Internal Connector Type: 9 Pin Dual Inline (pin 10 cut)
-		External Designator: COM 1
-		External Connector Type: DB-9 pin male
-		Port Type: Serial Port 16550A Compatible
-Handle 0x0009
-	DMI type 8, 9 bytes.
-	Port Connector
-		Internal Designator: J3A1
-		Internal Connector Type: 25 Pin Dual Inline (pin 26 cut)
-		External Designator: Parallel
-		External Connector Type: DB-25 pin female
-		Port Type: Parallel Port ECP/EPP
-Handle 0x000A
-	DMI type 8, 9 bytes.
-	Port Connector
-		Internal Designator: J1A1
-		Internal Connector Type: None
-		External Designator: Keyboard
-		External Connector Type: Circular DIN-8 male
-		Port Type: Keyboard Port
-Handle 0x000B
-	DMI type 8, 9 bytes.
-	Port Connector
-		Internal Designator: J1A1
-		Internal Connector Type: None
-		External Designator: PS/2 Mouse
-		External Connector Type: Circular DIN-8 male
-		Port Type: Keyboard Port
-Handle 0x000C
-	DMI type 9, 13 bytes.
-	Card Slot
-		Slot: PCI Slot #1 - J6B3
-		Type: 32bit Long PCI 
-		Slot Features: 5v 3.3v 
-Handle 0x000D
-	DMI type 9, 13 bytes.
-	Card Slot
-		Slot: PCI Slot #2 - J6B2
-		Type: 32bit Long PCI 
-		Slot Features: 5v 3.3v 
-Handle 0x000E
-	DMI type 9, 13 bytes.
-	Card Slot
-		Slot: PCI Slot #3 - J7B1
-		Type: 32bit Long PCI 
-		Slot Features: 5v 3.3v 
-Handle 0x000F
-	DMI type 10, 6 bytes.
-	On Board Devices Information
-		Description: ADI1886 : Disabled
-		Type: Sound
-Handle 0x0010
-	DMI type 11, 5 bytes.
-	OEM Data
-		This is the Intel 865G
-		Customer Reference Board
-Handle 0x0011
-	DMI type 12, 5 bytes.
-	Configuration Information
-		Jumper settings can be described here.
-Handle 0x0012
-	DMI type 15, 29 bytes.
-	Event Log
-		Log Area: 0 bytes.
-		Log Header At: 0.
-		Log Data At: 16.
-		Log Type: 4.
-Handle 0x0013
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System board or motherboard
-		Use: System memory
-		Error Correction Type: None
-		Maximum Capacity: 4194304 kB
-		Error Information Handle: Not Provided
-		Number of Devices: 2
-Handle 0x0014
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0013
-		Error Information Handle: None
-		Total Width: 72 bits
-		Data Width: 64 bits
-		Size: 256 Mbyte
-		Form Factor: DIMM
-		Set: 0x01
-		Locator: J6G1
-		Bank Locator: DIMM 0
-		Type: DDR
-		Type Detail: Synchronous 
-		Speed: 133 MHz (7.5 ns)
-		Manufacturer: 
-		Serial Number: 
-		Asset Tag: 
-		Part Number: 
-Handle 0x0015
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0013
-		Error Information Handle: None
-		Total Width: 0 bits
-		Data Width: 0 bits
-		Size: 0 Mbyte
-		Form Factor: DIMM
-		Set: 0x01
-		Locator: J6G2
-		Bank Locator: DIMM 1
-		Type: DDR
-		Type Detail: Synchronous 
-		Speed: 133 MHz (7.5 ns)
-		Manufacturer: 
-		Serial Number: 
-		Asset Tag: 
-		Part Number: 
-Handle 0x0016
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0013
-		Error Information Handle: None
-		Total Width: 72 bits
-		Data Width: 64 bits
-		Size: 256 Mbyte
-		Form Factor: DIMM
-		Set: 0x01
-		Locator: J6H1
-		Bank Locator: DIMM 2
-		Type: DDR
-		Type Detail: Synchronous 
-		Speed: 133 MHz (7.5 ns)
-		Manufacturer: 
-		Serial Number: 
-		Asset Tag: 
-		Part Number: 
-Handle 0x0017
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0013
-		Error Information Handle: None
-		Total Width: 0 bits
-		Data Width: 0 bits
-		Size: 0 Mbyte
-		Form Factor: DIMM
-		Set: 0x01
-		Locator: J6H2
-		Bank Locator: DIMM 3
-		Type: DDR
-		Type Detail: Synchronous 
-		Speed: 133 MHz (7.5 ns)
-		Manufacturer: 
-		Serial Number: 
-		Asset Tag: 
-		Part Number: 
-Handle 0x0018
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-Handle 0x0019
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-Handle 0x001A
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-Handle 0x001B
-	DMI type 23, 13 bytes.
-	System Reset
-Handle 0x001C
-	DMI type 24, 5 bytes.
-	Hardware Security
-Handle 0x001D
-	DMI type 25, 9 bytes.
-	System Power Controls
-Handle 0x001E
-	DMI type 26, 20 bytes.
-	Voltage Sensor
-		Description: Voltage Probe
-		Device Location: Processor
-		Device Status: OK
-		Maximum Value: Unknown
-		Minimum Value: Unknown
-		Resolution:    Unknown
-		Tolerance:     Unknown
-		Accuracy:      Unknown
-Handle 0x001F
-	DMI type 27, 12 bytes.
-	Cooling Device
-		Device Type: Fan
-		Device Status: OK
-Handle 0x0020
-	DMI type 28, 20 bytes.
-	Temperature Sensor
-		Description: Temperature Probe
-		Device Location: Processor
-		Device Status: OK
-		Maximum Value: Unknown
-		Minimum Value: Unknown
-		Resolution:    Unknown
-		Tolerance:     Unknown
-		Accuracy:      Unknown
-Handle 0x0021
-	DMI type 29, 20 bytes.
-	Current Sensor
-		Description: Electrical Current Probe
-		Device Location: Processor
-		Device Status: OK
-		Maximum Value: Unknown
-		Minimum Value: Unknown
-		Resolution:    Unknown
-		Tolerance:     Unknown
-		Accuracy:      Unknown
-Handle 0x0022
-	DMI type 30, 6 bytes.
-	Out-of-Band Remote Access
-Handle 0x0023
-	DMI type 32, 20 bytes.
-	System Boot Information
-Handle 0x0024
-	DMI type 126, 4 bytes.
-	Inactive
-Handle 0x0025
-	DMI type 127, 4 bytes.
-	End-of-Table
-Handle 0x0026
-	DMI type 127, 4 bytes.
-	End-of-Table
-Wrong DMI structures count: 39 announced, only 38 decoded.
-ACPI 1.0 present.
-	OEM ID: PTLTD 
-RSD table at 0x1FF741E7.
-BIOS32 Service Directory present.
-	Calling Interface Address: 0x000FD5C0
-PNP 1.0 present.
-	Event Notification: Not Supported
-	Real Mode Code Address: F000:AD67
-	Real Mode Data Address: 0040:0000
-	Protected Mode Code Address: 0x000FAD85
-	Protected Mode Data Address: 0x00000400
-PCI Interrupt Routing 1.0 present.
-	Table Size: 176 bytes
-	Router ID: 00:1f.0
-	Exclusive IRQs: None
-	Compatible Router: 8086:122e
diff --git a/test/dmidecode.Laptop.Medion-MD41300 b/test/dmidecode.Laptop.Medion-MD41300
deleted file mode 100644
index cce1d29b..00000000
--- a/test/dmidecode.Laptop.Medion-MD41300
+++ /dev/null
@@ -1,452 +0,0 @@
-# dmidecode 2.4
-SMBIOS 2.31 present.
-39 structures occupying 1212 bytes.
-Table at 0x000E8080.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: Phoenix Technologies LTD
-		Version: V1.0 R01-A0U   04/15/2004
-		Release Date: <BAD INDEX>
-		Address: 0xE1F20
-		Runtime Size: 123104 bytes
-		ROM Size: 512 kB
-		Characteristics:
-			ISA is supported
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			ESCD support is available
-			USB legacy is supported
-			Smart battery is supported
-			BIOS boot specification is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: Notebook       
-		Product Name: WID2010        
-		Version: Revision A0
-		Serial Number:     9145D01GN0405033E6K000        .
-		UUID: D786C060-5060-11D8-965D-E982EFFA94E1
-		Wake-up Type: Power Switch
-Handle 0x0003
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer:                
-		Type: Other
-		Lock: Not Present
-		Version: N/A
-		Serial Number: None
-		Asset Tag: No Asset Tag                    
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-		OEM Information: 0x00001234
-Handle 0x0004
-	DMI type 4, 35 bytes.
-	Processor Information
-		Socket Designation: WMT478/NWD
-		Type: Central Processor
-		Family: Pentium 4
-		Manufacturer: Intel
-		ID: 29 0F 00 00 FF FB EB BF
-		Signature: Type 0, Family 15, Model 2, Stepping 9
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			APIC (On-chip APIC hardware supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			CLFSH (CLFLUSH instruction supported)
-			DS (Debug store)
-			ACPI (ACPI supported)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-			SSE2 (Streaming SIMD extensions 2)
-			SS (Self-snoop)
-			HTT (Hyper-threading technology)
-			TM (Thermal monitor supported)
-			SBF (Signal break on FERR)
-		Version: D0
-		Voltage: 1.8 V
-		External Clock: Unknown
-		Max Speed: 3000 MHz
-		Current Speed: 1600 MHz
-		Status: Populated, Enabled
-		Upgrade: Slot 1
-		L1 Cache Handle: 0x0005
-		L2 Cache Handle: 0x0006
-		L3 Cache Handle: Not Provided
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0005
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L1 Cache
-		Configuration: Enabled, Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 16 KB
-		Maximum Size: 16 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Asynchronous
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Unknown
-		Associativity: Unknown
-Handle 0x0006
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L2 Cache
-		Configuration: Enabled, Socketed, Level 2
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 512 KB
-		Maximum Size: 512 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Burst
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Unknown
-		Associativity: Unknown
-Handle 0x0007
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L3 Cache
-		Configuration: Enabled, Socketed, Level 3
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 512 KB
-		Maximum Size: 512 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Burst
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Unknown
-		Associativity: Unknown
-Handle 0x0008
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J2A1
-		Internal Connector Type: 9 Pin Dual Inline (pin 10 cut)
-		External Reference Designator: COM 1
-		External Connector Type: DB-9 male
-		Port Type: Serial Port 16550A Compatible
-Handle 0x0009
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J3A1
-		Internal Connector Type: 25 Pin Dual Inline (pin 26 cut)
-		External Reference Designator: Parallel
-		External Connector Type: DB-25 female
-		Port Type: Parallel Port ECP/EPP
-Handle 0x000A
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J1A1
-		Internal Connector Type: None
-		External Reference Designator: Keyboard
-		External Connector Type: Circular DIN-8 male
-		Port Type: Keyboard Port
-Handle 0x000B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: J1A1
-		Internal Connector Type: None
-		External Reference Designator: PS/2 Mouse
-		External Connector Type: Circular DIN-8 male
-		Port Type: Keyboard Port
-Handle 0x000C
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI Slot #1 - J6B3
-		Type: 32-bit PCI
-		Current Usage: Unknown
-		Length: Long
-		ID: 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-Handle 0x000D
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI Slot #2 - J6B2
-		Type: 32-bit PCI
-		Current Usage: Unknown
-		Length: Long
-		ID: 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-Handle 0x000E
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCI Slot #3 - J7B1
-		Type: 32-bit PCI
-		Current Usage: Unknown
-		Length: Long
-		ID: 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-Handle 0x000F
-	DMI type 10, 6 bytes.
-	On Board Device Information
-		Type: Sound
-		Status: Disabled
-		Description: ADI1886
-Handle 0x0010
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: This is the Intel 865G
-		String 2: Customer Reference Board
-Handle 0x0011
-	DMI type 12, 5 bytes.
-	System Configuration Options
-		Option 1: Jumper settings can be described here.
-Handle 0x0012
-	DMI type 15, 29 bytes.
-	System Event Log
-		Area Length: 0 bytes
-		Header Start Offset: 0x0000
-		Header Length: 16 bytes
-		Data Start Offset: 0x0010
-		Access Method: General-purpose non-volatile data functions
-		Access Address: 0x0000
-		Status: Invalid, No Header
-		Change Token: 0x00000001
-		Header Format: Type 1
-		Supported Log Type Descriptors: 3
-		Descriptor 1: POST error
-		Data Format 1: POST results bitmap
-		Descriptor 2: Single-bit ECC memory error
-		Data Format 2: Multiple-event
-		Descriptor 3: Multi-bit ECC memory error
-		Data Format 3: Multiple-event
-Handle 0x0013
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 4 GB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x0014
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0013
-		Error Information Handle: No Error
-		Total Width: 72 bits
-		Data Width: 64 bits
-		Size: 256 MB
-		Form Factor: DIMM
-		Set: 1
-		Locator: J6G1
-		Bank Locator: DIMM 0
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: 133 MHz (7.5 ns)
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0015
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0013
-		Error Information Handle: No Error
-		Total Width: Unknown
-		Data Width: Unknown
-		Size: No Module Installed
-		Form Factor: DIMM
-		Set: 1
-		Locator: J6G2
-		Bank Locator: DIMM 1
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: 133 MHz (7.5 ns)
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0016
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0013
-		Error Information Handle: No Error
-		Total Width: 72 bits
-		Data Width: 64 bits
-		Size: 256 MB
-		Form Factor: DIMM
-		Set: 1
-		Locator: J6H1
-		Bank Locator: DIMM 2
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: 133 MHz (7.5 ns)
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0017
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0013
-		Error Information Handle: No Error
-		Total Width: Unknown
-		Data Width: Unknown
-		Size: No Module Installed
-		Form Factor: DIMM
-		Set: 1
-		Locator: J6H2
-		Bank Locator: DIMM 3
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: 133 MHz (7.5 ns)
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0018
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Array Handle: 0x0013
-		Partition Width: 0
-Handle 0x0019
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x0014
-		Memory Array Mapped Address Handle: 0x0018
-		Partition Row Position: Unknown
-		Interleave Position: Unknown
-		Interleaved Data Depth: Unknown
-Handle 0x001A
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x0000FFFFC00
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 1 kB
-		Physical Device Handle: 0x0015
-		Memory Array Mapped Address Handle: 0x0018
-		Partition Row Position: Unknown
-		Interleave Position: Unknown
-		Interleaved Data Depth: Unknown
-Handle 0x001B
-	DMI type 23, 13 bytes.
-	System Reset
-		Status: Enabled
-		Watchdog Timer: Present
-		Boot Option: Do Not Reboot
-		Boot Option On Limit: Do Not Reboot
-		Reset Count: Unknown
-		Reset Limit: Unknown
-		Timer Interval: Unknown
-		Timeout: Unknown
-Handle 0x001C
-	DMI type 24, 5 bytes.
-	Hardware Security
-		Power-On Password Status: Disabled
-		Keyboard Password Status: Unknown
-		Administrator Password Status: Enabled
-		Front Panel Reset Status: Unknown
-Handle 0x001D
-	DMI type 25, 9 bytes.
-	System Power Controls
-		Next Scheduled Power-on: 12-31 23:59:59
-Handle 0x001E
-	DMI type 26, 20 bytes.
-	Voltage Probe
-		Description: Voltage Probe
-		Location: Processor
-		Status: OK
-		Maximum Value: Unknown
-		Minimum Value: Unknown
-		Resolution: Unknown
-		Tolerance: Unknown
-		Accuracy: Unknown
-		OEM-specific Information: 0x00000000
-Handle 0x001F
-	DMI type 27, 12 bytes.
-	Cooling Device
-		Temperature Probe Handle: 0x0020
-		Type: Fan
-		Status: OK
-		OEM-specific Information: 0x00000000
-Handle 0x0020
-	DMI type 28, 20 bytes.
-	Temperature Probe
-		Description: Temperature Probe
-		Location: Processor
-		Status: OK
-		Maximum Value: Unknown
-		Minimum Value Unknown
-		Resolution: Unknown
-		Tolerance: Unknown
-		Accuracy: Unknown
-		OEM-specific Information: 0x00000000
-Handle 0x0021
-	DMI type 29, 20 bytes.
-	Electrical Current Probe
-		Description: Electrical Current Probe
-		Location: Processor
-		Status: OK
-		Maximum Value: Unknown
-		Minimum Value: Unknown
-		Resolution: Unknown
-		Tolerance: Unknown
-		Accuracy: Unknown
-		OEM-specific Information: 0x00000000
-Handle 0x0022
-	DMI type 30, 6 bytes.
-	Out-of-band Remote Access
-		Manufacturer Name: Intel
-		Inbound Connection: Enabled
-		Outbound Connection: Disabled
-Handle 0x0023
-	DMI type 32, 20 bytes.
-	System Boot Information
-		Status: <OUT OF SPEC>
-Handle 0x0024
-	DMI type 126, 4 bytes.
-	Inactive
-Handle 0x0025
-	DMI type 127, 4 bytes.
-	End Of Table
-Handle 0x0026
-	DMI type 127, 4 bytes.
-	End Of Table
-Wrong DMI structures count: 39 announced, only 38 decoded.
diff --git a/test/dmidecode.Laptop.Medion-MD9783 b/test/dmidecode.Laptop.Medion-MD9783
deleted file mode 100644
index 0157afc7..00000000
--- a/test/dmidecode.Laptop.Medion-MD9783
+++ /dev/null
@@ -1,425 +0,0 @@
-# dmidecode 2.4
-SMBIOS 2.3 present.
-37 structures occupying 1258 bytes.
-Table at 0x000FD060.
-Handle 0x0000
-	DMI type 0, 19 bytes.
-	BIOS Information
-		Vendor: Wistron
-		Version: V3.5 R01-M58  EN                        
-		Release Date: 01/13/03
-		Address: 0xF0000
-		Runtime Size: 64 kB
-		ROM Size: 512 kB
-		Characteristics:
-			ISA is supported
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			Boot from CD is supported
-			Selectable boot is supported
-			EDD is supported
-			Japanese floppy for NEC 9800 1.2 MB is supported (int 13h)
-			Japanese floppy for Toshiba 1.2 MB is supported (int 13h)
-			3.5"/720 KB floppy services are supported (int 13h)
-			3.5"/2.88 MB floppy services are supported (int 13h)
-			Print screen service is supported (int 5h)
-			8042 keyboard services are supported (int 9h)
-			Serial services are supported (int 14h)
-			Printer services are supported (int 17h)
-			CGA/mono video services are supported (int 10h)
-			ACPI is supported
-			AGP is supported
-			Smart battery is supported
-Handle 0x0100
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: MEDIONNB        
-		Product Name: MD 9783         
-		Version: -1
-		Serial Number: ######################          
-		UUID: ########-####-####-####-############
-		Wake-up Type: Power Switch
-Handle 0x0200
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: MEDIONNB        
-		Product Name: MD 9783         
-		Version: -1
-		Serial Number: ######################          
-Handle 0x0300
-	DMI type 3, 13 bytes.
-	Chassis Information
-		Manufacturer: MEDIONNB        
-		Type: Notebook
-		Lock: Not Present
-		Version: -1
-		Serial Number: ######################          
-		Asset Tag:                                 
-		Boot-up State: Unknown
-		Power Supply State: Unknown
-		Thermal State: Unknown
-		Security Status: Unknown
-Handle 0x0400
-	DMI type 4, 32 bytes.
-	Processor Information
-		Socket Designation: U11
-		Type: Central Processor
-		Family: Celeron
-		Manufacturer: Intel
-		ID: 24 0F 00 00 FF F9 EB 3F
-		Signature: Type 0, Family 15, Model 2, Stepping 4
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			CLFSH (CLFLUSH instruction supported)
-			DS (Debug store)
-			ACPI (ACPI supported)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-			SSE2 (Streaming SIMD extensions 2)
-			SS (Self-snoop)
-			HTT (Hyper-threading technology)
-			TM (Thermal monitor supported)
-		Version: Unknown                  
-		Voltage: 1.6 V
-		External Clock: 100 MHz
-		Max Speed: 2000 MHz
-		Current Speed: 2000 MHz
-		Status: Unpopulated
-		Upgrade: Daughter Board
-		L1 Cache Handle: 0x0700
-		L2 Cache Handle: 0x0701
-		L3 Cache Handle: Not Provided
-Handle 0x0500
-	DMI type 5, 20 bytes.
-	Memory Controller Information
-		Error Detecting Method: None
-		Error Correcting Capabilities:
-			None
-		Supported Interleave: Unknown
-		Current Interleave: Unknown
-		Maximum Memory Module Size: 256 MB
-		Maximum Total Memory Size: 512 MB
-		Supported Speeds:
-			Unknown
-		Supported Memory Types:
-			DIMM
-			SDRAM
-		Memory Module Voltage: 3.3 V
-		Associated Memory Slots: 2
-			0x0600
-			0x0601
-		Enabled Error Correcting Capabilities:
-			None
-Handle 0x0600
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: DM2
-		Bank Connections: 0 1
-		Current Speed: Unknown
-		Type: Unknown
-		Installed Size: 256 MB (Single-bank Connection)
-		Enabled Size: 256 MB (Single-bank Connection)
-		Error Status: OK
-Handle 0x0601
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: CN22
-		Bank Connections: 2 3
-		Current Speed: Unknown
-		Type: Unknown
-		Installed Size: 256 MB (Single-bank Connection)
-		Enabled Size: 256 MB (Single-bank Connection)
-		Error Status: OK
-Handle 0x0700
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: U11
-		Configuration: Enabled, Not Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 8 KB
-		Maximum Size: 32 KB
-		Supported SRAM Types:
-			Unknown
-		Installed SRAM Type: Unknown
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Unified
-		Associativity: Unknown
-Handle 0x0701
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: U37
-		Configuration: Enabled, Not Socketed, Level 2
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 0 KB
-		Maximum Size: 0 KB
-		Supported SRAM Types:
-			Pipeline Burst
-			Synchronous
-		Installed SRAM Type: Pipeline Burst
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Unified
-		Associativity: Fully Associative
-Handle 0x0800
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN2
-		Internal Connector Type: None
-		External Reference Designator: Serial 1
-		External Connector Type: DB-9 male
-		Port Type: Serial Port 16550A Compatible
-Handle 0x0801
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: U1
-		Internal Connector Type: None
-		External Reference Designator: Infrared
-		External Connector Type: Infrared
-		Port Type: Other
-Handle 0x0802
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN3
-		Internal Connector Type: None
-		External Reference Designator: Parallel
-		External Connector Type: DB-25 female
-		Port Type: Parallel Port ECP
-Handle 0x0803
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN1
-		Internal Connector Type: None
-		External Reference Designator: KEYBOARD
-		External Connector Type: PS/2
-		Port Type: Keyboard Port
-Handle 0x0804
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN1
-		Internal Connector Type: None
-		External Reference Designator: MOUSE
-		External Connector Type: PS/2
-		Port Type: Mouse Port
-Handle 0x0805
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN5
-		Internal Connector Type: None
-		External Reference Designator: USB
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0806
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN6
-		Internal Connector Type: None
-		External Reference Designator: USB
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x0807
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN26
-		Internal Connector Type: None
-		External Reference Designator: MODEM
-		External Connector Type: RJ-11
-		Port Type: Modem Port
-Handle 0x0808
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: U49
-		Internal Connector Type: None
-		External Reference Designator: LAN
-		External Connector Type: RJ-45
-		Port Type: Network Port
-Handle 0x0809
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN24
-		Internal Connector Type: Proprietary
-		External Reference Designator: LINE-IN JACK
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x080A
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN24
-		Internal Connector Type: Proprietary
-		External Reference Designator: HEADPHONE-OUT JACK
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x080B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN24
-		Internal Connector Type: Proprietary
-		External Reference Designator: MICROPHONE-IN JACK
-		External Connector Type: Mini Jack (headphones)
-		Port Type: Audio Port
-Handle 0x080C
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: CN2
-		Internal Connector Type: None
-		External Reference Designator: EXTERNAL DISPLAY
-		External Connector Type: DB-15 female
-		Port Type: Video Port
-Handle 0x0900
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: CN13A
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Available
-		Length: Long
-		ID: Adapter 0, Socket 1
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x0901
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: CN13B
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Available
-		Length: Long
-		ID: Adapter 0, Socket 2
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PME signal is supported
-Handle 0x0A00
-	DMI type 10, 10 bytes.
-	On Board Device 1 Information
-		Type: Video
-		Status: Enabled
-		Description: ATI M6C VGA CHIP
-	On Board Device 2 Information
-		Type: Ethernet
-		Status: Enabled
-		Description: RELTEK 8100(B)
-	On Board Device 3 Information
-		Type: Sound
-		Status: Enabled
-		Description: Intel AC97       
-Handle 0x0D00
-	DMI type 13, 22 bytes.
-	BIOS Language Information
-		Installable Languages: 1
-			en|US|iso8859-1
-		Currently Installed Language: en|US|iso8859-1
-Handle 0x1000
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 256 MB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x1100
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x1000
-		Error Information Handle: Not Provided
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 256 MB
-		Form Factor: DIMM
-		Set: 2
-		Locator: DM2
-		Bank Locator: BANK 0
-		Type: SDRAM
-		Type Detail: Synchronous
-		Speed: 266 MHz (3.8 ns)
-Handle 0x1101
-	DMI type 17, 23 bytes.
-	Memory Device
-		Array Handle: 0x1000
-		Error Information Handle: Not Provided
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 256 MB
-		Form Factor: DIMM
-		Set: 2
-		Locator: CN22
-		Bank Locator: BANK 1
-		Type: SDRAM
-		Type Detail: Synchronous
-		Speed: 266 MHz (3.8 ns)
-Handle 0x1300
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Array Handle: 0x1000
-		Partition Width: 0
-Handle 0x1400
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x1100
-		Memory Array Mapped Address Handle: 0x1300
-		Partition Row Position: 1
-Handle 0x1401
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00010000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x1101
-		Memory Array Mapped Address Handle: 0x1300
-		Partition Row Position: 1
-Handle 0x1500
-	DMI type 21, 7 bytes.
-	Built-in Pointing Device
-		Type: Touch Pad
-		Interface: PS/2
-		Buttons: 4
-Handle 0x1600
-	DMI type 22, 16 bytes.
-	Portable Battery
-		Location: On the Right-hand side
-		Manufacturer:           
-		Manufacture Date:           
-		Serial Number:           
-		Name:           
-		Chemistry: Lithium Ion
-		Design Capacity: Unknown
-		Design Voltage: Unknown
-		SBDS Version:           
-		Maximum Error: 6%
-Handle 0x2000
-	DMI type 32, 11 bytes.
-	System Boot Information
-		Status: No errors detected
-Handle 0x7F00
-	DMI type 127, 4 bytes.
-	End Of Table
-Wrong DMI structures length: 1258 bytes announced, structures occupy 1252 bytes.
diff --git a/test/dmidecode.Laptop.Sony-PCG-GR214MP b/test/dmidecode.Laptop.Sony-PCG-GR214MP
deleted file mode 100644
index 78949747..00000000
--- a/test/dmidecode.Laptop.Sony-PCG-GR214MP
+++ /dev/null
@@ -1,242 +0,0 @@
-# dmidecode 2.3 (=> Resolution: 1024x768) (=> Diagonal_size: 14.1)
-SMBIOS 2.31 present.
-16 structures occupying 634 bytes.
-Table at 0x000D8010.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: Phoenix Technologies LTD
-		Version: R0228C0
-		Release Date: 02/25/02  
-		Address: 0xE4D20
-		Runtime Size: 111328 bytes
-		ROM Size: 512 kB
-		Characteristics:
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			ESCD support is available
-			3.5"/720 KB floppy services are supported (int 13h)
-			Print screen service is supported (int 5h)
-			8042 keyboard services are supported (int 9h)
-			Serial services are supported (int 14h)
-			Printer services are supported (int 17h)
-			CGA/mono video services are supported (int 10h)
-			ACPI is supported
-			USB legacy is supported
-			AGP is supported
-			IEEE 1394 boot is supported
-			Smart battery is supported
-			BIOS boot specification is supported
-			Function key-initiated network boot is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: Sony Corporation    
-		Product Name: PCG-GR214MP(FR)     
-		Version: 01                  
-		Serial Number: 28333254-5362274    
-		UUID: 28AD0C40-4B66-11C6-8628-08004643D679
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: Sony Corporation
-		Type: Notebook
-		Lock: Not Present
-		Version: N/A
-		Serial Number: 01
-		Asset Tag: 883M2C5150D08600000000000000
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-		OEM Information: 0x00000000
-Handle 0x0003
-	DMI type 4, 35 bytes.
-	Processor Information
-		Socket Designation: N/A
-		Type: Central Processor
-		Family: Pentium III
-		Manufacturer: Intel Corporation
-		ID: B1 06 00 00 FF F9 83 03
-		Signature: Type 0, Family 6, Model B, Stepping 1
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-		Version: N/A
-		Voltage: 3.3 V
-		External Clock: 133 MHz
-		Max Speed: 866 MHz
-		Current Speed: 1000 MHz
-		Status: Populated, Enabled
-		Upgrade: None
-		L1 Cache Handle: 0x0004
-		L2 Cache Handle: 0x0005
-		L3 Cache Handle: Not Provided
-		Serial Number: N/A
-		Asset Tag: N/A
-		Part Number: N/A
-Handle 0x0004
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L1Cache
-		Configuration: Enabled, Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 16 KB
-		Maximum Size: 16 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Asynchronous
-		Speed: Unknown
-		Error Correction Type: None
-		System Type: Instruction
-		Associativity: 4-way Set-associative
-Handle 0x0005
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L2Cache
-		Configuration: Enabled, Socketed, Level 2
-		Operational Mode: Write Back
-		Location: External
-		Installed Size: 512 KB
-		Maximum Size: 512 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Burst
-		Speed: Unknown
-		Error Correction Type: None
-		System Type: Data
-		Associativity: 4-way Set-associative
-Handle 0x0006
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCCARD1
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Available
-		Length: Short
-		ID: Adapter 0, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Modem ring resume is supported
-			Hot-plug devices are supported
-Handle 0x0007
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCCARD2
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Available
-		Length: Short
-		ID: Adapter 1, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Modem ring resume is supported
-			Hot-plug devices are supported
-Handle 0x0008
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: EU0603
-Handle 0x0009
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 512 MB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x000A
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0009
-		Error Information Handle: No Error
-		Total Width: 32 bits
-		Data Width: 32 bits
-		Size: 256 MB
-		Form Factor: SODIMM
-		Set: None
-		Locator: SODIMM1
-		Bank Locator: Bank 0
-		Type: SDRAM
-		Type Detail: Synchronous
-		Speed: 100 MHz (10.0 ns)
-		Manufacturer: N/A
-		Serial Number: N/A
-		Asset Tag: N/A
-		Part Number: N/A
-Handle 0x000B
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0009
-		Error Information Handle: No Error
-		Total Width: 32 bits
-		Data Width: 32 bits
-		Size: 256 MB
-		Form Factor: SODIMM
-		Set: None
-		Locator: SODIMM2
-		Bank Locator: Bank 1
-		Type: SDRAM
-		Type Detail: Synchronous
-		Speed: 100 MHz (10.0 ns)
-		Manufacturer: N/A
-		Serial Number: N/A
-		Asset Tag: N/A
-		Part Number: N/A
-Handle 0x000C
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Array Handle: 0x0009
-		Partition Width: 0
-Handle 0x000D
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x000A
-		Memory Array Mapped Address Handle: 0x000C
-		Partition Row Position: Unknown
-		Interleave Position: Unknown
-		Interleaved Data Depth: Unknown
-Handle 0x000E
-	DMI type 32, 20 bytes.
-	System Boot Information
-		Status: <OUT OF SPEC>
-Handle 0x000F
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Laptop.Sony-PCG-NV105 b/test/dmidecode.Laptop.Sony-PCG-NV105
deleted file mode 100644
index 48b4cc59..00000000
--- a/test/dmidecode.Laptop.Sony-PCG-NV105
+++ /dev/null
@@ -1,249 +0,0 @@
-# dmidecode 2.3 (=> Resolution: 1024x768)
-SMBIOS 2.31 present.
-16 structures occupying 642 bytes.
-Table at 0x000D8010.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: Phoenix Technologies LTD
-		Version: R0215B0
-		Release Date: 03/29/02  
-		Address: 0xE5A30
-		Runtime Size: 107984 bytes
-		ROM Size: 512 kB
-		Characteristics:
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			ESCD support is available
-			3.5"/720 KB floppy services are supported (int 13h)
-			Print screen service is supported (int 5h)
-			8042 keyboard services are supported (int 9h)
-			Serial services are supported (int 14h)
-			Printer services are supported (int 17h)
-			CGA/mono video services are supported (int 10h)
-			ACPI is supported
-			USB legacy is supported
-			AGP is supported
-			IEEE 1394 boot is supported
-			Smart battery is supported
-			BIOS boot specification is supported
-			Function key-initiated network boot is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: Sony Corporation    
-		Product Name: PCG-NV105(FR)       
-		Version: 01                  
-		Serial Number: 28340154-5261258    
-		UUID: 46BEB3C0-02B6-11D6-86A4-0800465C02BE
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: Sony Corporation
-		Type: Notebook
-		Lock: Not Present
-		Version: N/A
-		Serial Number: 01        
-		Asset Tag: 9D7M1a64c7202000000000000000
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-		OEM Information: 0x00000000
-Handle 0x0003
-	DMI type 4, 35 bytes.
-	Processor Information
-		Socket Designation: N/A
-		Type: Central Processor
-		Family: Pentium 4
-		Manufacturer: Intel Corporation
-		ID: 24 0F 00 00 FF F9 EB 3F
-		Signature: Type 0, Family 15, Model 2, Stepping 4
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			CLFSH (CLFLUSH instruction supported)
-			DS (Debug store)
-			ACPI (ACPI supported)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-			SSE2 (Streaming SIMD extensions 2)
-			SS (Self-snoop)
-			HTT (Hyper-threading technology)
-			TM (Thermal monitor supported)
-		Version: N/A
-		Voltage: 3.3 V
-		External Clock: 100 MHz
-		Max Speed: 866 MHz
-		Current Speed: 1200 MHz
-		Status: Populated, Enabled
-		Upgrade: None
-		L1 Cache Handle: 0x0004
-		L2 Cache Handle: 0x0005
-		L3 Cache Handle: Not Provided
-		Serial Number: N/A
-		Asset Tag: N/A
-		Part Number: N/A
-Handle 0x0004
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L1Cache
-		Configuration: Enabled, Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 16 KB
-		Maximum Size: 16 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Asynchronous
-		Speed: Unknown
-		Error Correction Type: None
-		System Type: Instruction
-		Associativity: 4-way Set-associative
-Handle 0x0005
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L2Cache
-		Configuration: Enabled, Socketed, Level 2
-		Operational Mode: Write Back
-		Location: External
-		Installed Size: 512 KB
-		Maximum Size: 512 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Burst
-		Speed: Unknown
-		Error Correction Type: None
-		System Type: Data
-		Associativity: 4-way Set-associative
-Handle 0x0006
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCCARD1
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Available
-		Length: Short
-		ID: Adapter 1, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Modem ring resume is supported
-			Hot-plug devices are supported
-Handle 0x0007
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCCARD2
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Available
-		Length: Short
-		ID: Adapter 2, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Modem ring resume is supported
-			Hot-plug devices are supported
-Handle 0x0008
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: EU3203
-Handle 0x0009
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 512 MB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x000A
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0009
-		Error Information Handle: No Error
-		Total Width: 32 bits
-		Data Width: 32 bits
-		Size: 256 MB
-		Form Factor: SODIMM
-		Set: None
-		Locator: SODIMM1
-		Bank Locator: Bank 0
-		Type: SDRAM
-		Type Detail: Synchronous
-		Speed: 100 MHz (10.0 ns)
-		Manufacturer: N/A
-		Serial Number: N/A
-		Asset Tag: N/A
-		Part Number: N/A
-Handle 0x000B
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0009
-		Error Information Handle: No Error
-		Total Width: Unknown
-		Data Width: Unknown
-		Size: No Module Installed
-		Form Factor: SODIMM
-		Set: None
-		Locator: SODIMM2
-		Bank Locator: Bank 1
-		Type: SDRAM
-		Type Detail: Synchronous
-		Speed: 100 MHz (10.0 ns)
-		Manufacturer: N/A
-		Serial Number: N/A
-		Asset Tag: N/A
-		Part Number: N/A
-Handle 0x000C
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 256 MB
-		Physical Array Handle: 0x0009
-		Partition Width: 0
-Handle 0x000D
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x000A
-		Memory Array Mapped Address Handle: 0x000C
-		Partition Row Position: Unknown
-		Interleave Position: Unknown
-		Interleaved Data Depth: Unknown
-Handle 0x000E
-	DMI type 32, 20 bytes.
-	System Boot Information
-		Status: <OUT OF SPEC>
-Handle 0x000F
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Laptop.Sony-PCG-NV109M b/test/dmidecode.Laptop.Sony-PCG-NV109M
deleted file mode 100644
index 609a444c..00000000
--- a/test/dmidecode.Laptop.Sony-PCG-NV109M
+++ /dev/null
@@ -1,249 +0,0 @@
-# dmidecode 2.3 (=> Resolution: 1024x768) (=> Diagonal_size: 15)
-SMBIOS 2.31 present.
-16 structures occupying 642 bytes.
-Table at 0x000D8010.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: Phoenix Technologies LTD
-		Version: R0215B0
-		Release Date: 03/29/02
-		Address: 0xE5A30
-		Runtime Size: 107984 bytes
-		ROM Size: 512 kB
-		Characteristics:
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			ESCD support is available
-			3.5"/720 KB floppy services are supported (int 13h)
-			Print screen service is supported (int 5h)
-			8042 keyboard services are supported (int 9h)
-			Serial services are supported (int 14h)
-			Printer services are supported (int 17h)
-			CGA/mono video services are supported (int 10h)
-			ACPI is supported
-			USB legacy is supported
-			AGP is supported
-			IEEE 1394 boot is supported
-			Smart battery is supported
-			BIOS boot specification is supported
-			Function key-initiated network boot is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: Sony Corporation
-		Product Name: PCG-NV109M(GB)
-		Version: 01
-		Serial Number: 28340050-5101810
-		UUID: D82B1880-02B6-11D6-8670-0800465C0B02
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: Sony Corporation
-		Type: Notebook
-		Lock: Not Present
-		Version: N/A
-		Serial Number: 01
-		Asset Tag: 9D6M1a8467251c00000000000000
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-		OEM Information: 0x00000000
-Handle 0x0003
-	DMI type 4, 35 bytes.
-	Processor Information
-		Socket Designation: N/A
-		Type: Central Processor
-		Family: Pentium 4
-		Manufacturer: Intel Corporation
-		ID: 24 0F 00 00 FF F9 EB 3F
-		Signature: Type 0, Family 15, Model 2, Stepping 4
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			CLFSH (CLFLUSH instruction supported)
-			DS (Debug store)
-			ACPI (ACPI supported)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-			SSE2 (Streaming SIMD extensions 2)
-			SS (Self-snoop)
-			HTT (Hyper-threading technology)
-			TM (Thermal monitor supported)
-		Version: N/A
-		Voltage: 3.3 V
-		External Clock: 100 MHz
-		Max Speed: 866 MHz
-		Current Speed: 1200 MHz
-		Status: Populated, Enabled
-		Upgrade: None
-		L1 Cache Handle: 0x0004
-		L2 Cache Handle: 0x0005
-		L3 Cache Handle: Not Provided
-		Serial Number: N/A
-		Asset Tag: N/A
-		Part Number: N/A
-Handle 0x0004
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L1Cache
-		Configuration: Enabled, Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 16 KB
-		Maximum Size: 16 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Asynchronous
-		Speed: Unknown
-		Error Correction Type: None
-		System Type: Instruction
-		Associativity: 4-way Set-associative
-Handle 0x0005
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L2Cache
-		Configuration: Enabled, Socketed, Level 2
-		Operational Mode: Write Back
-		Location: External
-		Installed Size: 512 KB
-		Maximum Size: 512 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Burst
-		Speed: Unknown
-		Error Correction Type: None
-		System Type: Data
-		Associativity: 4-way Set-associative
-Handle 0x0006
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCCARD1
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Available
-		Length: Short
-		ID: Adapter 1, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Modem ring resume is supported
-			Hot-plug devices are supported
-Handle 0x0007
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCCARD2
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Available
-		Length: Short
-		ID: Adapter 2, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Modem ring resume is supported
-			Hot-plug devices are supported
-Handle 0x0008
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: EU3201
-Handle 0x0009
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 512 MB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x000A
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0009
-		Error Information Handle: No Error
-		Total Width: 32 bits
-		Data Width: 32 bits
-		Size: 256 MB
-		Form Factor: SODIMM
-		Set: None
-		Locator: SODIMM1
-		Bank Locator: Bank 0
-		Type: SDRAM
-		Type Detail: Synchronous
-		Speed: 100 MHz (10.0 ns)
-		Manufacturer: N/A
-		Serial Number: N/A
-		Asset Tag: N/A
-		Part Number: N/A
-Handle 0x000B
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0009
-		Error Information Handle: No Error
-		Total Width: Unknown
-		Data Width: Unknown
-		Size: No Module Installed
-		Form Factor: SODIMM
-		Set: None
-		Locator: SODIMM2
-		Bank Locator: Bank 1
-		Type: SDRAM
-		Type Detail: Synchronous
-		Speed: 100 MHz (10.0 ns)
-		Manufacturer: N/A
-		Serial Number: N/A
-		Asset Tag: N/A
-		Part Number: N/A
-Handle 0x000C
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 256 MB
-		Physical Array Handle: 0x0009
-		Partition Width: 0
-Handle 0x000D
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x000A
-		Memory Array Mapped Address Handle: 0x000C
-		Partition Row Position: Unknown
-		Interleave Position: Unknown
-		Interleaved Data Depth: Unknown
-Handle 0x000E
-	DMI type 32, 20 bytes.
-	System Boot Information
-		Status: <OUT OF SPEC>
-Handle 0x000F
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Laptop.Sony-Vaio-GRX316MP b/test/dmidecode.Laptop.Sony-Vaio-GRX316MP
deleted file mode 100644
index 23b9f1d3..00000000
--- a/test/dmidecode.Laptop.Sony-Vaio-GRX316MP
+++ /dev/null
@@ -1,247 +0,0 @@
-# dmidecode 2.4 (=> Resolution: 1600x1200) (=> Diagonal_size: 16.1)
-SMBIOS 2.31 present.
-16 structures occupying 642 bytes.
-Table at 0x000D8010.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: Phoenix Technologies LTD
-		Version: R0202B0
-		Release Date: 02/26/02  
-		Address: 0xE5B30
-		Runtime Size: 107728 bytes
-		ROM Size: 512 kB
-		Characteristics:
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			APM is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			ESCD support is available
-			3.5"/720 KB floppy services are supported (int 13h)
-			Print screen service is supported (int 5h)
-			8042 keyboard services are supported (int 9h)
-			Serial services are supported (int 14h)
-			Printer services are supported (int 17h)
-			CGA/mono video services are supported (int 10h)
-			ACPI is supported
-			USB legacy is supported
-			AGP is supported
-			IEEE 1394 boot is supported
-			Smart battery is supported
-			BIOS boot specification is supported
-			Function key-initiated network boot is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: Sony Corporation    
-		Product Name: PCG-GRX316MP(IT)    
-		Version: 01                  
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: Sony Corporation
-		Type: Notebook
-		Lock: Not Present
-		Version: N/A
-		Serial Number: 01        
-		Asset Tag: 8A2M555b5324320000000000ffff
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-		OEM Information: 0x00000000
-Handle 0x0003
-	DMI type 4, 35 bytes.
-	Processor Information
-		Socket Designation: N/A
-		Type: Central Processor
-		Family: Pentium 4
-		Manufacturer: Intel Corporation
-		ID: 24 0F 00 00 FF F9 EB 3F
-		Signature: Type 0, Family 15, Model 2, Stepping 4
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			CLFSH (CLFLUSH instruction supported)
-			DS (Debug store)
-			ACPI (ACPI supported)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-			SSE2 (Streaming SIMD extensions 2)
-			SS (Self-snoop)
-			HTT (Hyper-threading technology)
-			TM (Thermal monitor supported)
-		Version: N/A
-		Voltage: 3.3 V
-		External Clock: 100 MHz
-		Max Speed: 866 MHz
-		Current Speed: 1200 MHz
-		Status: Populated, Enabled
-		Upgrade: None
-		L1 Cache Handle: 0x0004
-		L2 Cache Handle: 0x0005
-		L3 Cache Handle: Not Provided
-		Serial Number: N/A
-		Asset Tag: N/A
-		Part Number: N/A
-Handle 0x0004
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L1Cache
-		Configuration: Enabled, Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 16 KB
-		Maximum Size: 16 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Asynchronous
-		Speed: Unknown
-		Error Correction Type: None
-		System Type: Instruction
-		Associativity: 4-way Set-associative
-Handle 0x0005
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L2Cache
-		Configuration: Enabled, Socketed, Level 2
-		Operational Mode: Write Back
-		Location: External
-		Installed Size: 512 KB
-		Maximum Size: 512 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Burst
-		Speed: Unknown
-		Error Correction Type: None
-		System Type: Data
-		Associativity: 4-way Set-associative
-Handle 0x0006
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCCARD1
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Available
-		Length: Short
-		ID: Adapter 1, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Modem ring resume is supported
-			Hot-plug devices are supported
-Handle 0x0007
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: PCCARD2
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Available
-		Length: Short
-		ID: Adapter 2, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Modem ring resume is supported
-			Hot-plug devices are supported
-Handle 0x0008
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: EU1901
-Handle 0x0009
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 512 MB
-		Error Information Handle: Not Provided
-		Number Of Devices: 2
-Handle 0x000A
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0009
-		Error Information Handle: No Error
-		Total Width: Unknown
-		Data Width: Unknown
-		Size: No Module Installed
-		Form Factor: SODIMM
-		Set: None
-		Locator: SODIMM1
-		Bank Locator: Bank 0
-		Type: SDRAM
-		Type Detail: Synchronous
-		Speed: 100 MHz (10.0 ns)
-		Manufacturer: N/A
-		Serial Number: N/A
-		Asset Tag: N/A
-		Part Number: N/A
-Handle 0x000B
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0009
-		Error Information Handle: No Error
-		Total Width: 32 bits
-		Data Width: 32 bits
-		Size: 256 MB
-		Form Factor: SODIMM
-		Set: None
-		Locator: SODIMM2
-		Bank Locator: Bank 1
-		Type: SDRAM
-		Type Detail: Synchronous
-		Speed: 100 MHz (10.0 ns)
-		Manufacturer: N/A
-		Serial Number: N/A
-		Asset Tag: N/A
-		Part Number: N/A
-Handle 0x000C
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 256 MB
-		Physical Array Handle: 0x0009
-		Partition Width: 0
-Handle 0x000D
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x000000003FF
-		Range Size: 1 kB
-		Physical Device Handle: 0x000A
-		Memory Array Mapped Address Handle: 0x000C
-		Partition Row Position: Unknown
-		Interleave Position: Unknown
-		Interleaved Data Depth: Unknown
-Handle 0x000E
-	DMI type 32, 20 bytes.
-	System Boot Information
-		Status: <OUT OF SPEC>
-Handle 0x000F
-	DMI type 127, 4 bytes.
-	End Of Table
diff --git a/test/dmidecode.Laptop.Toshiba-Satellite-2430 b/test/dmidecode.Laptop.Toshiba-Satellite-2430
deleted file mode 100644
index bfa9b8e8..00000000
--- a/test/dmidecode.Laptop.Toshiba-Satellite-2430
+++ /dev/null
@@ -1,376 +0,0 @@
-# dmidecode 2.4 (=> Module: toshiba) (=> Pkg: toshutils)
-SMBIOS 2.31 present.
-30 structures occupying 1011 bytes.
-Table at 0x000E3010.
-Handle 0x0000
-	DMI type 0, 20 bytes.
-	BIOS Information
-		Vendor: TOSHIBA
-		Version: V1.60
-		Release Date: 05/19/2003
-		Address: 0xE5630
-		Runtime Size: 109008 bytes
-		ROM Size: 512 kB
-		Characteristics:
-			PCI is supported
-			PC Card (PCMCIA) is supported
-			PNP is supported
-			BIOS is upgradeable
-			BIOS shadowing is allowed
-			Boot from CD is supported
-			Selectable boot is supported
-			Japanese floppy for Toshiba 1.2 MB is supported (int 13h)
-			Print screen service is supported (int 5h)
-			8042 keyboard services are supported (int 9h)
-			Serial services are supported (int 14h)
-			Printer services are supported (int 17h)
-			CGA/mono video services are supported (int 10h)
-			ACPI is supported
-			USB legacy is supported
-			AGP is supported
-			IEEE 1394 boot is supported
-			Smart battery is supported
-			BIOS boot specification is supported
-Handle 0x0001
-	DMI type 1, 25 bytes.
-	System Information
-		Manufacturer: TOSHIBA
-		Product Name: Satellite 2430
-		Version: PS243E-0D2WS-GR
-		Serial Number: 23634271G.SS243-0D2WSGR+0OL
-		UUID: 2C53BBE6-2CB8-11D7-9837-00023F7F9109
-		Wake-up Type: Power Switch
-Handle 0x0002
-	DMI type 2, 8 bytes.
-	Base Board Information
-		Manufacturer: TOSHIBA
-		Product Name: BTS88
-		Version: Null
-		Serial Number: 0123456789AB
-Handle 0x0003
-	DMI type 3, 17 bytes.
-	Chassis Information
-		Manufacturer: TOSHIBA
-		Type: Notebook
-		Lock: Not Present
-		Version: N/A
-		Serial Number: None
-		Asset Tag: No Asset Tag
-		Boot-up State: Safe
-		Power Supply State: Safe
-		Thermal State: Safe
-		Security Status: None
-		OEM Information: 0x00001234
-Handle 0x0004
-	DMI type 4, 35 bytes.
-	Processor Information
-		Socket Designation: WMT478/NWD
-		Type: Central Processor
-		Family: Pentium 4
-		Manufacturer: Intel
-		ID: 27 0F 00 00 FF F9 EB BF
-		Signature: Type 0, Family 15, Model 2, Stepping 7
-		Flags:
-			FPU (Floating-point unit on-chip)
-			VME (Virtual mode extension)
-			DE (Debugging extension)
-			PSE (Page size extension)
-			TSC (Time stamp counter)
-			MSR (Model specific registers)
-			PAE (Physical address extension)
-			MCE (Machine check exception)
-			CX8 (CMPXCHG8 instruction supported)
-			SEP (Fast system call)
-			MTRR (Memory type range registers)
-			PGE (Page global enable)
-			MCA (Machine check architecture)
-			CMOV (Conditional move instruction supported)
-			PAT (Page attribute table)
-			PSE-36 (36-bit page size extension)
-			CLFSH (CLFLUSH instruction supported)
-			DS (Debug store)
-			ACPI (ACPI supported)
-			MMX (MMX technology supported)
-			FXSR (Fast floating-point save and restore)
-			SSE (Streaming SIMD extensions)
-			SSE2 (Streaming SIMD extensions 2)
-			SS (Self-snoop)
-			HTT (Hyper-threading technology)
-			TM (Thermal monitor supported)
-			SBF (Signal break on FERR)
-		Version: C1
-		Voltage: 1.8 V
-		External Clock: Unknown
-		Max Speed: 3200 MHz
-		Current Speed: 2660 MHz
-		Status: Populated, Enabled
-		Upgrade: Slot 1
-		L1 Cache Handle: 0x0008
-		L2 Cache Handle: 0x0009
-		L3 Cache Handle: Not Provided
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0005
-	DMI type 5, 22 bytes.
-	Memory Controller Information
-		Error Detecting Method: None
-		Error Correcting Capabilities:
-			None
-		Supported Interleave: One-way Interleave
-		Current Interleave: One-way Interleave
-		Maximum Memory Module Size: 512 MB
-		Maximum Total Memory Size: 1536 MB
-		Supported Speeds:
-			70 ns
-			60 ns
-		Supported Memory Types:
-			DIMM
-			SDRAM
-		Memory Module Voltage: 3.3 V
-		Associated Memory Slots: 3
-			0x0006
-			0x0007
-			0x0008
-		Enabled Error Correcting Capabilities:
-			None
-Handle 0x0006
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: M1
-		Bank Connections: 0 1
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 256 MB (Double-bank Connection)
-		Enabled Size: 256 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0007
-	DMI type 6, 12 bytes.
-	Memory Module Information
-		Socket Designation: M2
-		Bank Connections: 2 3
-		Current Speed: Unknown
-		Type: DIMM SDRAM
-		Installed Size: 256 MB (Double-bank Connection)
-		Enabled Size: 256 MB (Double-bank Connection)
-		Error Status: OK
-Handle 0x0008
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L1 Cache
-		Configuration: Enabled, Socketed, Level 1
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 16 KB
-		Maximum Size: 16 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Asynchronous
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Unknown
-		Associativity: Unknown
-Handle 0x0009
-	DMI type 7, 19 bytes.
-	Cache Information
-		Socket Designation: L2 Cache
-		Configuration: Enabled, Socketed, Level 2
-		Operational Mode: Write Back
-		Location: Internal
-		Installed Size: 512 KB
-		Maximum Size: 512 KB
-		Supported SRAM Types:
-			Burst
-			Pipeline Burst
-			Asynchronous
-		Installed SRAM Type: Burst
-		Speed: Unknown
-		Error Correction Type: Unknown
-		System Type: Unknown
-		Associativity: Unknown
-Handle 0x000A
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: JP8
-		Internal Connector Type: 25 Pin Dual Inline (pin 26 cut)
-		External Reference Designator: Parallel
-		External Connector Type: DB-25 female
-		Port Type: Parallel Port ECP/EPP
-Handle 0x000B
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: JP10
-		Internal Connector Type: None
-		External Reference Designator: SVGA-Out
-		External Connector Type: DB-15 female
-		Port Type: Video Port
-Handle 0x000C
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: JP2/JP19
-		Internal Connector Type: None
-		External Reference Designator: USB
-		External Connector Type: Access Bus (USB)
-		Port Type: USB
-Handle 0x000D
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: JP9
-		Internal Connector Type: None
-		External Reference Designator: 1394
-		External Connector Type: IEEE 1394
-		Port Type: Firewire (IEEE P1394)
-Handle 0x000E
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: JP5
-		Internal Connector Type: None
-		External Reference Designator: MIC_IN
-		External Connector Type: RJ-11
-		Port Type: MIDI Port
-Handle 0x000F
-	DMI type 8, 9 bytes.
-	Port Connector Information
-		Internal Reference Designator: JP4
-		Internal Connector Type: None
-		External Reference Designator: HEADPHONE
-		External Connector Type: RJ-11
-		Port Type: MIDI Port
-Handle 0x0010
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: OZ6933-1
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Unknown
-		Length: Other
-		ID: Adapter 0, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Hot-plug devices are supported
-Handle 0x0011
-	DMI type 9, 13 bytes.
-	System Slot Information
-		Designation: OZ6933-2
-		Type: 32-bit PC Card (PCMCIA)
-		Current Usage: Unknown
-		Length: Other
-		ID: Adapter 0, Socket 0
-		Characteristics:
-			5.0 V is provided
-			3.3 V is provided
-			PC Card-16 is supported
-			Cardbus is supported
-			Hot-plug devices are supported
-Handle 0x0012
-	DMI type 10, 8 bytes.
-	On Board Device 1 Information
-		Type: Video
-		Status: Disabled
-		Description: nVidia NV17M
-	On Board Device 2 Information
-		Type: Sound
-		Status: Disabled
-		Description: Realtek ACL202
-Handle 0x0013
-	DMI type 11, 5 bytes.
-	OEM Strings
-		String 1: PS243EX0CPER,PS243EX0CPER
-Handle 0x0014
-	DMI type 12, 5 bytes.
-	System Configuration Options
-Handle 0x0015
-	DMI type 16, 15 bytes.
-	Physical Memory Array
-		Location: System Board Or Motherboard
-		Use: System Memory
-		Error Correction Type: None
-		Maximum Capacity: 512 MB
-		Error Information Handle: Not Provided
-		Number Of Devices: 3
-Handle 0x0016
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0015
-		Error Information Handle: No Error
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 256 MB
-		Form Factor: DIMM
-		Set: 1
-		Locator: J6J1
-		Bank Locator: DIMM 0
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: Unknown
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0017
-	DMI type 17, 27 bytes.
-	Memory Device
-		Array Handle: 0x0015
-		Error Information Handle: No Error
-		Total Width: 64 bits
-		Data Width: 64 bits
-		Size: 256 MB
-		Form Factor: DIMM
-		Set: 1
-		Locator: J6J2
-		Bank Locator: DIMM 1
-		Type: DDR
-		Type Detail: Synchronous
-		Speed: Unknown
-		Manufacturer: Not Specified
-		Serial Number: Not Specified
-		Asset Tag: Not Specified
-		Part Number: Not Specified
-Handle 0x0018
-	DMI type 19, 15 bytes.
-	Memory Array Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0001FFFFFFF
-		Range Size: 512 MB
-		Physical Array Handle: 0x0015
-		Partition Width: 0
-Handle 0x0019
-	DMI type 20, 19 bytes.
-	Memory Device Mapped Address
-		Starting Address: 0x00000000000
-		Ending Address: 0x0000FFFFFFF
-		Range Size: 256 MB
-		Physical Device Handle: 0x0016
-		Memory Array Mapped Address Handle: 0x0018
-		Partition Row Position: 2
-Handle 0x001A
-	DMI type 21, 7 bytes.
-	Built-in Pointing Device
-		Type: Touch Pad
-		Interface: PS/2
-		Buttons: 2
-Handle 0x001B
-	DMI type 22, 26 bytes.
-	Portable Battery
-		Location: 1st Battery
-		Manufacturer: SONY      
-		Manufacture Date: 12/01/2002
-		Serial Number: 3658Q
-		Name: PA3250U 
-		Chemistry: Lithium Ion
-		Design Capacity: 3900 mWh
-		Design Voltage: 14800 mV
-		SBDS Version: Not Specified
-		Maximum Error: 0%
-		OEM-specific Information: 0x00000000
-Handle 0x001C
-	DMI type 32, 20 bytes.
-	System Boot Information
-		Status: <OUT OF SPEC>
-Handle 0x001D
-	DMI type 127, 4 bytes.
-	End Of Table