diff --git a/fwts-test/arg-json-0001/klog-0001.log b/fwts-test/arg-json-0001/klog-0001.log
index 74e6d532..4baddd73 100644
--- a/fwts-test/arg-json-0001/klog-0001.log
+++ b/fwts-test/arg-json-0001/klog-0001.log
@@ -1,16 +1,14 @@
 klog            klog: Scan kernel log for errors and warnings.
 klog            ----------------------------------------------------------
 klog            Test 1 of 1: Kernel log error check.
-klog            FAILED [HIGH] KlogACPIBIOSBugMultipleAPIC: Test 1, HIGH
+klog            FAILED [MEDIUM] KlogAcpiMultipleMadt: Test 1, MEDIUM
 klog            Kernel message: [ 0.000000] ACPI: BIOS bug: multiple APIC
 klog            /MADT found, using 0
 klog            
-klog            ADVICE: The kernel has detected more than one ACPI
-klog            Multiple APIC Description Table (MADT) (these tables have
-klog            the "APIC" signature). There should only be one MADT and
-klog            the kernel will by default select the first one. However,
-klog            one can override this and select the Nth MADT using
-klog            acpi_apic_instance=N.
+klog            ADVICE: The BIOS is supposed to supply just one APIC/MADT,
+klog            however, more than one has been found. One can use
+klog            acpi_apic_instance=N to specify the Nth ACPI/MADT to use
+klog            as an override if required.
 klog            
 klog            Kernel message: [ 0.228089] [Firmware Bug]: ACPI: BIOS
 klog            _OSI(Linux) query ignored
@@ -21,9 +19,37 @@ klog            to the 'Linux' query in the DSDT and this is redundant
 klog            because the ACPI driver matches onto the Windows _OSI
 klog            strings by default.
 klog            
-klog            Found 1 unique errors in kernel log.
+klog            FAILED [CRITICAL] KlogPciAcpiOscRequestFailed: Test 1,
+klog            CRITICAL Kernel message: [ 0.396181] pci0000:00: ACPI _OSC
+klog            request failed (AE_NOT_FOUND), returned control mask: 0x1d
+klog            
+klog            ADVICE: The _OSC method evaluation failed, which will
+klog            result in disabling PCIe functionality, for example, the
+klog            Linux kernel has to disable Active State Power Management
+klog            (ASPM) which means that PCIe power management is not
+klog            optimally configured.
+klog            
+klog            FAILED [LOW] KlogAcpiDeprecatedProcfsInterface: Test 1,
+klog            LOW Kernel message: [ 0.534105] ACPI: Deprecated procfs I
+klog            /F for AC is loaded, please retry with
+klog            CONFIG_ACPI_PROCFS_POWER cleared
+klog            
+klog            ADVICE: Using an old procfs interface for ACPI AC Adapter,
+klog            this occurs if CONFIG_ACPI_PROCFS_POWER is enabled. This
+klog            should be disabled for kernels > 2.6.37.
+klog            
+klog            FAILED [LOW] KlogAcpiDeprecatedProcfsInterface: Test 1,
+klog            LOW Kernel message: [ 0.576306] ACPI: Deprecated procfs I
+klog            /F for battery is loaded, please retry with
+klog            CONFIG_ACPI_PROCFS_POWER cleared
+klog            
+klog            ADVICE: Using an old procfs interface for ACPI battery,
+klog            this occurs if CONFIG_ACPI_PROCFS_POWER is enabled. This
+klog            should be disabled for kernels > 2.6.37.
+klog            
+klog            Found 4 unique errors in kernel log.
 klog            
 klog            ==========================================================
-klog            0 passed, 1 failed, 0 warning, 0 aborted, 0 skipped, 0
+klog            0 passed, 4 failed, 0 warning, 0 aborted, 0 skipped, 0
 klog            info only.
 klog            ==========================================================
diff --git a/fwts-test/arg-json-0001/klog-0002.log b/fwts-test/arg-json-0001/klog-0002.log
index 74e6d532..4baddd73 100644
--- a/fwts-test/arg-json-0001/klog-0002.log
+++ b/fwts-test/arg-json-0001/klog-0002.log
@@ -1,16 +1,14 @@
 klog            klog: Scan kernel log for errors and warnings.
 klog            ----------------------------------------------------------
 klog            Test 1 of 1: Kernel log error check.
-klog            FAILED [HIGH] KlogACPIBIOSBugMultipleAPIC: Test 1, HIGH
+klog            FAILED [MEDIUM] KlogAcpiMultipleMadt: Test 1, MEDIUM
 klog            Kernel message: [ 0.000000] ACPI: BIOS bug: multiple APIC
 klog            /MADT found, using 0
 klog            
-klog            ADVICE: The kernel has detected more than one ACPI
-klog            Multiple APIC Description Table (MADT) (these tables have
-klog            the "APIC" signature). There should only be one MADT and
-klog            the kernel will by default select the first one. However,
-klog            one can override this and select the Nth MADT using
-klog            acpi_apic_instance=N.
+klog            ADVICE: The BIOS is supposed to supply just one APIC/MADT,
+klog            however, more than one has been found. One can use
+klog            acpi_apic_instance=N to specify the Nth ACPI/MADT to use
+klog            as an override if required.
 klog            
 klog            Kernel message: [ 0.228089] [Firmware Bug]: ACPI: BIOS
 klog            _OSI(Linux) query ignored
@@ -21,9 +19,37 @@ klog            to the 'Linux' query in the DSDT and this is redundant
 klog            because the ACPI driver matches onto the Windows _OSI
 klog            strings by default.
 klog            
-klog            Found 1 unique errors in kernel log.
+klog            FAILED [CRITICAL] KlogPciAcpiOscRequestFailed: Test 1,
+klog            CRITICAL Kernel message: [ 0.396181] pci0000:00: ACPI _OSC
+klog            request failed (AE_NOT_FOUND), returned control mask: 0x1d
+klog            
+klog            ADVICE: The _OSC method evaluation failed, which will
+klog            result in disabling PCIe functionality, for example, the
+klog            Linux kernel has to disable Active State Power Management
+klog            (ASPM) which means that PCIe power management is not
+klog            optimally configured.
+klog            
+klog            FAILED [LOW] KlogAcpiDeprecatedProcfsInterface: Test 1,
+klog            LOW Kernel message: [ 0.534105] ACPI: Deprecated procfs I
+klog            /F for AC is loaded, please retry with
+klog            CONFIG_ACPI_PROCFS_POWER cleared
+klog            
+klog            ADVICE: Using an old procfs interface for ACPI AC Adapter,
+klog            this occurs if CONFIG_ACPI_PROCFS_POWER is enabled. This
+klog            should be disabled for kernels > 2.6.37.
+klog            
+klog            FAILED [LOW] KlogAcpiDeprecatedProcfsInterface: Test 1,
+klog            LOW Kernel message: [ 0.576306] ACPI: Deprecated procfs I
+klog            /F for battery is loaded, please retry with
+klog            CONFIG_ACPI_PROCFS_POWER cleared
+klog            
+klog            ADVICE: Using an old procfs interface for ACPI battery,
+klog            this occurs if CONFIG_ACPI_PROCFS_POWER is enabled. This
+klog            should be disabled for kernels > 2.6.37.
+klog            
+klog            Found 4 unique errors in kernel log.
 klog            
 klog            ==========================================================
-klog            0 passed, 1 failed, 0 warning, 0 aborted, 0 skipped, 0
+klog            0 passed, 4 failed, 0 warning, 0 aborted, 0 skipped, 0
 klog            info only.
 klog            ==========================================================
diff --git a/fwts-test/arg-json-0001/klog.json b/fwts-test/arg-json-0001/klog.json
deleted file mode 100644
index a66699ef..00000000
--- a/fwts-test/arg-json-0001/klog.json
+++ /dev/null
@@ -1,1117 +0,0 @@
-{
- "common_error_warning_patterns": 
- [ 
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_BIOS_THERMAL",
-   "pattern": "Temperature above threshold, cpu clock throttled",
-   "advice": "Test caused CPU temperature above critical threshold. Insufficient cooling?"
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_MEDIUM",
-   "tag": "FWTS_TAG_BIOS",
-   "pattern": "BIOS never enumerated boot CPU",
-   "advice": "The boot processor is not enumerated!"
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_HOTPLUG",
-   "pattern": "acpi_shpchprm.*_HPP fail",
-   "advice": "Hotplug _HPP method failed"
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_HOTPLUG",
-   "pattern": "shpchp.*acpi_pciehprm.*OSHP fail",
-   "advice": "ACPI Hotplug OSHP method failed"
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_HOTPLUG",
-   "pattern": "shpchp.*acpi_shpchprm.*evaluate _BBN fail",
-   "advice": "Hotplug _BBN method is missing"
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI",
-   "pattern": "Error while parsing _PSD domain information",
-   "advice": "_PSD domain information is corrupt!"
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_ACPI",
-   "pattern": "Wrong _BBN value, reboot and use option 'pci=noacpi'",
-   "advice": "The BIOS has wrong _BBN value, which will make PCI root bridge have wrong bus number"
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_APIC",
-   "pattern": "ACPI.*apic on CPU.* stops in C2",
-   "advice": "The local apic timer incorrectly stops during C2 idle state.The ACPI specification forbids this and Linux needs the local APIC timer to work. The most likely cause of this is that the firmware uses a hardware C3 or C4 state that is mapped to the ACPI C2 state."
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_BIOS_IRQ",
-   "pattern": "Disabling IRQ",
-   "advice": "The kernel detected an irq storm. This is most probably an IRQ routing bug."
-  }
- ],
- "firmware_error_warning_patterns":
- [
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_WMI",
-   "pattern": "dell_wmi:.*Received unknown WMI event",
-   "advice": "The Dell WMI driver has received an unknown WMI event. The driver should handle this new event or the firmware is reporting an incorrect and unknown event."
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_WMI",
-   "pattern": "dell_wmi:.*bad event status 0x",
-   "advice": "The Dell WMI driver has received a bad event status. This should be investigated further."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_WMI",
-   "pattern": "asus_wmi:.*Unknown key.*pressed",
-   "advice": "The ASUS WMI driver has received an unknown key event. The driver should handle this new key event or the firmware is reporting an incorrect and unknown event."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_WMI",
-   "pattern": "hp_wmi:.*bad event status 0x",
-   "advice": "The HP WMI driver has received a bad event status. This should be investigated further."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_WMI",
-   "pattern": "hp_wmi:.*Unknown response received",
-   "advice": "The HP WMI driver has received a return object that was not of type ACPI_BUFFER. The driver needs to be updated to handle this new return type or there is a bug in the WMI mechanism on this machine."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_WMI",
-   "pattern": "hp_wmi:.*Unknown buffer length",
-   "advice": "The HP WMI driver has received a return buffer that was not the expected size of 8 or 16 bytes. This is probably a bug in the WMI mechanism on this machine."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_WMI",
-   "pattern": "hp_wmi:.*Unknown key code - 0x",
-   "advice": "The HP WMI driver has received a key code that it does not recognise. The driver needs to be updated to handle this new key code."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_WMI",
-   "pattern": "hp_wmi:.*Unknown event_id",
-   "advice": "The HP WMI driver has received an event ID that it does not recognise. The driver needs to be updated to handle this new event ID."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_WMI",
-   "pattern": "msi_wmi:.*Unknown key pressed",
-   "advice": "The MSI WMI driver has received a key code that it does not recognise. The driver needs to be updated to handle this new key code."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI",
-   "pattern": "ACPI.*Handling Garbled _PRT entry",
-   "advice": "BIOS has a garbled _PRT entry; source_name and source_index swapped."
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_MEDIUM",
-   "tag": "FWTS_TAG_ACPI",
-   "pattern": "Invalid _PCT data",
-   "advice": "The ACPI _PCT data is invalid."
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI",
-   "pattern": "ACPI Error.*ACPI path has too many parent prefixes",
-   "advice": "A path to an ACPI obejct has too many ^ parent prefixes and references passed the top of the root node. Please check AML for all ^ prefixed ACPI path names."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_ACPI_RSDP",
-   "pattern": "ACPI Error.*A valid RSDP was not found",
-   "advice": "An ACPI-compatible system must provide an RSDP (Root System Description Pointer in the system’s low address space. This structure’s only purpose is to provide the physical address of the RSDT and XSDT."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_ACPI_MUTEX",
-   "pattern": "ACPI Error.*Cannot release Mutex",
-   "advice": "Attempted to release of a Mutex that was not previous acquired. This needs fixing as it could lead to race conditions when operating on a resource that needs to be proteced by a Mutex."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_EVENT",
-   "pattern": "ACPI Error.*Could not disable .* event",
-   "advice": ""
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_EVENT",
-   "pattern": "ACPI Error.*Could not enable .* event",
-   "advice": ""
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_BRIGHTNESS",
-   "pattern": "ACPI Error.*Current brightness invalid",
-   "advice": "ACPI video driver has encountered a brightness level that is outside the expected range."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_NAMESPACE_LOOKUP",
-   "pattern": "ACPI Error.*Namespace lookup failure, AE_ALREADY_EXISTS",
-   "advice": ""
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_ACPI_BUFFER_OVERFLOW",
-   "pattern": "ACPI Error.*_SB_._OSC.*AE_AML_BUFFER_LIMIT",
-   "advice": "Section 6.2.10.2 of V4.0a of the ACPI specification states that the _OSC Method should be passed an 8 byte buffer of 2 x 32 DWORDs, however it appears that the method is possibly trying to access data outside this buffer. This is a bug in the _OSC method."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_ACPI_BUFFER_OVERFLOW",
-   "pattern": "ACPI Error.*Field.*exceeds Buffer",
-   "advice": "The field exceeds the allocated buffer size. This can lead to unexpected results when fetching data outside this region."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_ACPI_IO_PORT",
-   "pattern": "ACPI Error.*Illegal I\/O port address\/length above 64K",
-   "advice": "A port address or length has exceeded the maximum allowed 64K address limit. This will lead to unpredicable errors."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_METHOD_RETURN",
-   "pattern": "ACPI Error.*Incorrect return type",
-   "advice": "An ACPI Method has returned an unexpected and incorrect return type."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_METHOD_RETURN",
-   "pattern": "ACPI Error.*Needed .*\\[Buffer\/String\/Package\\], found \\[Integer\\]",
-   "advice": "An ACPI Method has returned an Integer type when a Buffer, String or Package was expected."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_METHOD_RETURN",
-   "pattern": "ACPI Error.*Needed .*\\[Reference\\], found \\[Device\\]",
-   "advice": "An ACPI Method has returned an Device type when a Reference type was expected."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_NO_HANDLER",
-   "pattern": "ACPI Error.*No handler for Region",
-   "advice": ""
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_NO_HANDLER",
-   "pattern": "ACPI Error.*Region .* has no handler",
-   "advice": ""
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_METHOD_RETURN",
-   "pattern": "ACPI Error.*Missing expected return value",
-   "advice": "The ACPI Method did not return a value and was expected too. This is a bug and needs fixing."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_METHOD_RETURN",
-   "pattern": "Package List length.*larger than.*truncated",
-   "advice": "A Method has returned a Package List that was larger than expected."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_METHOD_RETURN",
-   "pattern": "ACPI Error.*Result stack is empty!",
-   "advice": ""
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_ACPI_AML_OPCODE",
-   "pattern": "ACPI Error.*Found unknown opcode",
-   "advice": "An illegal AML opcode has been found and is ignored. This indicates either badly compiled code or opcode corruption in the DSDT or SSDT tables or a bug in the ACPI execution engine. Recommend disassembing using iasl to find any offending code."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_ACPI_AML_OPCODE",
-   "pattern": "ACPI Warning.*Detected an unsupported executable opcode",
-   "advice": "An illegal AML opcode has been found and is ignored. This indicates either badly compiled code or opcode corruption in the DSDT or SSDT tables or a bug in the ACPI execution engine. Recommend disassembing using iasl to find any offending code."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_BIOS",
-   "pattern": "bios32_service.*not present",
-   "advice": "The BIOS has found a BIOS32 Service Directory but the BIOS has returned error 0x80 on calling the service, which indicates that the requested service has not been implemented in the firmware."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_BIOS",
-   "pattern": "bios32_service.*BIOS bug",
-   "advice": "The BIOS has found a BIOS32 Service Directory but the BIOS has returned an error on calling the service, which is unexpected and usually means the firmware is broken."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_BIOS_IRQ",
-   "pattern": "PCI: Error.*when fetching IRQ routing table",
-   "advice": "The BIOS has been interrogated for the PCI IRQ routing table but the BIOS returned an error."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL",
-   "pattern": "ACPI Error.*Denied AML access to port",
-   "advice": "AML code was accessing an I/O port that was banned from accesses. Ports 0x20-0x21 (PIC0), 0xa0-0xa1 (PIC1), 0x4d0-0x4d1 (ELCR) are always banned. For _OSI() greater or equal to 'Windows 2001' (Windows XP) ports 0x00-0x0f (DMA), 0x40-0x43 (PIT1), 0x48-0x4b (PIT2), 0x70-0x71 (RTC), 0x81-0x83 (DMA1), 0x87 (DMA1L), 0x89-0x8b (DMA2), 0x8f (DMA2L), 0x90-0x91 (ARBC), 0x93-0x94 (SETUP), 0x96-0x97 (POS), 0xc0-0xdf (ISA DMA) and 0xcf8-0xcff (PCI config) are banned.  Since the AML code has been banned from accessing these ports you will get undefined behaviour and the AML code should be fixed."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL",
-   "pattern": "ACPI Error.*Method parse\/execution failed.*AE_AML_NO_RETURN_VALUE",
-   "advice": "The ACPI Method was expected to return a value and did not."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL",
-   "pattern": "ACPI Error.*Method (execution|parse\/execution) failed.*AE_ALREADY_EXISTS",
-   "advice": ""
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL",
-   "pattern": "ACPI Error.*Method (execution|parse\/execution) failed.*AE_INVALID_TABLE_LENGTH",
-   "advice": "The ACPI Method returned a table of the incorrect length. This can lead to unexepected results."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL",
-   "pattern": "ACPI Error.*Method (execution|parse\/execution) failed.*AE_AML_BUFFER_LIMIT",
-   "advice": "Method failed: ResourceSourceIndex is present but ResourceSource is not."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL",
-   "pattern": "ACPI Error.*Method (execution|parse\/execution) failed.*AE_NOT_EXIST",
-   "advice": ""
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL",
-   "pattern": "ACPI Error.*Method (execution|parse\/execution) failed.*AE_NOT_FOUND",
-   "advice": ""
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL",
-   "pattern": "ACPI Error.*Method (execution|parse\/execution) failed.*AE_LIMIT",
-   "advice": ""
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL",
-   "pattern": "ACPI Error.*Method (execution|parse\/execution) failed.*AE_AML_OPERAND_TYPE",
-   "advice": ""
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL",
-   "pattern": "ACPI Error.*Method (execution|parse\/execution) failed.*AE_TIME",
-   "advice": ""
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL",
-   "pattern": "ACPI Error.*Method (execution|parse\/execution) failed.*AE_AML_PACKAGE_LIMIT",
-   "advice": ""
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL",
-   "pattern": "ACPI Error.*Method (execution|parse\/execution) failed.*AE_OWNER_ID_LIMIT",
-   "advice": "Method failed to allocate owner ID."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL",
-   "pattern": "ACPI Error.*Method (execution|parse\/execution) failed.*AE_AML_MUTEX_NOT_ACQUIRED",
-   "advice": "A Mutex acquire failed, which could possibly indicate that it was previously acquired and not released, or a race has occurred. Some AML code fails to miss Mutex acquire failures, so it is a good idea to verify all Mutex Acquires using the syntaxcheck test."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI",
-   "pattern": "ACPI Error.*SMBus or IPMI write requires Buffer of",
-   "advice": "An incorrect SMBus or IPMI write buffer size was used."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_BRIGHTNESS",
-   "pattern": "ACPI Error.*Evaluating _BCM failed",
-   "advice": "The ACPI engine has failed to execute the _BCM Brightness Control Method.  This will result in possibly failing to set the display brightness level."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_EVAL",
-   "pattern": "ACPI (Warning|Error).*Evaluating .* failed",
-   "advice": "Executing the ACPI Method leaded in an execution failure. This needs investigating."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_BAD_ADDRESS",
-   "pattern": "ACPI Warning.*Optional field.*has zero address or length",
-   "advice": "An ACPI table contains Generic Address Structure that has an address that is incorrectly set to zero, or a zero length. This needs to be fixed. "
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_BAD_ADDRESS",
-   "pattern": "ACPI (Warning|Error).*two DSDT tables",
-   "advice": "The FADT table contains a mismatch between the 32 bit pointer (DSDT) and 64 bit pointer (X_DSDT) pointer to the FACS table.  Section 5.2.9 of version 4.0a of the ACPI specification states that X_DSDT should be zero if DSDT is defined, or DSDT should be zero if X_DSDT is zero. With two different pointers defined, the kernel has to make a choice, and opts for the 32 bit pointer. Because these pointers are different, it suggests either one of them is incorrect, or different 32 bit and 64 bit DSDT tables are present in your system, which is NOT complaint with the ACPI specification.  The kernel has to make a choice and opts for the 32 bit DSDT."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_BAD_ADDRESS",
-   "pattern": "ACPI (Warning|Error).*two FACS tables",
-   "advice": "The FADT table contains a mismatch between the 32 bit pointer (FIRMWARE_CTRL) and 64 bit pointer (X_FIRMWARE_CTRL) pointer to the FACS table.  Section 5.2.9 of version 4.0a of the ACPI specification states that X_FIRMWARE_CTRL should be zero if FIRMWARE_CTRL is defined, or FIRMWARE_CTRL should be zero if X_FIRMWARE_CTRL is zero. With two different pointers defined, the kernel has to make a choice, and opts for the 32 bit pointer. Because these pointers are different, it suggests either one of them is incorrect, or different 32 bit and 64 bit FACS tables are present in your system, which is NOT complaint with the ACPI specification.  The kernel has to make a choice and opts for the 32 bit FIRMWARE_CTRL."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_BAD_ADDRESS",
-   "pattern": "ACPI Error.*32/64X address mismatch in.*, using 32",
-   "advice": "The FADT table contains a mismatch between a 32 bit pointer and a 64 bit Generic Address pointer. Because these pointers are different, it suggests either one of them is incorrect.  If a non-null 32 bit pointer exists, then the kernel will opt for this in preference to the 64 bit pointer even though this is not in accordance to the ACPI specification."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_BAD_ADDRESS",
-   "pattern": "ACPI (Warning|Error).*32\/64.*(length|address) mismatch in.*tbfadt",
-   "advice": "The FADT table contains Generic Address Structure that has a mismatch between the 32 bit and 64 bit versions of an address. This should be fixed so there are no mismatches. "
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_BAD_ADDRESS",
-   "pattern": "ACPI (Warning|Error).*32\/64.*(length|address) mismatch in",
-   "advice": "A table contains Generic Address Structure that has a mismatch between the 32 bit and 64 bit versions of an address. This should be fixed so there are no mismatches. "
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_METHOD_RETURN",
-   "pattern": "ACPI Warning.*Return Package type mismatch",
-   "advice": "ACPI AML interpreter executed a Method that returned a package with incorrectly typed data. The offending method needs to be fixed."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_METHOD_RETURN",
-   "pattern": "ACPI Warning.*Return Package has no elements",
-   "advice": "ACPI AML interpreter executed a Method that returned a package with no elements inside it. This is most probably a bug in the Method and needs to be fixed."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_METHOD_RETURN",
-   "pattern": "ACPI Warning.*Return Package is too small",
-   "advice": "ACPI AML interpreter executed a Method that returned a package with too few elements inside it. This is most probably a bug in the Method and needs to be fixed."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_MEDIUM",
-   "tag": "FWTS_TAG_ACPI_TABLE_CHECKSUM",
-   "pattern": "ACPI Warning.*Incorrect checksum in table",
-   "advice": "The ACPI table listed above has an incorrect checksum, this could be a BIOS bug or due to table corruption."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_METHOD_RETURN",
-   "pattern": "ACPI Warning.*_BQC returned an invalid level",
-   "advice": "Method _BQC (Brightness Query Current) returned an invalid display brightness level."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_BRIGHTNESS",
-   "pattern": "ACPI Error.*Found unordered _BCL package",
-   "advice": "Method _BCL (Query List of Brightness Control Levels Supported) has a maximum brightness value which is not the last value in the returned package. Values returned must be in ascending order."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_BRIGHTNESS",
-   "pattern": "ACPI Error.*Too many duplicates in _BCL package",
-   "advice": "Method _BCL (Query List of Brightness Control Levels Supported) contains too many duplicated brightness levels in the returned package and this is non-standard."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI",
-   "pattern": "ACPI Warning.*Could not enable fixed event",
-   "advice": ""
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_METHOD_RETURN",
-   "pattern": "ACPI Warning.*Return type mismatch",
-   "advice": "The ACPI Method returned an incorrect type, this should be fixed."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_PARAMETER",
-   "pattern": "ACPI Warning.*Parameter count mismatch",
-   "advice": "The ACPI Method was executing with a different number of parameters than the Method expected. This should be fixed."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_PARAMETER",
-   "pattern": "ACPI Warning.*Insufficient arguments",
-   "advice": "The ACPI Method has not enough arguments as expected. This should be fixed."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_PACKAGE",
-   "pattern": "ACPI Warning.*Package has no elements",
-   "advice": "The ACPI Method returned a package with no elements in it, and some were exepected.This should be fixed."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_METHOD_RETURN",
-   "pattern": "ACPI Warning.*Converted Buffer to expected String",
-   "advice": "Method returned a Buffer type instead of a String type and ACPI driver automatically converted it to a String.  It is worth fixing this in the DSDT or SSDT even if the kernel fixes it at run time."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_PACKAGE",
-   "pattern": "ACPI Warning.*Return Package type mistmatch at index",
-   "advice": "The ACPI Method returned a package that contained data of the incorrect data type. This data type needs fixing."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_BAD_LENGTH",
-   "pattern": "ACPI Warning.*Invalid length for.*fadt",
-   "advice": "This item in the FADT is the incorrect length. Should be corrected."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_THROTTLING",
-   "pattern": "ACPI Warning.*Invalid throttling state",
-   "advice": ""
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_EMBEDDED_CONTROLLER",
-   "pattern": "ACPI Exception:.*AE_TIME.*Returned by Handler for.*[EmbeddedControl]",
-   "advice": "This is most probably caused by when a read or write operation to the EC memory has failed because of a timeout waiting for the Embedded Controller to complete the transaction.  Normally, the kernel waits for 500ms for the Embedded Controller status port to indicate that a transaction is complete, but in this case it has not and a AE_TIME error has been returned. "
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI",
-   "pattern": "ACPI Warning",
-   "advice": "ACPI AML intepreter has found some non-conforming AML code. This should be investigated and fixed."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_APIC",
-   "pattern": "ACPI.*BIOS bug: multiple APIC\/MADT found, using",
-   "advice": "The kernel has detected more than one ACPI Multiple APIC Description Table (MADT) (these tables have the \"APIC\" signature). There should only be one MADT and the kernel will by default select the first one. However, one can override this and select the Nth MADT using acpi_apic_instance=N."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_MEDIUM",
-   "tag": "FWTS_TAG_ACPI_BAD_ADDRESS",
-   "pattern": "\\[Firmware Bug\\]: ACPI.*Invalid physical address in GAR",
-   "advice": "ACPI Generic Address is invalid"
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_MEDIUM",
-   "tag": "FWTS_TAG_BIOS_AMD_POWERNOW",
-   "pattern": "\\[Firmware Bug\\]: powernow-k8.*(No PSB or ACPI _PSS objects|No compatible ACPI _PSS|Your BIOS does not provide ACPI _PSS objects)",
-   "advice": "The _PSS object (Performance Supported States) is an optional object that indicates the number of supported processor performance states. The powernow-k8 driver source states: If you see this message, complain to BIOS manufacturer. If he tells you \"we do not support Linux\" or some similar nonsense, remember that Windows 2000 uses the same legacy mechanism that the old Linux PSB driver uses. Tell them it is broken with Windows 2000. The reference to the AMD documentation is chapter 9 in the BIOS and Kernel Developer's Guide, which is available on www.amd.com."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_MEDIUM",
-   "tag": "FWTS_TAG_BIOS_AMD_POWERNOW",
-   "pattern": "\\[Firmware Bug\\]: powernow-k8.*Try again with latest",
-   "advice": ""
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_MEDIUM",
-   "tag": "FWTS_TAG_ACPI_BAD_ADDRESS",
-   "pattern": "\\[Firmware Bug\\]: ACPI.*Invalid bit width in GAR",
-   "advice": "ACPI Generic Address width must be 8, 16, 32 or 64"
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_MEDIUM",
-   "tag": "FWTS_TAG_ACPI_BAD_ADDRESS",
-   "pattern": "\\[Firmware Bug\\]: ACPI.*Invalid address space type in GAR",
-   "advice": "ACPI Generic Address space type must be system memory or system IO space."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_MEDIUM",
-   "tag": "FWTS_TAG_ACPI_BAD_ADDRESS",
-   "pattern": "\\[Firmware Bug\\]: ACPI.*no secondary bus range in _CRS",
-   "advice": "_CRS Method should return a secondary bus address for the status\/command port. The kernel is having to guess this based on the _BBN or assume it's 0x00-0xff."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_MEDIUM",
-   "tag": "FWTS_TAG_ACPI",
-   "pattern": "\\[Firmware Bug\\]: ACPI.*Invalid BIOS _PSS frequency",
-   "advice": "_PSS (Performance Supported States) package has an incorrectly define core frequency (first DWORD entry in the _PSS package)."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_BRIGHTNESS",
-   "pattern": "\\[Firmware Bug\\]: ACPI.*No _BQC method",
-   "advice": "_BQC (Brightness Query Current level) seems to be missing. This method returns the current brightness level of a built-in display output device."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_BRIGHTNESS",
-   "pattern": "\\[Firmware Bug\\]: ACPI.*brightness control misses _BQC function",
-   "advice": "_BQC (Brightness Query Current level) seems to be missing. This method returns the current brightness level of a built-in display output device."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI",
-   "pattern": "\\[Firmware Bug\\]: BIOS needs update for CPU frequency support",
-   "advice": "Having _PPC but missing frequencies (_PSS, _PCT) is a good hint that the BIOS is older than the CPU and does not know the CPU frequencies."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI",
-   "pattern": "\\[Firmware Bug\\]: ERST.*ERST table is invalid",
-   "advice": "The Error Record Serialization Table (ERST) seems to be invalid. This normally indicates that the ERST table header size is too small, or the table size (excluding header) is not a multiple of the ERST entries."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_ACPI_THERMAL",
-   "pattern": "\\[Firmware Bug\\]:.*Invalid critical threshold",
-   "advice": "ACPI _CRT (Critical Trip Point) is returning a threshold lower than zero degrees Celsius which is clearly incorrect."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_ACPI_THERMAL",
-   "pattern": "\\[Firmware Bug\\]:.*No valid trip found",
-   "advice": "No valud ACPI _CRT (Critical Trip Point) was found."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_BRIGHTNESS",
-   "pattern": "\\[Firmware Bug\\]:.*_BCQ is used instead of _BQC",
-   "advice": "ACPI Method _BCQ was defined (typo) instead of _BQC - this should be fixed.however the kernel has detected this and is working around this typo."
-  }, 
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_BIOS",
-   "pattern": "MPTABLE: bad signature",
-   "advice": "The MultiProcessor table has an incorrect signature, it should be PCMP. The kernel cannot trust the table and has disabled SMP support."
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_BIOS",
-   "pattern": "MPTABLE: checksum error",
-   "advice": "The MultiProcessor table has an incorrect checksum. The kernel cannot trust the table and has disabled SMP support."
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_BIOS",
-   "pattern": "MPTABLE: bad table version",
-   "advice": "The MultiProcessor table has an incorrect version. It should be 0x01 or 0x04 (for versions 1.1 and 1.4 respectively). The kernel cannot trust the table and has disabled SMP support."
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_BIOS",
-   "pattern": "MPTABLE: null local APIC address",
-   "advice": "The MultiProcessor table contains a NULL Local APIC address but the Local APIC address must be defined. The kernel has disabled SMP support."
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_BIOS",
-   "pattern": "MPTABLE: no processors registered",
-   "advice": "The MultiProcessor table contains no Processor Entry Fields, and hence there are no CPUs defined. The kernel has no option but to disable SMP support."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_BIOS",
-   "pattern": "BIOS bug.*no explicit IRQ entries.*using default mptable",
-   "advice": "The MultiProcessor table contains no IRQ Entry Fields, and hence there are no IRQs defined. The table is broken and should be fixed. The kernel will set up the low 16 IO-APIC pins to the ISA defaults in the hope the machine may work."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_BIOS_IRQ",
-   "pattern": "BIOS bug.*timer not connected to IO-APIC",
-   "advice": "The BIOS is reporting the ExtINTA I/O APIC input from the cascaded 8259A as the timer interrupt input.  The kernel has detected just one pin, so it has to check the timer directly and through the 8259A because of the broken BIOS reporting."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_BIOS_IRQ",
-   "pattern": "BIOS bug,.*IO-APIC.*ID is.*in the MPC table.*",
-   "advice": "The IO-APIC id in the MPC table is wrong and the kernel has detected this and attempted to fix it. The MPC table in the firmware needs to be fixed."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_BIOS_IRQ",
-   "pattern": "BIOS bug,.*IO-APIC.*ID is already used!",
-   "advice": "The IO-APIC id has been defined more than once in the MPC table, which is a firmware bug and should be fixed. The kernel has detected this and skopped this duplication to avoid stuck on smp_invalidate_needed IPI wait' messages."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_BIOS",
-   "pattern": "WARNING.*BIOS bug.*CPU MTRRs don't cover all of memory, losing",
-   "advice": "The Memory Type Range Registers (MTRRs) which define memory caching policy are misconfigued by the BIOS and don't appear to cover all available physical memory. The kernel has detected this and has reduced the amount of memory available to be safe. Either check that the BIOS memory caching options are set correctly or contact your BIOS vendor to get this fixed."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_MEDIUM",
-   "tag": "FWTS_TAG_BIOS",
-   "pattern": "mtrr:.*your BIOS has configured an incorrect mask, fixing it",
-   "advice": "The Memory Type Range Registers (MTRRs) which define memory caching policy are misconfigued by the BIOS. In this case, the mask is incorrectly set and the kernel has detected this and worked around the firmware bug."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_MEDIUM",
-   "tag": "FWTS_TAG_BIOS",
-   "pattern": "mtrr:.*your CPUs had inconsistent fixed MTRR settings",
-   "advice": "The fixed Memory Type Range Registers (MTRRs) which define memory caching policy are not consistent across all CPUs which is a firmware bug. The kernel has worked around this bug, but it may be worth getting the BIOS vendor to fix this."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_MEDIUM",
-   "tag": "FWTS_TAG_BIOS",
-   "pattern": "mtrr:.*your CPUs had inconsistent variable MTRR settings",
-   "advice": "The variable Memory Type Range Registers (MTRRs) which define memory caching policy are not consistent across all CPUs which is a firmware bug. The kernel has worked around this bug, but it may be worth getting the BIOS vendor to fix this."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_MEDIUM",
-   "tag": "FWTS_TAG_BIOS",
-   "pattern": "mtrr:.*your CPUs had inconsistent MTRRdefType settings",
-   "advice": "The Memory Type Range Registers (MTRRs) which define memory caching policy do not have a MTRRdefType consistently set across all CPUs which is a firmware bug. The kernel has worked around this bug, but it may be worth getting the BIOS vendor to fix this."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_BIOS",
-   "pattern": "mtrr:.*base.*is not 4 MiB aligned",
-   "advice": "The Memory Type Range Registers (MTRRs) for Intel PPro CPUs with stepping < 8 must be 4 MiB aligned and not touch 0x70000000 -> 0x7003FFFF. This BIOS misconfiguration and should be fixed."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_CRITIICAL",
-   "tag": "FWTS_TAG_BIOS",
-   "pattern": "mtrr:.*writable mtrr between 0x70000000 and 0x7003FFFF may hang the CPU",
-   "advice": "The Memory Type Range Registers (MTRRs) for Intel PPro CPUs with stepping < 8 must not touch region 0x70000000 -> 0x7003FFFF. This BIOS misconfiguration may hang the CPU and should be fixed."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_BIOS",
-   "pattern": "mtrr:.*base.*is not aligned on a size.*boundary",
-   "advice": "The Memory Type Range Registers (MTRRs) must be correctly aligned. This BIOS misconfiguration and should be fixed."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI",
-   "pattern": ".*defines _DOD but not _DOS",
-   "advice": "ACPI Method _DOD (Enumerate all devices attached to display adapter) is defined but we should also have _DOS (Enable\/Disable output switching) defined but it's been omitted. This can cause display switching issues."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI",
-   "pattern": "WARNING:.*bogus zero IO-APIC address found in MPTABLE",
-   "advice": "An IO-APIC address of zero has been found in the MPTABLE and is thus treated as misconfigured or bogus. I/O APIC support has been disabled. This is considered a firmware bug and the MPTABLE needs to be fixed."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI",
-   "pattern": "WARNING:.*Bogus.*APIC address found in table",
-   "advice": "An IO-APIC address of zero has been found in the MPTABLE and is thus treated as misconfigured or bogus. I/O APIC support has been disabled. This is considered a firmware bug and the MPTABLE needs to be fixed."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_MEDIUM",
-   "tag": "FWTS_TAG_ACPI",
-   "pattern": "\\[Firmware Bug\\]:.*Duplicate ACPI video bus",
-   "advice": "Try video module parameter video.allow_duplicates=1 if the current driver does't work."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_MEDIUM",
-   "tag": "FWTS_TAG_ACPI_PCI_EXPRESS",
-   "pattern": "\\[Firmware Bug\\]:.*PCI.*MMCONFIG.*not reserved in ACPI motherboard resources",
-   "advice": "It appears that PCI config space has been configured for a specific device but does not appear to be reserved by the ACPI motherboard resources."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_MEDIUM",
-   "tag": "FWTS_TAG_ACPI",
-   "pattern": "\\[Firmware Bug\\]: PCI.*not reserved in ACPI motherboard resources",
-   "advice": "PCI firmware bug. Please see the kernel log for more details."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_INFO",
-   "tag": "FWTS_TAG_ACPI",
-   "pattern": "\\[Firmware Bug\\]:.*_OSI.*Linux.*ignored",
-   "advice": "This is not exactly a failure mode but a warning from the kernel. The _OSI() method has implemented a match to the 'Linux' query in the DSDT and this is redundant because the ACPI driver matches onto the Windows _OSI strings by default."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI",
-   "pattern": "\\[Firmware Bug\\]: ACPI:",
-   "advice": "ACPI driver has detected an ACPI bug. This generally points to a bug in an ACPI table. Examine the kernel log for more details."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI",
-   "pattern": "\\[Firmware Bug\\]:.*",
-   "advice": "The kernel has detected a Firmware bug in the BIOS or ACPI which needs investigating and fixing."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_MEDIUM",
-   "tag": "FWTS_TAG_BIOS",
-   "pattern": "PCI.*BIOS Bug:",
-   "advice": ""
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_NAMESPACE_LOOKUP",
-   "pattern": "ACPI Error.*Namespace lookup failure, AE_NOT_FOUND",
-   "advice": "The kernel has detected an error trying to execute an Method and it cannot find an object. This is indicates a bug in the DSDT or SSDT AML code."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL",
-   "pattern": "ACPI Error.+psparse",
-   "advice": "The ACPI engine has failed to execute some AML. The error message above lists the method that caused this error."
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI",
-   "pattern": "ACPI Error",
-   "advice": "The kernel has most probably detected an error while executing ACPI AML. The error lists the ACPI driver module and the line number where the bug has been caught and the method that caused the error."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL",
-   "pattern": "\\*\\*\\* Error.*Method execution failed",
-   "advice": "Execution of an ACPI AML method failed."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL",
-   "pattern": "\\*\\*\\* Error.*Method execution failed.*AE_AML_METHOD_LIMIT",
-   "advice": "ACPI method reached maximum reentrancy limit of 255 - infinite recursion in AML in DSTD or SSDT"
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL",
-   "pattern": "\\*\\*\\* Error.*Method reached maximum reentrancy limitACPI method has reached reentrancy limit, this is a recursion bug in the AML",
-   "advice": ""
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_ACPI_METHOD_RETURN",
-   "pattern": "\\*\\*\\* Error.*Return object type is incorrect",
-   "advice": "Return object type is not the correct type, this is an AML error in the DSDT or SSDT"
-  } 
- ], 
- "pm_error_warning_patterns":
- [
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "PM: Failed to prepare device",
-   "advice": "dpm_prepare() failed to prepare all non-sys devices for a system PM transition. The device should be listed in the error message."
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "PM: Some devices failed to power down",
-   "advice": "dpm_suspend_noirq failed because some devices did not power down "
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "PM: Some system devices failed to power down",
-   "advice": "sysdev_suspend failed because some system devices did not power down."
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "PM: Error",
-   "advice": ""
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_NONE",
-   "pattern": "PM: Some devices failed to power down",
-   "advice": ""
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "PM: Restore failed, recovering",
-   "advice": "A resume from hibernate failed when calling hibernation_restore()"
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "PM: Resume from disk failed",
-   "advice": ""
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "PM: Not enough free memory",
-   "advice": "There was not enough physical memory to be able to generate a hibernation image before dumping it to disc."
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "PM: Memory allocation failed",
-   "advice": "swusp_alloc() failed trying to allocate highmem and failing that non-highmem pages for the suspend image. There is probably just not enough free physcial memory available."
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "PM: Image mismatch",
-   "advice": "Mismatch in kernel version, system type, kernel release version or machine id between suspended kernel and resumed kernel."
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "PM: Some devices failed to power down",
-   "advice": ""
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "PM: Some devices failed to suspend",
-   "advice": ""
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_MEDIUM",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "PM: can't read",
-   "advice": "Testing suspend cannot read RTC"
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_MEDIUM",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "PM: can't set",
-   "advice": "Testing suspend cannot set RTC"
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "PM: suspend test failed, error",
-   "advice": ""
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "PM: can't test ",
-   "advice": ""
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_MEDIUM",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "PM: no wakealarm-capable RTC driver is ready",
-   "advice": ""
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "PM: Adding page to bio failed at",
-   "advice": "An attempt to write the hibernate image to disk failed because a write BIO operation failed. This is usually a result of some physical hardware problem."
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "PM: Swap header not found",
-   "advice": "An attempt to write a hibernate image to disk failed because a valid swap device header could not be found. Make sure there is a formatted swap device on the machine and it is added using swapon -a."
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "PM: Cannot find swap device",
-   "advice": "An attempt to write a hibernate image to disk failed because the swap device could not be found. Make sure there is a formatted swap device on the machine and it is added using swapon -a."
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_CRITICAL",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "PM: Not enough free swap",
-   "advice": "Hibernate failed because the swap parition was probably too small."
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "PM: Image device not initialised",
-   "advice": ""
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "PM: Please power down manually",
-   "advice": ""
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "check_for_bios_corruption",
-   "advice": "The BIOS seems to be corrupting the first 64K of memory when doing suspend\/resume. Setting bios_corruption_check=0 will disable this check."
-  },
-  {
-   "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "WARNING: at.*hpet_next_event",
-   "advice": "Possibly an Intel I\/O controller hub HPET Write Timing issue: A read transaction that immediately follows a write transaction to the HPET TIMn_COMP Timer 0 (108h), HPET MAIN_CNT (0F0h), or TIMn_CONF.bit 6 (100h) may return an incorrect value.  This is known to cause issues when coming out of S3."
-  },
-  {
-   "compare_mode": "string",
-   "log_level": "LOG_LEVEL_HIGH",
-   "tag": "FWTS_TAG_POWER_MANAGEMENT",
-   "pattern": "BUG: soft lockup.*stuck for 0s",
-   "advice": "Softlock errors that occur when coming out of S3 may be tripped by TSC warping.  It may be worth trying the notsc kernel parameter and repeating S3 tests to see if this solves the problem."
-  }
- ] 
-}
diff --git a/fwts-test/arg-json-0001/test-0001.sh b/fwts-test/arg-json-0001/test-0001.sh
index 23e0bb88..c2a4cd9f 100755
--- a/fwts-test/arg-json-0001/test-0001.sh
+++ b/fwts-test/arg-json-0001/test-0001.sh
@@ -3,12 +3,12 @@
 TEST="Test --json-data-path option"
 NAME=test-0001.sh
 TMPLOG=$TMP/klog.log.$$
-HERE=$FWTSTESTDIR/arg-json-0001
+HERE=$FWTSTESTDIR/../data
 
 $FWTS --log-format="%line %owner " -w 80 --json-data-path=$HERE --klog=$FWTSTESTDIR/arg-json-0001/klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG
 diff $TMPLOG $FWTSTESTDIR/arg-json-0001/klog-0001.log >> $FAILURE_LOG
 ret=$?
-if [ $ret -eq 0 ]; then 
+if [ $ret -eq 0 ]; then
 	echo PASSED: $TEST, $NAME
 else
 	echo FAILED: $TEST, $NAME
diff --git a/fwts-test/arg-json-0001/test-0002.sh b/fwts-test/arg-json-0001/test-0002.sh
index 3c6811c3..aa65f10a 100755
--- a/fwts-test/arg-json-0001/test-0002.sh
+++ b/fwts-test/arg-json-0001/test-0002.sh
@@ -3,12 +3,12 @@
 TEST="Test -j option"
 NAME=test-0002.sh
 TMPLOG=$TMP/klog.log.$$
-HERE=$FWTSTESTDIR/arg-json-0001
+HERE=$FWTSTESTDIR/../data
 
 $FWTS --log-format="%line %owner " -w 80 -j $HERE --klog=$FWTSTESTDIR/arg-json-0001/klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG
 diff $TMPLOG $FWTSTESTDIR/arg-json-0001/klog-0002.log >> $FAILURE_LOG
 ret=$?
-if [ $ret -eq 0 ]; then 
+if [ $ret -eq 0 ]; then
 	echo PASSED: $TEST, $NAME
 else
 	echo FAILED: $TEST, $NAME
