Reworked the organization of the examples

Examples were previously just a symlink to passing tests.  This symlink
didn't show well in github.  Instead examples is now the directory and
pass is the symbolic link.

- removed examples link
- moved tests/pass directory to examples
- creates tests/pass -> examples link

49 files changed, 1 insertions, 2247 deletions

diff --git a/tests/pass b/tests/pass
new file mode 120000
index 0000000..a6573af
--- /dev/null
+++ b/tests/pass
@@ -0,0 +1 @@
+../examples
\ No newline at end of file
diff --git a/tests/pass/bindatainput/bindatainput.tvpd b/tests/pass/bindatainput/bindatainput.tvpd
deleted file mode 100644
index a96cbfa..0000000
--- a/tests/pass/bindatainput/bindatainput.tvpd
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<vpd>
-  <name>FILENAME</name>
-  <size>16kb</size>
-  <VD>01</VD>
-  <record name="VINI">
-    <rdesc>The VINI record</rdesc>
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VINI</kwdata>
-    </keyword>
-    <keyword name="NM">
-      <kwdesc>The name keyword</kwdesc>
-      <kwformat>bin</kwformat>
-      <kwlen>5</kwlen>
-      <kwdata>name.bin</kwdata>
-    </keyword>
-  </record>
-</vpd>
diff --git a/tests/pass/bindatainput/name.bin b/tests/pass/bindatainput/name.bin
deleted file mode 100644
index d76e2b0..0000000
--- a/tests/pass/bindatainput/name.bin
+++ /dev/null
@@ -1 +0,0 @@
-JASON
\ No newline at end of file
diff --git a/tests/pass/hexwithcomments/hexwithcomments.tvpd b/tests/pass/hexwithcomments/hexwithcomments.tvpd
deleted file mode 100644
index a4dd75b..0000000
--- a/tests/pass/hexwithcomments/hexwithcomments.tvpd
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<vpd>
-  <name>FILENAME</name>
-  <size>16kb</size>
-  <VD>01</VD>
-  <record name="VINI">
-    <rdesc>The VINI record</rdesc>
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VINI</kwdata>
-    </keyword>
-    <keyword name="BD">
-      <kwdesc>The Big Data keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>128</kwlen>
-      <kwdata>
-        <!-- Offset 0 -->
-        00000000 00000000 00000000 00000000
-        00000000 00000000 00000000 00000000
-        00000000 00000000 00000000 00000000
-        00000000 00000000 00000000 00000000
-        <!-- Offset 128 -->
-        00000000 00000000 00000000 00000000
-        00000000 00000000 00000000 00000000
-        00000000 00000000 00000000 00000000
-        00000000 00000000 00000000 00000000
-      </kwdata>
-    </keyword>
-  </record>
-</vpd>
diff --git a/tests/pass/memcard/memcard.tvpd b/tests/pass/memcard/memcard.tvpd
deleted file mode 100644
index b759f2a..0000000
--- a/tests/pass/memcard/memcard.tvpd
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-  <name>FILENAME</name>
-  <size>16kb</size>
-  <VD>01</VD>
-
-  <record name="VINI">
-    <rtvpdfile>openPower_vini_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="OPFR">
-    <rtvpdfile>openPower_opfr_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="VNDR">
-    <rtvpdfile>openPower_vndr_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="SPDX">
-    <rtvpdfile>openPower_spdx_membuf1_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="VEIR">
-    <rtvpdfile>openPower_veir_MCsample.xml</rtvpdfile>
-  </record>
-
-  <record name="VER0">
-    <rtvpdfile>openPower_ver0_MCsample.xml</rtvpdfile>
-  </record>
-
-  <record name="MER0">
-    <rtvpdfile>openPower_mer0_MCsample.xml</rtvpdfile>
-  </record>
-
-  <record name="VMSC">
-    <rtvpdfile>openPower_vmsc_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="VRTN">
-    <rtvpdfile>openPower_vrtn_sample.xml</rtvpdfile>
-  </record>
-</vpd>
diff --git a/tests/pass/memcard/openPower_mer0_MCsample.xml b/tests/pass/memcard/openPower_mer0_MCsample.xml
deleted file mode 100644
index b139c06..0000000
--- a/tests/pass/memcard/openPower_mer0_MCsample.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="MER0">
-    <rdesc>The Manufacturing repair data record for Memriser</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>MER0</kwdata>
-    </keyword>
-
-    <keyword name="#I">
-      <kwdesc>Repair Data </kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>48</kwlen>
-      <kwdata>01040800</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/memcard/openPower_opfr_sample.xml b/tests/pass/memcard/openPower_opfr_sample.xml
deleted file mode 100644
index 2e0b0e4..0000000
--- a/tests/pass/memcard/openPower_opfr_sample.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="OPFR">
-    <rdesc>The OPFR record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>OPFR</kwdata>
-    </keyword>
-
-    <keyword name="VD">
-      <kwdesc>Record Version</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>01</kwdata>
-    </keyword>
-
-    <keyword name="VN">
-      <kwdesc>Vendor Name</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>0000000000000000</kwdata>
-    </keyword>
-
-    <keyword name="DR">
-      <kwdesc>FRU Description</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>0000000000000000</kwdata>
-    </keyword>
-
-    <keyword name="VP">
-      <kwdesc>Card Part Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>0000000000000000</kwdata>
-    </keyword>
-
-    <keyword name="VS">
-      <kwdesc>Card Serial Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>0000000000000000</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/memcard/openPower_spdx_membuf1_sample.xml b/tests/pass/memcard/openPower_spdx_membuf1_sample.xml
deleted file mode 100644
index d9e9ff8..0000000
--- a/tests/pass/memcard/openPower_spdx_membuf1_sample.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="SPDX">
-    <rdesc>The Memory data record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>SPDX</kwdata>
-    </keyword>
-
-    <keyword name="VD">
-      <kwdesc>Record Version keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>02</kwdata>
-    </keyword>
-
-    <keyword name="VM">
-      <kwdesc>Memory data version keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>00000000</kwdata>
-    </keyword>
-
-    <keyword name="DW">
-      <kwdesc>Memory Buffer Voltage keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>0000</kwdata>
-    </keyword>
-
-    <keyword name="MX">
-      <kwdesc>Bank Delete keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>64</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="M0">
-      <kwdesc>MR Centaur Mappter (Centaur MRUID)Delete keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>32</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="M1">
-      <kwdesc>First copy of MR data keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="T1">
-      <kwdesc>First copy of MT data keyword (1 dimm 1 rank)</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="T2">
-      <kwdesc>Second copy of MT data (1 dimm 2 ranks)</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="T4">
-      <kwdesc>Third copy of MT data (1 dimm 4 ranks)</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="Q0">
-      <kwdesc>DQ Data mapper-Memory Buffer MRUID</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>32</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="Q1">
-      <kwdesc>First copy of DQ</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>96</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="K0">
-      <kwdesc>DQS Data mapper-Memory Buffer MRUID</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>32</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="K1">
-      <kwdesc>First copy of DQS</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>32</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/memcard/openPower_veir_MCsample.xml b/tests/pass/memcard/openPower_veir_MCsample.xml
deleted file mode 100644
index 5948a09..0000000
--- a/tests/pass/memcard/openPower_veir_MCsample.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-  <record name="VEIR">
-    <rdesc>The Field repair data  record for Memriser</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VEIR</kwdata>
-    </keyword>
-
-    <keyword name="#I">
-      <kwdesc>Repair Data </kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>96</kwlen>
-      <kwdata>01041400</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/memcard/openPower_ver0_MCsample.xml b/tests/pass/memcard/openPower_ver0_MCsample.xml
deleted file mode 100644
index 933c01c..0000000
--- a/tests/pass/memcard/openPower_ver0_MCsample.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-  <record name="VER0">
-    <rdesc>The Vendor repair data record for Memriser</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VER0</kwdata>
-    </keyword>
-
-    <keyword name="#I">
-      <kwdesc>Repair Data </kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>48</kwlen>
-      <kwdata>01040800</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/memcard/openPower_vini_sample.xml b/tests/pass/memcard/openPower_vini_sample.xml
deleted file mode 100644
index 91c860a..0000000
--- a/tests/pass/memcard/openPower_vini_sample.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="VINI">
-    <rdesc>Initial VPD Record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VINI</kwdata>
-    </keyword>
-
-    <keyword name="DR">
-      <kwdesc>Description</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>SYSTEM PLANAR  </kwdata>
-    </keyword>
-    
-    <keyword name="CE">
-      <kwdesc>CCIN Extension</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>1</kwlen>
-      <kwdata>1</kwdata>
-    </keyword>
-
-    <keyword name="VZ">
-      <kwdesc>Overall VPD version</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>01</kwdata>
-    </keyword>
-
-    <keyword name="FN">
-      <kwdesc>FRU Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>7</kwlen>
-      <kwdata>0000000</kwdata>
-    </keyword>
-
-    <keyword name="PN">
-      <kwdesc>Card Part Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>7</kwlen>
-      <kwdata>0000000</kwdata>
-    </keyword>
-
-    <keyword name="SN">
-      <kwdesc>Card Serial Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>12</kwlen>
-      <kwdata>000000000000</kwdata>
-    </keyword>
-
-    <keyword name="CC">
-      <kwdesc>Card CCIN Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>P0XX</kwdata>
-    </keyword>
-
-    <keyword name="HE">
-      <kwdesc>Hardware EC</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>0001</kwdata>
-    </keyword>
-
-    <keyword name="CT">
-      <kwdesc>Card Type</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>00000000</kwdata>
-    </keyword>
-
-    <keyword name="HW">
-      <kwdesc>Hardware Level</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>0001</kwdata>
-    </keyword>
-
-    <keyword name="B3">
-      <kwdesc>Hardware Characteristics</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>6</kwlen>
-      <kwdata>000000000001</kwdata>
-    </keyword>
-
-    <keyword name="B4">
-      <kwdesc>Manufacturing FRU Control</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>1</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="B7">
-      <kwdesc>Hardware Level</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>12</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/memcard/openPower_vmsc_sample.xml b/tests/pass/memcard/openPower_vmsc_sample.xml
deleted file mode 100644
index cc65fbd..0000000
--- a/tests/pass/memcard/openPower_vmsc_sample.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="VMSC">
-    <rdesc>The VMSC record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VMSC</kwdata>
-    </keyword>
-
-    <keyword name="IN">
-      <kwdesc>Free Space for Software Data</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>205</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/memcard/openPower_vndr_sample.xml b/tests/pass/memcard/openPower_vndr_sample.xml
deleted file mode 100644
index f8d6438..0000000
--- a/tests/pass/memcard/openPower_vndr_sample.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="VNDR">
-    <rdesc>The VNDR record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VNDR</kwdata>
-    </keyword>
-
-    <keyword name="VD">
-      <kwdesc>Record Version</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>01</kwdata>
-    </keyword>
-
-    <keyword name="IN">
-      <kwdesc>Vendor Specific Data</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>128</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/memcard/openPower_vrtn_sample.xml b/tests/pass/memcard/openPower_vrtn_sample.xml
deleted file mode 100644
index 4c2a97e..0000000
--- a/tests/pass/memcard/openPower_vrtn_sample.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="VRTN">
-    <rdesc>The VRTN record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VRTN</kwdata>
-    </keyword>
-
-    <keyword name="SO">
-      <kwdesc>The SO keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="IN">
-      <kwdesc>Free Space for Sofware Data</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>254</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="I2">
-      <kwdesc>Additional Free Space for Sofware Data</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>254</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/memcard2/memcard2.tvpd b/tests/pass/memcard2/memcard2.tvpd
deleted file mode 100644
index daade8f..0000000
--- a/tests/pass/memcard2/memcard2.tvpd
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-  <name>FILENAME</name>
-  <size>16kb</size>
-  <VD>01</VD>
-
-  <record name="VINI">
-    <rtvpdfile>openPower_vini_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="OPFR">
-    <rtvpdfile>openPower_opfr_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="VNDR">
-    <rtvpdfile>openPower_vndr_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="SPDX">
-    <rtvpdfile>openPower_spdx_membuf4_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="VEIR">
-    <rtvpdfile>openPower_veir_MCsample.xml</rtvpdfile>
-  </record>
-
-  <record name="VER0">
-    <rtvpdfile>openPower_ver0_MCsample.xml</rtvpdfile>
-  </record>
-
-  <record name="MER0">
-    <rtvpdfile>openPower_mer0_MCsample.xml</rtvpdfile>
-  </record>
-
-  <record name="VMSC">
-    <rtvpdfile>openPower_vmsc_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="VRTN">
-    <rtvpdfile>openPower_vrtn_sample.xml</rtvpdfile>
-  </record>
-
-</vpd>
diff --git a/tests/pass/memcard2/openPower_mer0_MCsample.xml b/tests/pass/memcard2/openPower_mer0_MCsample.xml
deleted file mode 100644
index b139c06..0000000
--- a/tests/pass/memcard2/openPower_mer0_MCsample.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="MER0">
-    <rdesc>The Manufacturing repair data record for Memriser</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>MER0</kwdata>
-    </keyword>
-
-    <keyword name="#I">
-      <kwdesc>Repair Data </kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>48</kwlen>
-      <kwdata>01040800</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/memcard2/openPower_opfr_sample.xml b/tests/pass/memcard2/openPower_opfr_sample.xml
deleted file mode 100644
index 2e0b0e4..0000000
--- a/tests/pass/memcard2/openPower_opfr_sample.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="OPFR">
-    <rdesc>The OPFR record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>OPFR</kwdata>
-    </keyword>
-
-    <keyword name="VD">
-      <kwdesc>Record Version</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>01</kwdata>
-    </keyword>
-
-    <keyword name="VN">
-      <kwdesc>Vendor Name</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>0000000000000000</kwdata>
-    </keyword>
-
-    <keyword name="DR">
-      <kwdesc>FRU Description</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>0000000000000000</kwdata>
-    </keyword>
-
-    <keyword name="VP">
-      <kwdesc>Card Part Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>0000000000000000</kwdata>
-    </keyword>
-
-    <keyword name="VS">
-      <kwdesc>Card Serial Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>0000000000000000</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/memcard2/openPower_spdx_membuf4_sample.xml b/tests/pass/memcard2/openPower_spdx_membuf4_sample.xml
deleted file mode 100644
index e376a2e..0000000
--- a/tests/pass/memcard2/openPower_spdx_membuf4_sample.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-
-  <record name="SPDX">
-    <rdesc>The Memory data record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>SPDX</kwdata>
-    </keyword>
-
-    <keyword name="VD">
-      <kwdesc>Record Version keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>03</kwdata>
-    </keyword>
-
-    <keyword name="VM">
-      <kwdesc>Memory data version keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>00000000</kwdata>
-    </keyword>
-
-    <keyword name="DW">
-      <kwdesc>Memory Buffer Voltage keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>0000</kwdata>
-    </keyword>
-
-    <keyword name="MX">
-      <kwdesc>Bank Delete keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>64</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="M0">
-      <kwdesc>MR Centaur Mappter (Centaur MRUID)Delete keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>32</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="M1">
-      <kwdesc>First copy of MR data keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="M2">
-      <kwdesc>Second copy of MR data keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="M3">
-      <kwdesc>Third copy of MR data keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="M4">
-      <kwdesc>Fourth copy of MR data keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="T1">
-      <kwdesc>First copy of MT data keyword (1 dimm 1 rank)</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="T2">
-      <kwdesc>Second copy of MT data (1 dimm 2 ranks)</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="T4">
-      <kwdesc>Third copy of MT data (1 dimm 4 ranks)</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="T5">
-      <kwdesc>Fourth copy of MT data keyword (2 dimm 1 rank)</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="T6">
-      <kwdesc>Fifth copy of MT data keyword (2 dimm 2 ranks)</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="T8">
-      <kwdesc>Sixth copy of MT data keyword (2 dimm 4 ranks)</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="Q0">
-      <kwdesc>DQ Data mapper-Memory Buffer MRUID</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>32</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="Q1">
-      <kwdesc>First copy of DQ</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>96</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="Q2">
-      <kwdesc>Second copy of DQ</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>96</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="Q3">
-      <kwdesc>Third copy of DQ</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>96</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="Q4">
-      <kwdesc>Fourth copy of DQ</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>96</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="K0">
-      <kwdesc>DQS Data mapper-Memory Buffer MRUID</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>32</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="K1">
-      <kwdesc>First copy of DQS</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>32</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="K2">
-      <kwdesc>Second copy of DQS</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>32</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="K3">
-      <kwdesc>Third copy of DQS</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>32</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="K4">
-      <kwdesc>Fourth copy of DQS</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>32</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
-
diff --git a/tests/pass/memcard2/openPower_veir_MCsample.xml b/tests/pass/memcard2/openPower_veir_MCsample.xml
deleted file mode 100644
index 5948a09..0000000
--- a/tests/pass/memcard2/openPower_veir_MCsample.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-  <record name="VEIR">
-    <rdesc>The Field repair data  record for Memriser</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VEIR</kwdata>
-    </keyword>
-
-    <keyword name="#I">
-      <kwdesc>Repair Data </kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>96</kwlen>
-      <kwdata>01041400</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/memcard2/openPower_ver0_MCsample.xml b/tests/pass/memcard2/openPower_ver0_MCsample.xml
deleted file mode 100644
index 933c01c..0000000
--- a/tests/pass/memcard2/openPower_ver0_MCsample.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-  <record name="VER0">
-    <rdesc>The Vendor repair data record for Memriser</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VER0</kwdata>
-    </keyword>
-
-    <keyword name="#I">
-      <kwdesc>Repair Data </kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>48</kwlen>
-      <kwdata>01040800</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/memcard2/openPower_vini_sample.xml b/tests/pass/memcard2/openPower_vini_sample.xml
deleted file mode 100644
index 91c860a..0000000
--- a/tests/pass/memcard2/openPower_vini_sample.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="VINI">
-    <rdesc>Initial VPD Record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VINI</kwdata>
-    </keyword>
-
-    <keyword name="DR">
-      <kwdesc>Description</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>SYSTEM PLANAR  </kwdata>
-    </keyword>
-    
-    <keyword name="CE">
-      <kwdesc>CCIN Extension</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>1</kwlen>
-      <kwdata>1</kwdata>
-    </keyword>
-
-    <keyword name="VZ">
-      <kwdesc>Overall VPD version</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>01</kwdata>
-    </keyword>
-
-    <keyword name="FN">
-      <kwdesc>FRU Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>7</kwlen>
-      <kwdata>0000000</kwdata>
-    </keyword>
-
-    <keyword name="PN">
-      <kwdesc>Card Part Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>7</kwlen>
-      <kwdata>0000000</kwdata>
-    </keyword>
-
-    <keyword name="SN">
-      <kwdesc>Card Serial Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>12</kwlen>
-      <kwdata>000000000000</kwdata>
-    </keyword>
-
-    <keyword name="CC">
-      <kwdesc>Card CCIN Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>P0XX</kwdata>
-    </keyword>
-
-    <keyword name="HE">
-      <kwdesc>Hardware EC</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>0001</kwdata>
-    </keyword>
-
-    <keyword name="CT">
-      <kwdesc>Card Type</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>00000000</kwdata>
-    </keyword>
-
-    <keyword name="HW">
-      <kwdesc>Hardware Level</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>0001</kwdata>
-    </keyword>
-
-    <keyword name="B3">
-      <kwdesc>Hardware Characteristics</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>6</kwlen>
-      <kwdata>000000000001</kwdata>
-    </keyword>
-
-    <keyword name="B4">
-      <kwdesc>Manufacturing FRU Control</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>1</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="B7">
-      <kwdesc>Hardware Level</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>12</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/memcard2/openPower_vmsc_sample.xml b/tests/pass/memcard2/openPower_vmsc_sample.xml
deleted file mode 100644
index cc65fbd..0000000
--- a/tests/pass/memcard2/openPower_vmsc_sample.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="VMSC">
-    <rdesc>The VMSC record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VMSC</kwdata>
-    </keyword>
-
-    <keyword name="IN">
-      <kwdesc>Free Space for Software Data</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>205</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/memcard2/openPower_vndr_sample.xml b/tests/pass/memcard2/openPower_vndr_sample.xml
deleted file mode 100644
index f8d6438..0000000
--- a/tests/pass/memcard2/openPower_vndr_sample.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="VNDR">
-    <rdesc>The VNDR record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VNDR</kwdata>
-    </keyword>
-
-    <keyword name="VD">
-      <kwdesc>Record Version</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>01</kwdata>
-    </keyword>
-
-    <keyword name="IN">
-      <kwdesc>Vendor Specific Data</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>128</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/memcard2/openPower_vrtn_sample.xml b/tests/pass/memcard2/openPower_vrtn_sample.xml
deleted file mode 100644
index 4c2a97e..0000000
--- a/tests/pass/memcard2/openPower_vrtn_sample.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="VRTN">
-    <rdesc>The VRTN record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VRTN</kwdata>
-    </keyword>
-
-    <keyword name="SO">
-      <kwdesc>The SO keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="IN">
-      <kwdesc>Free Space for Sofware Data</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>254</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="I2">
-      <kwdesc>Additional Free Space for Sofware Data</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>254</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/rbinfile/rbinfile-VMSC.rvpd b/tests/pass/rbinfile/rbinfile-VMSC.rvpd
deleted file mode 100644
index 02205e1..0000000
--- a/tests/pass/rbinfile/rbinfile-VMSC.rvpd
+++ /dev/null
diff --git a/tests/pass/rbinfile/rbinfile.tvpd b/tests/pass/rbinfile/rbinfile.tvpd
deleted file mode 100644
index 89f0b2b..0000000
--- a/tests/pass/rbinfile/rbinfile.tvpd
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<vpd>
-  <name>FILENAME</name>
-  <size>16kb</size>
-  <VD>01</VD>
-  <record name="VINI">
-    <rdesc>The VINI record</rdesc>
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VINI</kwdata>
-    </keyword>
-  </record>
-  <record name="VMSC">
-    <rbinfile>rbinfile-VMSC.rvpd</rbinfile>
-  </record>
-</vpd>
diff --git a/tests/pass/simple/simple.tvpd b/tests/pass/simple/simple.tvpd
deleted file mode 100644
index 3edd68c..0000000
--- a/tests/pass/simple/simple.tvpd
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<vpd>
-  <name>FILENAME</name>
-  <size>16kb</size>
-  <VD>01</VD>
-  <record name="VINI">
-    <rdesc>The VINI record</rdesc>
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VINI</kwdata>
-    </keyword>
-    <keyword name="AS">
-      <kwdesc>The ascii keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>20</kwlen>
-      <kwdata>This is text data</kwdata>
-    </keyword>
-    <keyword name="HX">
-      <kwdesc>The Hex keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>00000000</kwdata>
-    </keyword>
-  </record>
-</vpd>
diff --git a/tests/pass/sysplanar/openPower_mer0_sample.xml b/tests/pass/sysplanar/openPower_mer0_sample.xml
deleted file mode 100644
index b70f1bc..0000000
--- a/tests/pass/sysplanar/openPower_mer0_sample.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="MER0">
-    <rdesc>The Manufacturing repair data record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>MER0</kwdata>
-    </keyword>
-
-    <keyword name="#I">
-      <kwdesc>Repair Data </kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>320</kwlen>
-      <kwdata>01044E00</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/sysplanar/openPower_opfr_sample.xml b/tests/pass/sysplanar/openPower_opfr_sample.xml
deleted file mode 100644
index 2e0b0e4..0000000
--- a/tests/pass/sysplanar/openPower_opfr_sample.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="OPFR">
-    <rdesc>The OPFR record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>OPFR</kwdata>
-    </keyword>
-
-    <keyword name="VD">
-      <kwdesc>Record Version</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>01</kwdata>
-    </keyword>
-
-    <keyword name="VN">
-      <kwdesc>Vendor Name</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>0000000000000000</kwdata>
-    </keyword>
-
-    <keyword name="DR">
-      <kwdesc>FRU Description</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>0000000000000000</kwdata>
-    </keyword>
-
-    <keyword name="VP">
-      <kwdesc>Card Part Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>0000000000000000</kwdata>
-    </keyword>
-
-    <keyword name="VS">
-      <kwdesc>Card Serial Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>0000000000000000</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/sysplanar/openPower_osys_sample.xml b/tests/pass/sysplanar/openPower_osys_sample.xml
deleted file mode 100644
index 3e683bf..0000000
--- a/tests/pass/sysplanar/openPower_osys_sample.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="OSYS">
-    <rdesc>The OpenPower System Record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>OSYS</kwdata>
-    </keyword>
-
-    <keyword name="VD">
-      <kwdesc>Record Version</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>01</kwdata>
-    </keyword>
-
-    <keyword name="DR">
-      <kwdesc>FRU Description</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>SYSTEM </kwdata>
-    </keyword>
-
-    <keyword name="MM">
-      <kwdesc>Machine Type Model</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>0000000000000000</kwdata>
-    </keyword>
-
-    <keyword name="SS">
-      <kwdesc>System Serial Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>0000000000000000</kwdata>
-    </keyword>
-
-    <keyword name="ET">
-      <kwdesc>Enclosure Type</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>1</kwlen>
-      <kwdata>02</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/sysplanar/openPower_veir_sample.xml b/tests/pass/sysplanar/openPower_veir_sample.xml
deleted file mode 100644
index 6d16f6d..0000000
--- a/tests/pass/sysplanar/openPower_veir_sample.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-  <record name="VEIR">
-    <rdesc>The Field repair data  record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VEIR</kwdata>
-    </keyword>
-
-    <keyword name="#I">
-      <kwdesc>Repair Data </kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>788</kwlen>
-      <kwdata>0104C300</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/sysplanar/openPower_ver0_sample.xml b/tests/pass/sysplanar/openPower_ver0_sample.xml
deleted file mode 100644
index f4b7a2e..0000000
--- a/tests/pass/sysplanar/openPower_ver0_sample.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-  <record name="VER0">
-    <rdesc>The Vendor repair data record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VER0</kwdata>
-    </keyword>
-
-    <keyword name="#I">
-      <kwdesc>Repair Data </kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>320</kwlen>
-      <kwdata>01044E00</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/sysplanar/openPower_vini_sample.xml b/tests/pass/sysplanar/openPower_vini_sample.xml
deleted file mode 100644
index 91c860a..0000000
--- a/tests/pass/sysplanar/openPower_vini_sample.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="VINI">
-    <rdesc>Initial VPD Record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VINI</kwdata>
-    </keyword>
-
-    <keyword name="DR">
-      <kwdesc>Description</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>SYSTEM PLANAR  </kwdata>
-    </keyword>
-    
-    <keyword name="CE">
-      <kwdesc>CCIN Extension</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>1</kwlen>
-      <kwdata>1</kwdata>
-    </keyword>
-
-    <keyword name="VZ">
-      <kwdesc>Overall VPD version</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>01</kwdata>
-    </keyword>
-
-    <keyword name="FN">
-      <kwdesc>FRU Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>7</kwlen>
-      <kwdata>0000000</kwdata>
-    </keyword>
-
-    <keyword name="PN">
-      <kwdesc>Card Part Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>7</kwlen>
-      <kwdata>0000000</kwdata>
-    </keyword>
-
-    <keyword name="SN">
-      <kwdesc>Card Serial Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>12</kwlen>
-      <kwdata>000000000000</kwdata>
-    </keyword>
-
-    <keyword name="CC">
-      <kwdesc>Card CCIN Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>P0XX</kwdata>
-    </keyword>
-
-    <keyword name="HE">
-      <kwdesc>Hardware EC</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>0001</kwdata>
-    </keyword>
-
-    <keyword name="CT">
-      <kwdesc>Card Type</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>00000000</kwdata>
-    </keyword>
-
-    <keyword name="HW">
-      <kwdesc>Hardware Level</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>0001</kwdata>
-    </keyword>
-
-    <keyword name="B3">
-      <kwdesc>Hardware Characteristics</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>6</kwlen>
-      <kwdata>000000000001</kwdata>
-    </keyword>
-
-    <keyword name="B4">
-      <kwdesc>Manufacturing FRU Control</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>1</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="B7">
-      <kwdesc>Hardware Level</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>12</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/sysplanar/openPower_vmsc_sample.xml b/tests/pass/sysplanar/openPower_vmsc_sample.xml
deleted file mode 100644
index cc65fbd..0000000
--- a/tests/pass/sysplanar/openPower_vmsc_sample.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="VMSC">
-    <rdesc>The VMSC record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VMSC</kwdata>
-    </keyword>
-
-    <keyword name="IN">
-      <kwdesc>Free Space for Software Data</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>205</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/sysplanar/openPower_vndr_sample.xml b/tests/pass/sysplanar/openPower_vndr_sample.xml
deleted file mode 100644
index f8d6438..0000000
--- a/tests/pass/sysplanar/openPower_vndr_sample.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="VNDR">
-    <rdesc>The VNDR record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VNDR</kwdata>
-    </keyword>
-
-    <keyword name="VD">
-      <kwdesc>Record Version</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>01</kwdata>
-    </keyword>
-
-    <keyword name="IN">
-      <kwdesc>Vendor Specific Data</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>128</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/sysplanar/openPower_vrtn_sample.xml b/tests/pass/sysplanar/openPower_vrtn_sample.xml
deleted file mode 100644
index 4c2a97e..0000000
--- a/tests/pass/sysplanar/openPower_vrtn_sample.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="VRTN">
-    <rdesc>The VRTN record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VRTN</kwdata>
-    </keyword>
-
-    <keyword name="SO">
-      <kwdesc>The SO keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="IN">
-      <kwdesc>Free Space for Sofware Data</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>254</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="I2">
-      <kwdesc>Additional Free Space for Sofware Data</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>254</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/sysplanar/sysplanar.tvpd b/tests/pass/sysplanar/sysplanar.tvpd
deleted file mode 100644
index 6ee5414..0000000
--- a/tests/pass/sysplanar/sysplanar.tvpd
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-  <name>FILENAME</name>
-  <size>16kb</size>
-  <VD>01</VD>
-
-  <record name="VINI">
-    <rtvpdfile>openPower_vini_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="OSYS">
-    <rtvpdfile>openPower_osys_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="OPFR">
-    <rtvpdfile>openPower_opfr_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="VNDR">
-    <rtvpdfile>openPower_vndr_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="VEIR">
-    <rtvpdfile>openPower_veir_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="VER0">
-    <rtvpdfile>openPower_ver0_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="MER0">
-    <rtvpdfile>openPower_mer0_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="VMSC">
-    <rtvpdfile>openPower_vmsc_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="VRTN">
-    <rtvpdfile>openPower_vrtn_sample.xml</rtvpdfile>
-  </record>
-</vpd>
diff --git a/tests/pass/sysplanar2/openPower_mer0_sample.xml b/tests/pass/sysplanar2/openPower_mer0_sample.xml
deleted file mode 100644
index b70f1bc..0000000
--- a/tests/pass/sysplanar2/openPower_mer0_sample.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="MER0">
-    <rdesc>The Manufacturing repair data record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>MER0</kwdata>
-    </keyword>
-
-    <keyword name="#I">
-      <kwdesc>Repair Data </kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>320</kwlen>
-      <kwdata>01044E00</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/sysplanar2/openPower_opfr_sample.xml b/tests/pass/sysplanar2/openPower_opfr_sample.xml
deleted file mode 100644
index 2e0b0e4..0000000
--- a/tests/pass/sysplanar2/openPower_opfr_sample.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="OPFR">
-    <rdesc>The OPFR record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>OPFR</kwdata>
-    </keyword>
-
-    <keyword name="VD">
-      <kwdesc>Record Version</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>01</kwdata>
-    </keyword>
-
-    <keyword name="VN">
-      <kwdesc>Vendor Name</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>0000000000000000</kwdata>
-    </keyword>
-
-    <keyword name="DR">
-      <kwdesc>FRU Description</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>0000000000000000</kwdata>
-    </keyword>
-
-    <keyword name="VP">
-      <kwdesc>Card Part Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>0000000000000000</kwdata>
-    </keyword>
-
-    <keyword name="VS">
-      <kwdesc>Card Serial Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>0000000000000000</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/sysplanar2/openPower_osys_sample.xml b/tests/pass/sysplanar2/openPower_osys_sample.xml
deleted file mode 100644
index 3e683bf..0000000
--- a/tests/pass/sysplanar2/openPower_osys_sample.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="OSYS">
-    <rdesc>The OpenPower System Record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>OSYS</kwdata>
-    </keyword>
-
-    <keyword name="VD">
-      <kwdesc>Record Version</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>01</kwdata>
-    </keyword>
-
-    <keyword name="DR">
-      <kwdesc>FRU Description</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>SYSTEM </kwdata>
-    </keyword>
-
-    <keyword name="MM">
-      <kwdesc>Machine Type Model</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>0000000000000000</kwdata>
-    </keyword>
-
-    <keyword name="SS">
-      <kwdesc>System Serial Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>0000000000000000</kwdata>
-    </keyword>
-
-    <keyword name="ET">
-      <kwdesc>Enclosure Type</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>1</kwlen>
-      <kwdata>02</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/sysplanar2/openPower_spdx_membuf32_sample.xml b/tests/pass/sysplanar2/openPower_spdx_membuf32_sample.xml
deleted file mode 100644
index 5bf9a97..0000000
--- a/tests/pass/sysplanar2/openPower_spdx_membuf32_sample.xml
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="SPDX">
-    <rdesc>The Memory data record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>SPDX</kwdata>
-    </keyword>
-
-    <keyword name="VD">
-      <kwdesc>Record Version keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>01</kwdata>
-    </keyword>
-
-    <keyword name="VM">
-      <kwdesc>Memory data version keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>00000000</kwdata>
-    </keyword>
-
-    <keyword name="DW">
-      <kwdesc>Memory Buffer Voltage keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>0000</kwdata>
-    </keyword>
-
-    <keyword name="MX">
-      <kwdesc>Bank Delete keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>64</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="M0">
-      <kwdesc>MR Centaur Mappter (Centaur MRUID)Delete keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>32</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="M1">
-      <kwdesc>First copy of MR data keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="M2">
-      <kwdesc>Second copy of MR data keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="M3">
-      <kwdesc>Third copy of MR data keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="M4">
-      <kwdesc>Fourth copy of MR data keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="M5">
-      <kwdesc>Fifth copy of MR data keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="M6">
-      <kwdesc>Sixth copy of MR data keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="M7">
-      <kwdesc>Seventh copy of MR data keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="M8">
-      <kwdesc>Eighth copy of MR data keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="T1">
-      <kwdesc>First copy of MT data keyword (1 dimm 1 rank)</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="T2">
-      <kwdesc>Second copy of MT data (1 dimm 2 ranks)</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="T4">
-      <kwdesc>Third copy of MT data (1 dimm 4 ranks)</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="T5">
-      <kwdesc>Fourth copy of MT data keyword (2 dimm 1 rank)</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="T6">
-      <kwdesc>Fifth copy of MT data keyword (2 dimm 2 ranks)</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="T8">
-      <kwdesc>Sixth copy of MT data keyword (2 dimm 4 ranks)</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>255</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="Q0">
-      <kwdesc>DQ Data mapper-Memory Buffer MRUID</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>32</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="Q1">
-      <kwdesc>First copy of DQ</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>96</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="Q2">
-      <kwdesc>Second copy of DQ</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>96</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="Q3">
-      <kwdesc>Third copy of DQ</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>96</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="Q4">
-      <kwdesc>Fourth copy of DQ</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>96</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="Q5">
-      <kwdesc>Fifth copy of DQ</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>96</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="Q6">
-      <kwdesc>Sixth copy of DQ</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>96</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="Q7">
-      <kwdesc>Seventh copy of DQ</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>96</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="Q8">
-      <kwdesc>Eighth copy of DQ</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>96</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="K0">
-      <kwdesc>DQS Data mapper-Memory Buffer MRUID</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>32</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="K1">
-      <kwdesc>First copy of DQS</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>32</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="K2">
-      <kwdesc>Second copy of DQS</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>32</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="K3">
-      <kwdesc>Third copy of DQS</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>32</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="K4">
-      <kwdesc>Fourth copy of DQS</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>32</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="K5">
-      <kwdesc>Fifth copy of DQS</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>32</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="K6">
-      <kwdesc>Sixth copy of DQS</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>32</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="K7">
-      <kwdesc>Seventh copy of DQS</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>32</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="K8">
-      <kwdesc>Eighth copy of DQS</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>32</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
-
diff --git a/tests/pass/sysplanar2/openPower_veir_sample.xml b/tests/pass/sysplanar2/openPower_veir_sample.xml
deleted file mode 100644
index 6d16f6d..0000000
--- a/tests/pass/sysplanar2/openPower_veir_sample.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-  <record name="VEIR">
-    <rdesc>The Field repair data  record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VEIR</kwdata>
-    </keyword>
-
-    <keyword name="#I">
-      <kwdesc>Repair Data </kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>788</kwlen>
-      <kwdata>0104C300</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/sysplanar2/openPower_ver0_sample.xml b/tests/pass/sysplanar2/openPower_ver0_sample.xml
deleted file mode 100644
index f4b7a2e..0000000
--- a/tests/pass/sysplanar2/openPower_ver0_sample.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-  <record name="VER0">
-    <rdesc>The Vendor repair data record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VER0</kwdata>
-    </keyword>
-
-    <keyword name="#I">
-      <kwdesc>Repair Data </kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>320</kwlen>
-      <kwdata>01044E00</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/sysplanar2/openPower_vini_sample.xml b/tests/pass/sysplanar2/openPower_vini_sample.xml
deleted file mode 100644
index 91c860a..0000000
--- a/tests/pass/sysplanar2/openPower_vini_sample.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="VINI">
-    <rdesc>Initial VPD Record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VINI</kwdata>
-    </keyword>
-
-    <keyword name="DR">
-      <kwdesc>Description</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>16</kwlen>
-      <kwdata>SYSTEM PLANAR  </kwdata>
-    </keyword>
-    
-    <keyword name="CE">
-      <kwdesc>CCIN Extension</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>1</kwlen>
-      <kwdata>1</kwdata>
-    </keyword>
-
-    <keyword name="VZ">
-      <kwdesc>Overall VPD version</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>01</kwdata>
-    </keyword>
-
-    <keyword name="FN">
-      <kwdesc>FRU Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>7</kwlen>
-      <kwdata>0000000</kwdata>
-    </keyword>
-
-    <keyword name="PN">
-      <kwdesc>Card Part Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>7</kwlen>
-      <kwdata>0000000</kwdata>
-    </keyword>
-
-    <keyword name="SN">
-      <kwdesc>Card Serial Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>12</kwlen>
-      <kwdata>000000000000</kwdata>
-    </keyword>
-
-    <keyword name="CC">
-      <kwdesc>Card CCIN Number</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>P0XX</kwdata>
-    </keyword>
-
-    <keyword name="HE">
-      <kwdesc>Hardware EC</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>0001</kwdata>
-    </keyword>
-
-    <keyword name="CT">
-      <kwdesc>Card Type</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>00000000</kwdata>
-    </keyword>
-
-    <keyword name="HW">
-      <kwdesc>Hardware Level</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>0001</kwdata>
-    </keyword>
-
-    <keyword name="B3">
-      <kwdesc>Hardware Characteristics</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>6</kwlen>
-      <kwdata>000000000001</kwdata>
-    </keyword>
-
-    <keyword name="B4">
-      <kwdesc>Manufacturing FRU Control</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>1</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="B7">
-      <kwdesc>Hardware Level</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>12</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/sysplanar2/openPower_vmsc_sample.xml b/tests/pass/sysplanar2/openPower_vmsc_sample.xml
deleted file mode 100644
index cc65fbd..0000000
--- a/tests/pass/sysplanar2/openPower_vmsc_sample.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="VMSC">
-    <rdesc>The VMSC record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VMSC</kwdata>
-    </keyword>
-
-    <keyword name="IN">
-      <kwdesc>Free Space for Software Data</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>205</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/sysplanar2/openPower_vndr_sample.xml b/tests/pass/sysplanar2/openPower_vndr_sample.xml
deleted file mode 100644
index f8d6438..0000000
--- a/tests/pass/sysplanar2/openPower_vndr_sample.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="VNDR">
-    <rdesc>The VNDR record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VNDR</kwdata>
-    </keyword>
-
-    <keyword name="VD">
-      <kwdesc>Record Version</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>01</kwdata>
-    </keyword>
-
-    <keyword name="IN">
-      <kwdesc>Vendor Specific Data</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>128</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/sysplanar2/openPower_vrtn_sample.xml b/tests/pass/sysplanar2/openPower_vrtn_sample.xml
deleted file mode 100644
index 4c2a97e..0000000
--- a/tests/pass/sysplanar2/openPower_vrtn_sample.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-
-  <record name="VRTN">
-    <rdesc>The VRTN record</rdesc>
-
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VRTN</kwdata>
-    </keyword>
-
-    <keyword name="SO">
-      <kwdesc>The SO keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>2</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="IN">
-      <kwdesc>Free Space for Sofware Data</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>254</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-    <keyword name="I2">
-      <kwdesc>Additional Free Space for Sofware Data</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>254</kwlen>
-      <kwdata>00</kwdata>
-    </keyword>
-
-  </record>
-
-</vpd>
diff --git a/tests/pass/sysplanar2/sysplanar2.tvpd b/tests/pass/sysplanar2/sysplanar2.tvpd
deleted file mode 100644
index 54ef218..0000000
--- a/tests/pass/sysplanar2/sysplanar2.tvpd
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<vpd>
-  <name>FILENAME</name>
-  <size>16kb</size>
-  <VD>01</VD>
-
-  <record name="VINI">
-    <rtvpdfile>openPower_vini_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="OSYS">
-    <rtvpdfile>openPower_osys_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="OPFR">
-    <rtvpdfile>openPower_opfr_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="VNDR">
-    <rtvpdfile>openPower_vndr_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="SPDX">
-    <rtvpdfile>openPower_spdx_membuf32_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="VEIR">
-    <rtvpdfile>openPower_veir_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="VER0">
-    <rtvpdfile>openPower_ver0_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="MER0">
-    <rtvpdfile>openPower_mer0_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="VMSC">
-    <rtvpdfile>openPower_vmsc_sample.xml</rtvpdfile>
-  </record>
-
-  <record name="VRTN">
-    <rtvpdfile>openPower_vrtn_sample.xml</rtvpdfile>
-  </record>
-
-</vpd>
diff --git a/tests/pass/tworecords/tworecords.tvpd b/tests/pass/tworecords/tworecords.tvpd
deleted file mode 100644
index e7d7c80..0000000
--- a/tests/pass/tworecords/tworecords.tvpd
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<vpd>
-  <name>FILENAME</name>
-  <size>16kb</size>
-  <VD>01</VD>
-  <record name="VINI">
-    <rdesc>The VINI record</rdesc>
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VINI</kwdata>
-    </keyword>
-    <keyword name="AS">
-      <kwdesc>The ascii keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>20</kwlen>
-      <kwdata>This is text data</kwdata>
-    </keyword>
-    <keyword name="HX">
-      <kwdesc>The Hex keyword</kwdesc>
-      <kwformat>hex</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>00000000</kwdata>
-    </keyword>
-  </record>
-  <record name="VMSC">
-    <rdesc>The VMSC record</rdesc>
-    <keyword name="RT">
-      <kwdesc>The Record Type keyword</kwdesc>
-      <kwformat>ascii</kwformat>
-      <kwlen>4</kwlen>
-      <kwdata>VMSC</kwdata>
-    </keyword>
-  </record>
-</vpd>