diff --git a/src/acpi/acpiinfo/acpiinfo.c b/src/acpi/acpiinfo/acpiinfo.c
index 355f76a..b1486c3 100644
--- a/src/acpi/acpiinfo/acpiinfo.c
+++ b/src/acpi/acpiinfo/acpiinfo.c
@@ -147,7 +147,7 @@ static fwts_framework_minor_test acpiinfo_tests[] = {
 };
 
 static fwts_framework_ops acpiinfo_ops = {
-	.description = "General ACPI information check.",
+	.description = "General ACPI information test.",
 	.minor_tests = acpiinfo_tests
 };
 
diff --git a/src/acpi/acpitables/acpitables.c b/src/acpi/acpitables/acpitables.c
index 217b73b..23e9331 100644
--- a/src/acpi/acpitables/acpitables.c
+++ b/src/acpi/acpitables/acpitables.c
@@ -516,12 +516,12 @@ static int acpi_table_check_test1(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test acpi_table_check_tests[] = {
-	{ acpi_table_check_test1, "Check ACPI tables." },
+	{ acpi_table_check_test1, "Test ACPI tables." },
 	{ NULL, NULL }
 };
 
 static fwts_framework_ops acpi_table_check_ops = {
-	.description = "ACPI table settings sanity checks.",
+	.description = "ACPI table settings sanity tests.",
 	.minor_tests = acpi_table_check_tests
 };
 
diff --git a/src/acpi/apicinstance/apicinstance.c b/src/acpi/apicinstance/apicinstance.c
index d2376de..1c262b4 100644
--- a/src/acpi/apicinstance/apicinstance.c
+++ b/src/acpi/apicinstance/apicinstance.c
@@ -74,12 +74,12 @@ static int apicinstance_test1(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test apicinstance_tests[] = {
-	{ apicinstance_test1, "Check single instance of APIC/MADT table." },
+	{ apicinstance_test1, "Test for single instance of APIC/MADT table." },
 	{ NULL, NULL }
 };
 
 static fwts_framework_ops apicinstance_ops = {
-	.description = "Check for single instance of APIC/MADT table.",
+	.description = "Test for single instance of APIC/MADT table.",
 	.minor_tests = apicinstance_tests
 };
 
diff --git a/src/acpi/battery/battery.c b/src/acpi/battery/battery.c
index 8f58491..f40ebf1 100644
--- a/src/acpi/battery/battery.c
+++ b/src/acpi/battery/battery.c
@@ -286,12 +286,12 @@ static int battery_test1(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test battery_tests[] = {
-	{ battery_test1, "Check batteries." },
+	{ battery_test1, "Battery test." },
 	{ NULL, NULL }
 };
 
 static fwts_framework_ops battery_ops = {
-	.description = "Battery Tests.",
+	.description = "Battery tests.",
 	.minor_tests = battery_tests
 };
 
diff --git a/src/acpi/brightness/brightness.c b/src/acpi/brightness/brightness.c
index b4b588e..8853979 100644
--- a/src/acpi/brightness/brightness.c
+++ b/src/acpi/brightness/brightness.c
@@ -375,11 +375,11 @@ static int brightness_test5(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test brightness_tests[] = {
-	{ brightness_test1, "Check for maximum and actual brightness." },
+	{ brightness_test1, "Test for maximum and actual brightness." },
 	{ brightness_test2, "Change actual brightness." },
 	{ brightness_test3, "Observe all brightness changes." },
 	{ brightness_test4, "Observe min, max brightness changes." },
-	{ brightness_test5, "Check brightness hotkeys." },
+	{ brightness_test5, "Test brightness hotkeys." },
 	{ NULL, NULL }
 };
 
diff --git a/src/acpi/checksum/checksum.c b/src/acpi/checksum/checksum.c
index e56ca66..3eb3f74 100644
--- a/src/acpi/checksum/checksum.c
+++ b/src/acpi/checksum/checksum.c
@@ -146,12 +146,12 @@ static int checksum_test1(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test checksum_tests[] = {
-	{ checksum_test1, "Check ACPI table checksums." },
+	{ checksum_test1, "ACPI table checksum test." },
 	{ NULL, NULL }
 };
 
 static fwts_framework_ops checksum_ops = {
-	.description = "Check ACPI table checksum.",
+	.description = "ACPI table checksum test.",
 	.minor_tests = checksum_tests
 };
 
diff --git a/src/acpi/cstates/cstates.c b/src/acpi/cstates/cstates.c
index 90b5c03..32bfcce 100644
--- a/src/acpi/cstates/cstates.c
+++ b/src/acpi/cstates/cstates.c
@@ -245,12 +245,12 @@ static int cstates_test1(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test cstates_tests[] = {
-	{ cstates_test1, "Check all CPUs C-states." },
+	{ cstates_test1, "Test all CPUs C-states." },
 	{ NULL, NULL }
 };
 
 static fwts_framework_ops cstates_ops = {
-	.description = "Check processor C state support.",
+	.description = "Processor C state support test.",
 	.minor_tests = cstates_tests
 };
 
diff --git a/src/acpi/dmar/dmar.c b/src/acpi/dmar/dmar.c
index 6505a94..880ba88 100644
--- a/src/acpi/dmar/dmar.c
+++ b/src/acpi/dmar/dmar.c
@@ -328,12 +328,12 @@ static int dmar_test1(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test dmar_tests[] = {
-	{ dmar_test1, "Check DMA Remapping." },
+	{ dmar_test1, "DMA Remapping test." },
 	{ NULL, NULL }
 };
 
 static fwts_framework_ops dmar_ops = {
-	.description = "Check sane DMA Remapping (VT-d).",
+	.description = "DMA Remapping (VT-d) test.",
 	.minor_tests = dmar_tests
 };
 
diff --git a/src/acpi/fadt/fadt.c b/src/acpi/fadt/fadt.c
index e24f14f..9807d56 100644
--- a/src/acpi/fadt/fadt.c
+++ b/src/acpi/fadt/fadt.c
@@ -190,13 +190,13 @@ static int fadt_test2(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test fadt_tests[] = {
-	{ fadt_test1, "Check FADT SCI_EN bit is enabled." },
-	{ fadt_test2, "Check FADT reset register." },
+	{ fadt_test1, "Test FADT SCI_EN bit is enabled." },
+	{ fadt_test2, "Test FADT reset register." },
 	{ NULL, NULL }
 };
 
 static fwts_framework_ops fadt_ops = {
-	.description = "FADT SCI_EN enabled check.",
+	.description = "FADT SCI_EN enabled tests.",
 	.init        = fadt_init,
 	.minor_tests = fadt_tests
 };
diff --git a/src/acpi/fan/fan.c b/src/acpi/fan/fan.c
index 3e61259..74dd308 100644
--- a/src/acpi/fan/fan.c
+++ b/src/acpi/fan/fan.c
@@ -248,13 +248,13 @@ static int fan_test2(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test fan_tests[] = {
-	{ fan_test1, "Check fan status." },
+	{ fan_test1, "Test fan status." },
 	{ fan_test2, "Load system, check CPU fan status." },
 	{ NULL, NULL}
 };
 
 static fwts_framework_ops fan_ops = {
-	.description = "Simple Fan Tests.",
+	.description = "Simple fan tests.",
 	.minor_tests = fan_tests
 };
 
diff --git a/src/acpi/mcfg/mcfg.c b/src/acpi/mcfg/mcfg.c
index e956a44..a4d22a6 100644
--- a/src/acpi/mcfg/mcfg.c
+++ b/src/acpi/mcfg/mcfg.c
@@ -259,7 +259,7 @@ static fwts_framework_minor_test mcfg_tests[] = {
 };
 
 static fwts_framework_ops mcfg_ops = {
-	.description = "MCFG PCI Express* memory mapped config space.",
+	.description = "MCFG PCI Express* memory mapped config space test.",
 	.init        = mcfg_init,
 	.deinit      = mcfg_deinit,
 	.minor_tests = mcfg_tests
diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c
index f46fdff..748f608 100644
--- a/src/acpi/method/method.c
+++ b/src/acpi/method/method.c
@@ -4780,302 +4780,302 @@ static int method_test_DSS(fwts_framework *fw)
  * Tests
  */
 static fwts_framework_minor_test method_tests[] = {
-	{ method_name_check, "Check Method Names." },
+	{ method_name_check, "Test Method Names." },
 
 	/* Section 5.3 */
-	/* { method_test_GPE, "Check _GPE (General Purpose Events)." }, */
-	/* { method_test_PR , "Check _PR  (Processor)." }, */
+	/* { method_test_GPE, "Test _GPE (General Purpose Events)." }, */
+	/* { method_test_PR , "Test _PR  (Processor)." }, */
 
 	/* Section 5.6 ACPI Event Programming Model */
-	/* { method_test_Wxx, "Check _Wxx (Wake Event)." }, */
+	/* { method_test_Wxx, "Test _Wxx (Wake Event)." }, */
 
-	{ method_test_AEI, "Check _AEI." },
-	/* { method_test_EVT, "Check _EVT (Event Method)." }, */
+	{ method_test_AEI, "Test _AEI." },
+	/* { method_test_EVT, "Test _EVT (Event Method)." }, */
 
 	/* Section 5.7 Predefined Objects */
-	/* { method_test_DLM, "Check _DLM (Device Lock Mutex)." }, */
-	/* { method_test_GL , "Check _GL  (Global Lock)." }, */
-	/* { method_test_OS , "Check _OS  (Operating System)." }, */
-	/* { method_test_REV, "Check _REV (Revision)." }, */
+	/* { method_test_DLM, "Test _DLM (Device Lock Mutex)." }, */
+	/* { method_test_GL , "Test _GL  (Global Lock)." }, */
+	/* { method_test_OS , "Test _OS  (Operating System)." }, */
+	/* { method_test_REV, "Test _REV (Revision)." }, */
 
 	/* Section 5.8 System Configuration Objects */
-	/* { method_test_PIC, "Check _PIC (Inform AML of Interrupt Model)." }, */
+	/* { method_test_PIC, "Test _PIC (Inform AML of Interrupt Model)." }, */
 
 	/* Section 6.1 Device Identification Objects  */
 
-	/* { method_test_CID, "Check _CID (Compatible ID)." }, */
-	/* { method_test_CLS, "Check _CLS (Class Code)." }, */
-	{ method_test_DDN, "Check _DDN (DOS Device Name)." },
-	{ method_test_HID, "Check _HID (Hardware ID)." },
-	{ method_test_HRV, "Check _HRV (Hardware Revision Number)." },
-	/* { method_test_MLS, "Check _MLS (Multiple Language String)." }, */
-	{ method_test_PLD, "Check _PLD (Physical Device Location)." },
-	{ method_test_SUB, "Check _SUB (Subsystem ID)." },
-	{ method_test_SUN, "Check _SUN (Slot User Number)." },
-	{ method_test_STR, "Check _STR (String)." },
-	{ method_test_UID, "Check _UID (Unique ID)." },
+	/* { method_test_CID, "Test _CID (Compatible ID)." }, */
+	/* { method_test_CLS, "Test _CLS (Class Code)." }, */
+	{ method_test_DDN, "Test _DDN (DOS Device Name)." },
+	{ method_test_HID, "Test _HID (Hardware ID)." },
+	{ method_test_HRV, "Test _HRV (Hardware Revision Number)." },
+	/* { method_test_MLS, "Test _MLS (Multiple Language String)." }, */
+	{ method_test_PLD, "Test _PLD (Physical Device Location)." },
+	{ method_test_SUB, "Test _SUB (Subsystem ID)." },
+	{ method_test_SUN, "Test _SUN (Slot User Number)." },
+	{ method_test_STR, "Test _STR (String)." },
+	{ method_test_UID, "Test _UID (Unique ID)." },
 
 	/* Section 6.2 Device Configurations Objects */
 
-	/* { method_test_CDM, "Check _CDM (Clock Domain)." }, */
-	{ method_test_CRS, "Check _CRS (Current Resource Settings)." },
-	{ method_test_DIS, "Check _DIS (Disable)." },
-	{ method_test_DMA, "Check _DMA (Direct Memory Access)." },
-	{ method_test_FIX, "Check _FIX (Fixed Register Resource Provider)." },
-	{ method_test_GSB, "Check _GSB (Global System Interrupt Base)." },
-	{ method_test_HPP, "Check _HPP (Hot Plug Parameters)." },
-	/* { method_test_HPX, "Check _HPX (Hot Plug Extensions)." }, */
-	/* { method_test_MAT, "Check _MAT (Multiple APIC Table Entry)." }, */
-	{ method_test_PRS, "Check _PRS (Possible Resource Settings)." },
-	{ method_test_PXM, "Check _PXM (Proximity)." },
-	/* { method_test_SLI, "Check _SLI (System Locality Information)." }, */
-	/* { method_test_SRS, "Check _SRS (Set Resource Settings)." }, */
+	/* { method_test_CDM, "Test _CDM (Clock Domain)." }, */
+	{ method_test_CRS, "Test _CRS (Current Resource Settings)." },
+	{ method_test_DIS, "Test _DIS (Disable)." },
+	{ method_test_DMA, "Test _DMA (Direct Memory Access)." },
+	{ method_test_FIX, "Test _FIX (Fixed Register Resource Provider)." },
+	{ method_test_GSB, "Test _GSB (Global System Interrupt Base)." },
+	{ method_test_HPP, "Test _HPP (Hot Plug Parameters)." },
+	/* { method_test_HPX, "Test _HPX (Hot Plug Extensions)." }, */
+	/* { method_test_MAT, "Test _MAT (Multiple APIC Table Entry)." }, */
+	{ method_test_PRS, "Test _PRS (Possible Resource Settings)." },
+	{ method_test_PXM, "Test _PXM (Proximity)." },
+	/* { method_test_SLI, "Test _SLI (System Locality Information)." }, */
+	/* { method_test_SRS, "Test _SRS (Set Resource Settings)." }, */
 
 	/* Section 6.3 Device Insertion, Removal and Status Objects */
 
-	{ method_test_EDL, "Check _EDL (Eject Device List)." },
-	{ method_test_EJD, "Check _EJD (Ejection Dependent Device)." },
-	{ method_test_EJ0, "Check _EJ0 (Eject)." },
-	{ method_test_EJ1, "Check _EJ1 (Eject)." },
-	{ method_test_EJ2, "Check _EJ2 (Eject)." },
-	{ method_test_EJ3, "Check _EJ3 (Eject)." },
-	{ method_test_EJ4, "Check _EJ4 (Eject)." },
-	{ method_test_LCK, "Check _LCK (Lock)." },
-	/* { method_test_OST, "Check _OST (OSPM Status Indication)." }, */
-	{ method_test_RMV, "Check _RMV (Remove)." },
-	{ method_test_STA, "Check _STA (Status)." },
+	{ method_test_EDL, "Test _EDL (Eject Device List)." },
+	{ method_test_EJD, "Test _EJD (Ejection Dependent Device)." },
+	{ method_test_EJ0, "Test _EJ0 (Eject)." },
+	{ method_test_EJ1, "Test _EJ1 (Eject)." },
+	{ method_test_EJ2, "Test _EJ2 (Eject)." },
+	{ method_test_EJ3, "Test _EJ3 (Eject)." },
+	{ method_test_EJ4, "Test _EJ4 (Eject)." },
+	{ method_test_LCK, "Test _LCK (Lock)." },
+	/* { method_test_OST, "Test _OST (OSPM Status Indication)." }, */
+	{ method_test_RMV, "Test _RMV (Remove)." },
+	{ method_test_STA, "Test _STA (Status)." },
 
 	/* Section 6.4 Resource Data Types for ACPI */
 
 	/* Section 6.5 Other Objects and Controls */
 
-	/* { method_test_DEP, "Check _DEP (Operational Region Dependencies)." }, */
-	{ method_test_BDN, "Check _BDN (BIOS Dock Name)." },
-	{ method_test_BBN, "Check _BBN (Base Bus Number)." },
-	{ method_test_DCK, "Check _DCK (Dock)." },
-	{ method_test_INI, "Check _INI (Initialize)." },
-	/* { method_test_GLK, "Check _GLK (Global Lock)." }, */
-	/* { method_test_REG, "Check _REG (Region)." }, */
-	{ method_test_SEG, "Check _SEG (Segment)." },
+	/* { method_test_DEP, "Test _DEP (Operational Region Dependencies)." }, */
+	{ method_test_BDN, "Test _BDN (BIOS Dock Name)." },
+	{ method_test_BBN, "Test _BBN (Base Bus Number)." },
+	{ method_test_DCK, "Test _DCK (Dock)." },
+	{ method_test_INI, "Test _INI (Initialize)." },
+	/* { method_test_GLK, "Test _GLK (Global Lock)." }, */
+	/* { method_test_REG, "Test _REG (Region)." }, */
+	{ method_test_SEG, "Test _SEG (Segment)." },
 
 	/* Section 7.1 Declaring a Power Resource Object */
 
-	{ method_test_OFF, "Check _OFF (Set resource off)." },
-	{ method_test_ON,  "Check _ON  (Set resource on)." },
+	{ method_test_OFF, "Test _OFF (Set resource off)." },
+	{ method_test_ON,  "Test _ON  (Set resource on)." },
 
 	/* Section 7.2 Device Power Management Objects */
 
-	{ method_test_DSW, "Check _DSW (Device Sleep Wake)." },
-	{ method_test_IRC, "Check _IRC (In Rush Current)." },
-	{ method_test_PRE, "Check _PRE (Power Resources for Enumeration)." },
-	{ method_test_PR0, "Check _PR0 (Power Resources for D0)." },
-	{ method_test_PR1, "Check _PR1 (Power Resources for D1)." },
-	{ method_test_PR2, "Check _PR2 (Power Resources for D2)." },
-	{ method_test_PR3, "Check _PR3 (Power Resources for D3)." },
-	/* { method_test_PRW, "Check _PRW (Power Resources for Wake)." }, */
-	{ method_test_PS0, "Check _PS0 (Power State 0)." },
-	{ method_test_PS1, "Check _PS1 (Power State 1)." },
-	{ method_test_PS2, "Check _PS2 (Power State 2)." },
-	{ method_test_PS3, "Check _PS3 (Power State 3)." },
-	{ method_test_PSC, "Check _PSC (Power State Current)." },
-	{ method_test_PSE, "Check _PSE (Power State for Enumeration)." },
-	{ method_test_PSW, "Check _PSW (Power State Wake)." },
-	{ method_test_S1D, "Check _S1D (S1 Device State)." },
-	{ method_test_S2D, "Check _S2D (S2 Device State)." },
-	{ method_test_S3D, "Check _S3D (S3 Device State)." },
-	{ method_test_S4D, "Check _S4D (S4 Device State)." },
-	{ method_test_S0W, "Check _S0W (S0 Device Wake State)." },
-	{ method_test_S1W, "Check _S1W (S1 Device Wake State)." },
-	{ method_test_S2W, "Check _S2W (S2 Device Wake State)." },
-	{ method_test_S3W, "Check _S3W (S3 Device Wake State)." },
-	{ method_test_S4W, "Check _S4W (S4 Device Wake State)." },
+	{ method_test_DSW, "Test _DSW (Device Sleep Wake)." },
+	{ method_test_IRC, "Test _IRC (In Rush Current)." },
+	{ method_test_PRE, "Test _PRE (Power Resources for Enumeration)." },
+	{ method_test_PR0, "Test _PR0 (Power Resources for D0)." },
+	{ method_test_PR1, "Test _PR1 (Power Resources for D1)." },
+	{ method_test_PR2, "Test _PR2 (Power Resources for D2)." },
+	{ method_test_PR3, "Test _PR3 (Power Resources for D3)." },
+	/* { method_test_PRW, "Test _PRW (Power Resources for Wake)." }, */
+	{ method_test_PS0, "Test _PS0 (Power State 0)." },
+	{ method_test_PS1, "Test _PS1 (Power State 1)." },
+	{ method_test_PS2, "Test _PS2 (Power State 2)." },
+	{ method_test_PS3, "Test _PS3 (Power State 3)." },
+	{ method_test_PSC, "Test _PSC (Power State Current)." },
+	{ method_test_PSE, "Test _PSE (Power State for Enumeration)." },
+	{ method_test_PSW, "Test _PSW (Power State Wake)." },
+	{ method_test_S1D, "Test _S1D (S1 Device State)." },
+	{ method_test_S2D, "Test _S2D (S2 Device State)." },
+	{ method_test_S3D, "Test _S3D (S3 Device State)." },
+	{ method_test_S4D, "Test _S4D (S4 Device State)." },
+	{ method_test_S0W, "Test _S0W (S0 Device Wake State)." },
+	{ method_test_S1W, "Test _S1W (S1 Device Wake State)." },
+	{ method_test_S2W, "Test _S2W (S2 Device Wake State)." },
+	{ method_test_S3W, "Test _S3W (S3 Device Wake State)." },
+	{ method_test_S4W, "Test _S4W (S4 Device Wake State)." },
 
 	/* Section 7.3 OEM-Supplied System-Level Control Methods */
-	{ method_test_S0_, "Check _S0_ (S0 System State)." },
-	{ method_test_S1_, "Check _S1_ (S1 System State)." },
-	{ method_test_S2_, "Check _S2_ (S2 System State)." },
-	{ method_test_S3_, "Check _S3_ (S3 System State)." },
-	{ method_test_S4_, "Check _S4_ (S4 System State)." },
-	{ method_test_S5_, "Check _S5_ (S5 System State)." },
-	{ method_test_SWS, "Check _SWS (System Wake Source)." },
+	{ method_test_S0_, "Test _S0_ (S0 System State)." },
+	{ method_test_S1_, "Test _S1_ (S1 System State)." },
+	{ method_test_S2_, "Test _S2_ (S2 System State)." },
+	{ method_test_S3_, "Test _S3_ (S3 System State)." },
+	{ method_test_S4_, "Test _S4_ (S4 System State)." },
+	{ method_test_S5_, "Test _S5_ (S5 System State)." },
+	{ method_test_SWS, "Test _SWS (System Wake Source)." },
 
 	/* Section 8.4 Declaring Processors */
 
-	{ method_test_PSS, "Check _PSS (Performance Supported States)." },
-	{ method_test_CPC, "Check _CPC (Continuous Performance Control)." },
-	{ method_test_CSD, "Check _CSD (C State Dependencies)." },
-	{ method_test_CST, "Check _CST (C States)." },
-	{ method_test_PCT, "Check _PCT (Performance Control)." },
-	/* { method_test_PDC, "Check _PDC (Processor Driver Capabilities)." }, */
-	{ method_test_PDL, "Check _PDL (P-State Depth Limit)." },
-	{ method_test_PPC, "Check _PPC (Performance Present Capabilities)." },
-	{ method_test_PPE, "Check _PPE (Polling for Platform Error)." },
-	/* { method_test_PSD, "Check _PSD (Power State Dependencies)." }, */
-	/* { method_test_PTC, "Check _PTC (Processor Throttling Control)." }, */
-	{ method_test_TDL, "Check _TDL (T-State Depth Limit)." },
-	{ method_test_TPC, "Check _TPC (Throttling Present Capabilities)." },
-	{ method_test_TSD, "Check _TSD (Throttling State Dependencies)." },
-	{ method_test_TSS, "Check _TSS (Throttling Supported States)." },
+	{ method_test_PSS, "Test _PSS (Performance Supported States)." },
+	{ method_test_CPC, "Test _CPC (Continuous Performance Control)." },
+	{ method_test_CSD, "Test _CSD (C State Dependencies)." },
+	{ method_test_CST, "Test _CST (C States)." },
+	{ method_test_PCT, "Test _PCT (Performance Control)." },
+	/* { method_test_PDC, "Test _PDC (Processor Driver Capabilities)." }, */
+	{ method_test_PDL, "Test _PDL (P-State Depth Limit)." },
+	{ method_test_PPC, "Test _PPC (Performance Present Capabilities)." },
+	{ method_test_PPE, "Test _PPE (Polling for Platform Error)." },
+	/* { method_test_PSD, "Test _PSD (Power State Dependencies)." }, */
+	/* { method_test_PTC, "Test _PTC (Processor Throttling Control)." }, */
+	{ method_test_TDL, "Test _TDL (T-State Depth Limit)." },
+	{ method_test_TPC, "Test _TPC (Throttling Present Capabilities)." },
+	{ method_test_TSD, "Test _TSD (Throttling State Dependencies)." },
+	{ method_test_TSS, "Test _TSS (Throttling Supported States)." },
 
 	/* Section 8.5 Processor Aggregator Device */
 
 	/* Section 9.1 System Indicators */
-	/* { method_test_CWS, "Check _CWS (Clear Wake Status)." }, */
-	/* { method_test_MSG, "Check _MSG (Message)." }, */
-	/* { method_test_PUR, "Check _PUR (Processor Utilization Request)." }, */
-	/* { method_test_SST, "Check _SST (System Status)." }, */
+	/* { method_test_CWS, "Test _CWS (Clear Wake Status)." }, */
+	/* { method_test_MSG, "Test _MSG (Message)." }, */
+	/* { method_test_PUR, "Test _PUR (Processor Utilization Request)." }, */
+	/* { method_test_SST, "Test _SST (System Status)." }, */
 
 	/* Section 9.2 Ambient Light Sensor Device */
 
-	{ method_test_ALC, "Check _ALC (Ambient Light Colour Chromaticity)." },
-	{ method_test_ALI, "Check _ALI (Ambient Light Illuminance)." },
-	{ method_test_ALT, "Check _ALT (Ambient Light Temperature)." },
-	{ method_test_ALP, "Check _ALP (Ambient Light Polling). "},
-	/* { method_test_ALR, "Check _ALR (Ambient Light Response). "}, */
+	{ method_test_ALC, "Test _ALC (Ambient Light Colour Chromaticity)." },
+	{ method_test_ALI, "Test _ALI (Ambient Light Illuminance)." },
+	{ method_test_ALT, "Test _ALT (Ambient Light Temperature)." },
+	{ method_test_ALP, "Test _ALP (Ambient Light Polling). "},
+	/* { method_test_ALR, "Test _ALR (Ambient Light Response). "}, */
 
 	/* Section 9.3 Battery Device */
 
 	/* Section 9.4 Lid Device */
 
-	{ method_test_LID, "Check _LID (Lid Status)." },
+	{ method_test_LID, "Test _LID (Lid Status)." },
 
 	/* Section 9.8 ATA Controllers */
-	/* { method_test_GTF, "Check _GTF (Get Task File)." }, */
-	/* { method_test_GTM, "Check _GTM (Get Timing Mode)." }, */
-	/* { method_test_SDD, "Check _SDD (Set Device Data)." }, */
-	/* { method_test_STM, "Check _STM (Set Timing Mode)." }, */
+	/* { method_test_GTF, "Test _GTF (Get Task File)." }, */
+	/* { method_test_GTM, "Test _GTM (Get Timing Mode)." }, */
+	/* { method_test_SDD, "Test _SDD (Set Device Data)." }, */
+	/* { method_test_STM, "Test _STM (Set Timing Mode)." }, */
 
 	/* Section 9.9 Floppy Controllers */
-	/* { method_test_FDE, "Check _FDE (Floppy Disk Enumerate)." }, */
-	/* { method_test_FDI, "Check _FDI (Floppy Drive Information)." }, */
-	/* { method_test_FDM, "Check _FDM (Floppy Drive Mode)." }, */
+	/* { method_test_FDE, "Test _FDE (Floppy Disk Enumerate)." }, */
+	/* { method_test_FDI, "Test _FDI (Floppy Drive Information)." }, */
+	/* { method_test_FDM, "Test _FDM (Floppy Drive Mode)." }, */
 
 	/* Section 9.12 Memory Devices */
-	/* { method_test_MBM, "Check _MBM (Memory Bandwidth Monitoring Data)." }, */
-	/* { method_test_MSM, "Check _MSM (Memory Set Monitoring)." }, */
+	/* { method_test_MBM, "Test _MBM (Memory Bandwidth Monitoring Data)." }, */
+	/* { method_test_MSM, "Test _MSM (Memory Set Monitoring)." }, */
 
 	/* Section 9.13 USB Port Capabilities */
-	/* { method_test_UPC, "Check _UPC (USB Port Capabilities)." }, */
+	/* { method_test_UPC, "Test _UPC (USB Port Capabilities)." }, */
 
 	/* Section 9.14 Device Object Name Collision */
-	/* { method_test_DSM, "Check _DSM (Device Specific Method)." }, */
+	/* { method_test_DSM, "Test _DSM (Device Specific Method)." }, */
 
 	/* Section 9.16 User Presence Detection Device */
-	/* { method_test_UPD, "Check _UPD (User Presence Detect)." }, */
-	/* { method_test_UPP, "Check _UPP (User Presence Polling)." }, */
+	/* { method_test_UPD, "Test _UPD (User Presence Detect)." }, */
+	/* { method_test_UPP, "Test _UPP (User Presence Polling)." }, */
 
 	/* Section 9.18 Wake Alarm Device */
 
-	{ method_test_GCP, "Check _GCP (Get Capabilities)." },
-	{ method_test_GRT, "Check _GRT (Get Real Time)." },
-	{ method_test_GWS, "Check _GWS (Get Wake Status)." },
-	/* { method_test_SRT, "Check _SRT (Set Real Time)." }, */
-	{ method_test_STP, "Check _STP (Set Expired Timer Wake Policy)." },
-	{ method_test_STV, "Check _STV (Set Timer Value)." },
-	{ method_test_TIP, "Check _TIP (Expired Timer Wake Policy)." },
-	{ method_test_TIV, "Check _TIV (Timer Values)." },
+	{ method_test_GCP, "Test _GCP (Get Capabilities)." },
+	{ method_test_GRT, "Test _GRT (Get Real Time)." },
+	{ method_test_GWS, "Test _GWS (Get Wake Status)." },
+	/* { method_test_SRT, "Test _SRT (Set Real Time)." }, */
+	{ method_test_STP, "Test _STP (Set Expired Timer Wake Policy)." },
+	{ method_test_STV, "Test _STV (Set Timer Value)." },
+	{ method_test_TIP, "Test _TIP (Expired Timer Wake Policy)." },
+	{ method_test_TIV, "Test _TIV (Timer Values)." },
 
 	/* Section 10.1 Smart Battery */
 
-	{ method_test_SBS, "Check _SBS (Smart Battery Subsystem)." },
+	{ method_test_SBS, "Test _SBS (Smart Battery Subsystem)." },
 
 	/* Section 10.2 Battery Controls */
 
-	{ method_test_BCT, "Check _BCT (Battery Charge Time)." },
-	{ method_test_BIF, "Check _BIF (Battery Information)." },
-	{ method_test_BIX, "Check _BIX (Battery Information Extended)." },
-	{ method_test_BMA, "Check _BMA (Battery Measurement Averaging)." },
-	{ method_test_BMC, "Check _BMC (Battery Maintenance Control)." },
-	{ method_test_BMD, "Check _BMD (Battery Maintenance Data)." },
-	{ method_test_BMS, "Check _BMS (Battery Measurement Sampling Time)." },
-	{ method_test_BST, "Check _BST (Battery Status)." },
-	{ method_test_BTP, "Check _BTP (Battery Trip Point)." },
-	{ method_test_BTM, "Check _BTM (Battery Time)." },
-	/* { method_test_BLT, "Check _BLT (Battery Level Threshold)." }, */
-	{ method_test_PCL, "Check _PCL (Power Consumer List)." },
+	{ method_test_BCT, "Test _BCT (Battery Charge Time)." },
+	{ method_test_BIF, "Test _BIF (Battery Information)." },
+	{ method_test_BIX, "Test _BIX (Battery Information Extended)." },
+	{ method_test_BMA, "Test _BMA (Battery Measurement Averaging)." },
+	{ method_test_BMC, "Test _BMC (Battery Maintenance Control)." },
+	{ method_test_BMD, "Test _BMD (Battery Maintenance Data)." },
+	{ method_test_BMS, "Test _BMS (Battery Measurement Sampling Time)." },
+	{ method_test_BST, "Test _BST (Battery Status)." },
+	{ method_test_BTP, "Test _BTP (Battery Trip Point)." },
+	{ method_test_BTM, "Test _BTM (Battery Time)." },
+	/* { method_test_BLT, "Test _BLT (Battery Level Threshold)." }, */
+	{ method_test_PCL, "Test _PCL (Power Consumer List)." },
 
 	/* Section 10.3 AC Adapters and Power Source Objects */
 
-	/* { method_test_PCL, "Check _PCL (Power Consumer List)." }, */
-	{ method_test_PIF, "Check _PIF (Power Source Information)." },
-	/* { method_test_PRL, "Check _PRL (Power Source Redundancy List)." }, */
-	{ method_test_PSR, "Check _PSR (Power Source)." },
+	/* { method_test_PCL, "Test _PCL (Power Consumer List)." }, */
+	{ method_test_PIF, "Test _PIF (Power Source Information)." },
+	/* { method_test_PRL, "Test _PRL (Power Source Redundancy List)." }, */
+	{ method_test_PSR, "Test _PSR (Power Source)." },
 
 	/* Section 10.4 Power Meters */
-	/* { method_test_GAI, "Check _GAI (Get Averaging Level)." }, */
-	/* { method_test_GHL, "Check _GHL (Get Harware Limit)." }, */
-	/* { method_test_PAI, "Check _PAI (Power Averaging Interval)." }, */
-	/* { method_test_PMC, "Check _PMC (Power Meter Capabilities)." }, */
-	/* { method_test_PMD, "Check _PMD (Power Meter Devices)." }, */
-	/* { method_test_PMM, "Check _PMM (Power Meter Measurement)." }, */
-	/* { method_test_PTP, "Check _PTP (Power Trip Points)." }, */
-	/* { method_test_SHL, "Check _SHL (Set Hardware Limit)." }, */
+	/* { method_test_GAI, "Test _GAI (Get Averaging Level)." }, */
+	/* { method_test_GHL, "Test _GHL (Get Harware Limit)." }, */
+	/* { method_test_PAI, "Test _PAI (Power Averaging Interval)." }, */
+	/* { method_test_PMC, "Test _PMC (Power Meter Capabilities)." }, */
+	/* { method_test_PMD, "Test _PMD (Power Meter Devices)." }, */
+	/* { method_test_PMM, "Test _PMM (Power Meter Measurement)." }, */
+	/* { method_test_PTP, "Test _PTP (Power Trip Points)." }, */
+	/* { method_test_SHL, "Test _SHL (Set Hardware Limit)." }, */
 
 	/* Section 11.3 Fan Devices */
 
-	{ method_test_FIF, "Check _FIF (Fan Information)." },
-	/* { method_test_FPS, "Check _FPS (Fan Performance States)." }, */
-	{ method_test_FSL, "Check _FSL (Fan Set Level)." },
-	{ method_test_FST, "Check _FST (Fan Status)." },
+	{ method_test_FIF, "Test _FIF (Fan Information)." },
+	/* { method_test_FPS, "Test _FPS (Fan Performance States)." }, */
+	{ method_test_FSL, "Test _FSL (Fan Set Level)." },
+	{ method_test_FST, "Test _FST (Fan Status)." },
 
 	/* Section 11.4 Thermal Objects */
 
-	{ method_test_ACx, "Check _ACx (Active Cooling)." },
-	/* { method_test_ART, "Check _ART (Active Cooling Relationship Table)." }, */
-	/* { method_test_ALx, "Check _ALx (Active List)". }, */
-	{ method_test_CRT, "Check _CRT (Critical Trip Point)." },
-	{ method_test_DTI, "Check _DTI (Device Temperature Indication)." },
-	{ method_test_HOT, "Check _HOT (Hot Temperature)." },
-	{ method_test_NTT, "Check _NTT (Notification Temp Threshold)." },
-	/* { method_test_PSL, "Check _PSL (Passive List)." }, */
-	{ method_test_PSV, "Check _PSV (Passive Temp)." },
-	{ method_test_RTV, "Check _RTV (Relative Temp Values)." },
-	{ method_test_SCP, "Check _SCP (Set Cooling Policy)." },
-	{ method_test_TC1, "Check _TC1 (Thermal Constant 1)." },
-	{ method_test_TC2, "Check _TC2 (Thermal Constant 2)." },
-	{ method_test_TMP, "Check _TMP (Thermal Zone Current Temp)." },
-	{ method_test_TPT, "Check _TPT (Trip Point Temperature)." },
-	/* { method_test_TRT, "Check _TRT (Thermal Relationship Table)." }, */
-	{ method_test_TSP, "Check _TSP (Thermal Sampling Period)." },
-	{ method_test_TST, "Check _TST (Temperature Sensor Threshold)." },
-	/* { method_test_TZD, "Check _TZD (Thermal Zone Devices)." }, */
-	{ method_test_TZP, "Check _TZP (Thermal Zone Polling)." },
+	{ method_test_ACx, "Test _ACx (Active Cooling)." },
+	/* { method_test_ART, "Test _ART (Active Cooling Relationship Table)." }, */
+	/* { method_test_ALx, "Test _ALx (Active List)". }, */
+	{ method_test_CRT, "Test _CRT (Critical Trip Point)." },
+	{ method_test_DTI, "Test _DTI (Device Temperature Indication)." },
+	{ method_test_HOT, "Test _HOT (Hot Temperature)." },
+	{ method_test_NTT, "Test _NTT (Notification Temp Threshold)." },
+	/* { method_test_PSL, "Test _PSL (Passive List)." }, */
+	{ method_test_PSV, "Test _PSV (Passive Temp)." },
+	{ method_test_RTV, "Test _RTV (Relative Temp Values)." },
+	{ method_test_SCP, "Test _SCP (Set Cooling Policy)." },
+	{ method_test_TC1, "Test _TC1 (Thermal Constant 1)." },
+	{ method_test_TC2, "Test _TC2 (Thermal Constant 2)." },
+	{ method_test_TMP, "Test _TMP (Thermal Zone Current Temp)." },
+	{ method_test_TPT, "Test _TPT (Trip Point Temperature)." },
+	/* { method_test_TRT, "Test _TRT (Thermal Relationship Table)." }, */
+	{ method_test_TSP, "Test _TSP (Thermal Sampling Period)." },
+	{ method_test_TST, "Test _TST (Temperature Sensor Threshold)." },
+	/* { method_test_TZD, "Test _TZD (Thermal Zone Devices)." }, */
+	{ method_test_TZP, "Test _TZP (Thermal Zone Polling)." },
 
 	/* Section 16 Waking and Sleeping */
 
-	{ method_test_PTS, "Check _PTS (Prepare to Sleep)." },
-	{ method_test_TTS, "Check _TTS (Transition to State)." },
-	{ method_test_S0,  "Check _S0  (System S0 State)." },
-	{ method_test_S1,  "Check _S1  (System S1 State)." },
-	{ method_test_S2,  "Check _S2  (System S2 State)." },
-	{ method_test_S3,  "Check _S3  (System S3 State)." },
-	{ method_test_S4,  "Check _S4  (System S4 State)." },
-	{ method_test_S5,  "Check _S5  (System S5 State)." },
-	{ method_test_WAK, "Check _WAK (System Wake)." },
+	{ method_test_PTS, "Test _PTS (Prepare to Sleep)." },
+	{ method_test_TTS, "Test _TTS (Transition to State)." },
+	{ method_test_S0,  "Test _S0  (System S0 State)." },
+	{ method_test_S1,  "Test _S1  (System S1 State)." },
+	{ method_test_S2,  "Test _S2  (System S2 State)." },
+	{ method_test_S3,  "Test _S3  (System S3 State)." },
+	{ method_test_S4,  "Test _S4  (System S4 State)." },
+	{ method_test_S5,  "Test _S5  (System S5 State)." },
+	{ method_test_WAK, "Test _WAK (System Wake)." },
 
 	/* Section 19 */
-	/* { method_test_IFT, "Check _IFT (IPMI Interface Type)." }, */
-	/* { method_test_INT, "Check _INT (Interrupts)." }, */
+	/* { method_test_IFT, "Test _IFT (IPMI Interface Type)." }, */
+	/* { method_test_INT, "Test _INT (Interrupts)." }, */
 
 	/* Appendix B, ACPI Extensions for Display Adapters */
 
-	{ method_test_ADR, "Check _ADR (Return Unique ID for Device)." },
-	{ method_test_BCL, "Check _BCL (Query List of Brightness Control Levels Supported)." },
-	{ method_test_BCM, "Check _BCM (Set Brightness Level)." },
-	{ method_test_BQC, "Check _BQC (Brightness Query Current Level)." },
-	{ method_test_DCS, "Check _DCS (Return the Status of Output Device)." },
-	{ method_test_DDC, "Check _DDC (Return the EDID for this Device)." },
-	{ method_test_DSS, "Check _DSS (Device Set State)." },
-	{ method_test_DGS, "Check _DGS (Query Graphics State)." },
-	{ method_test_DOD, "Check _DOD (Enumerate All Devices Attached to Display Adapter)." },
-	{ method_test_DOS, "Check _DOS (Enable/Disable Output Switching)." },
-	{ method_test_GPD, "Check _GPD (Get POST Device)." },
-	{ method_test_ROM, "Check _ROM (Get ROM Data)." },
-	{ method_test_SPD, "Check _SPD (Set POST Device)." },
-	{ method_test_VPO, "Check _VPO (Video POST Options)." },
+	{ method_test_ADR, "Test _ADR (Return Unique ID for Device)." },
+	{ method_test_BCL, "Test _BCL (Query List of Brightness Control Levels Supported)." },
+	{ method_test_BCM, "Test _BCM (Set Brightness Level)." },
+	{ method_test_BQC, "Test _BQC (Brightness Query Current Level)." },
+	{ method_test_DCS, "Test _DCS (Return the Status of Output Device)." },
+	{ method_test_DDC, "Test _DDC (Return the EDID for this Device)." },
+	{ method_test_DSS, "Test _DSS (Device Set State)." },
+	{ method_test_DGS, "Test _DGS (Query Graphics State)." },
+	{ method_test_DOD, "Test _DOD (Enumerate All Devices Attached to Display Adapter)." },
+	{ method_test_DOS, "Test _DOS (Enable/Disable Output Switching)." },
+	{ method_test_GPD, "Test _GPD (Get POST Device)." },
+	{ method_test_ROM, "Test _ROM (Get ROM Data)." },
+	{ method_test_SPD, "Test _SPD (Set POST Device)." },
+	{ method_test_VPO, "Test _VPO (Video POST Options)." },
 
 	/* From PCI Specification */
-	/* { method_test_CBA, "Check _CBA (Configuration Base Address)." }, */
+	/* { method_test_CBA, "Test _CBA (Configuration Base Address)." }, */
 
 	/* End! */
 
@@ -5083,7 +5083,7 @@ static fwts_framework_minor_test method_tests[] = {
 };
 
 static fwts_framework_ops method_ops = {
-	.description = "ACPI DSDT Method Semantic Tests.",
+	.description = "ACPI DSDT Method Semantic tests.",
 	.init        = method_init,
 	.deinit      = method_deinit,
 	.minor_tests = method_tests
diff --git a/src/acpi/pcc/pcc.c b/src/acpi/pcc/pcc.c
index 4e4dd8a..2d05c22 100644
--- a/src/acpi/pcc/pcc.c
+++ b/src/acpi/pcc/pcc.c
@@ -455,12 +455,12 @@ static int pcc_test1(fwts_framework *fw)
 
 /* Just one big test */
 static fwts_framework_minor_test pcc_tests[] = {
-	{ pcc_test1, "Check PCCH." },
+	{ pcc_test1, "Processor Clocking Control (PCC) test." },
 	{ NULL, NULL }
 };
 
 static fwts_framework_ops pcc_ops = {
-	.description = "Processor Clocking Control (PCC) Test.",
+	.description = "Processor Clocking Control (PCC) test.",
 	.init        = pcc_init,
 	.deinit      = pcc_deinit,
 	.minor_tests = pcc_tests
diff --git a/src/acpi/wakealarm/wakealarm.c b/src/acpi/wakealarm/wakealarm.c
index 7f4886a..7413c05 100644
--- a/src/acpi/wakealarm/wakealarm.c
+++ b/src/acpi/wakealarm/wakealarm.c
@@ -122,15 +122,15 @@ static int wakealarm_test4(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test wakealarm_tests[] = {
-	{ wakealarm_test1, "Check existence of " WAKEALARM "." },
+	{ wakealarm_test1, "Test existence of " WAKEALARM "." },
 	{ wakealarm_test2, "Trigger wakealarm for 1 seconds in the future." },
-	{ wakealarm_test3, "Check if wakealarm is fired." },
+	{ wakealarm_test3, "Test if wakealarm is fired." },
 	{ wakealarm_test4, "Multiple wakealarm firing tests." },
 	{ NULL, NULL }
 };
 
 static fwts_framework_ops wakealarm_ops = {
-	.description = "Test ACPI Wakealarm.",
+	.description = "ACPI Wakealarm tests.",
 	.minor_tests = wakealarm_tests
 };
 
diff --git a/src/acpi/wmi/wmi.c b/src/acpi/wmi/wmi.c
index 510e9d0..f6b0d2c 100644
--- a/src/acpi/wmi/wmi.c
+++ b/src/acpi/wmi/wmi.c
@@ -393,7 +393,7 @@ static int wmi_test1(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test wmi_tests[] = {
-	{ wmi_test1, "Check Windows Management Instrumentation" },
+	{ wmi_test1, "Windows Management Instrumentation test." },
 	{ NULL, NULL }
 };
 
diff --git a/src/apic/apicedge/apicedge.c b/src/apic/apicedge/apicedge.c
index 9737fa4..c679959 100644
--- a/src/apic/apicedge/apicedge.c
+++ b/src/apic/apicedge/apicedge.c
@@ -106,12 +106,12 @@ static int apicedge_test1(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test apicedge_tests[] = {
-	{ apicedge_test1, "Legacy and PCI Interrupt Edge/Level trigger checks." },
+	{ apicedge_test1, "Legacy and PCI Interrupt Edge/Level trigger tests." },
 	{ NULL, NULL }
 };
 
 static fwts_framework_ops apicedge_ops = {
-	.description = "APIC Edge/Level Check.",
+	.description = "APIC edge/level test.",
 	.minor_tests = apicedge_tests
 };
 
diff --git a/src/bios/bios32/bios32.c b/src/bios/bios32/bios32.c
index 4e1a8a8..aedac87 100644
--- a/src/bios/bios32/bios32.c
+++ b/src/bios/bios32/bios32.c
@@ -154,12 +154,12 @@ static int bios32_test1(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test bios32_tests[] = {
-	{ bios32_test1, "Check BIOS32 Service Directory." },
+	{ bios32_test1, "BIOS32 Service Directory test." },
 	{ NULL, NULL }
 };
 
 static fwts_framework_ops bios32_ops = {
-	.description = "Check BIOS32 Service Directory.",
+	.description = "BIOS32 Service Directory test.",
 	.init        = bios32_init,
 	.minor_tests = bios32_tests
 };
diff --git a/src/bios/ebda_region/ebda_region.c b/src/bios/ebda_region/ebda_region.c
index af1de35..af8a0e6 100644
--- a/src/bios/ebda_region/ebda_region.c
+++ b/src/bios/ebda_region/ebda_region.c
@@ -102,12 +102,12 @@ static int ebda_test1(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test ebda_tests[] = {
-	{ ebda_test1, "Check EBDA is reserved in E820 table." },
+	{ ebda_test1, "Test EBDA is reserved in E820 table." },
 	{ NULL, NULL }
 };
 
 static fwts_framework_ops ebda_ops = {
-	.description = "Validate EBDA region is mapped and reserved in memory map table.",
+	.description = "Test EBDA region is mapped and reserved in memory map table.",
 	.init        = ebda_init,
 	.deinit      = ebda_deinit,
 	.minor_tests = ebda_tests
diff --git a/src/bios/hdaaudio/hdaaudio.c b/src/bios/hdaaudio/hdaaudio.c
index 6d47228..67ae8b5 100644
--- a/src/bios/hdaaudio/hdaaudio.c
+++ b/src/bios/hdaaudio/hdaaudio.c
@@ -176,12 +176,12 @@ static int hda_audio_test1(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test hda_audio_tests[] = {
-	{ hda_audio_test1, "Check HDA Audio Pin Configs." },
+	{ hda_audio_test1, "HDA Audio Pin Configuration test." },
 	{ NULL, NULL }
 };
 
 static fwts_framework_ops hda_audio_ops = {
-	.description = "Check HDA Audio Pin Configs.",
+	.description = "HDA Audio Pin Configuration test.",
 	.minor_tests = hda_audio_tests
 };
 
diff --git a/src/bios/mtrr/mtrr.c b/src/bios/mtrr/mtrr.c
index 23afd41..4bcdf3a 100644
--- a/src/bios/mtrr/mtrr.c
+++ b/src/bios/mtrr/mtrr.c
@@ -543,12 +543,12 @@ static int mtrr_test3(fwts_framework *fw)
 static fwts_framework_minor_test mtrr_tests[] = {
 	{ mtrr_test1, "Validate the kernel MTRR IOMEM setup." },
 	{ mtrr_test2, "Validate the MTRR setup across all processors." },
-	{ mtrr_test3, "Check for AMD MtrrFixDramModEn being cleared by the BIOS." },
+	{ mtrr_test3, "Test for AMD MtrrFixDramModEn being cleared by the BIOS." },
 	{ NULL, NULL }
 };
 
 static fwts_framework_ops mtrr_ops = {
-	.description = "MTRR validation.",
+	.description = "MTRR tests.",
 	.init        = mtrr_init,
 	.deinit      = mtrr_deinit,
 	.minor_tests = mtrr_tests
diff --git a/src/bios/multiproc/mpcheck.c b/src/bios/multiproc/mpcheck.c
index 5c211d3..72313ea 100644
--- a/src/bios/multiproc/mpcheck.c
+++ b/src/bios/multiproc/mpcheck.c
@@ -558,20 +558,20 @@ static int mpcheck_test_header(fwts_framework *fw)
 
 
 static fwts_framework_minor_test mpcheck_tests[] = {
-	{ mpcheck_test_header,  		"Check MP header." },
-	{ mpcheck_test_cpu_entries,		"Check MP CPU entries." },
-	{ mpcheck_test_bus_entries,		"Check MP Bus entries." },
-	{ mpcheck_test_io_apic_entries, 	"Check MP IO APIC entries." },
-	{ mpcheck_test_io_interrupt_entries,	"Check MP IO Interrupt entries." },
-	{ mpcheck_test_local_interrupt_entries, "Check MP Local Interrupt entries." },
-	{ mpcheck_test_sys_addr_entries,	"Check MP System Address entries." },
-	{ mpcheck_test_bus_hierarchy_entries,	"Check MP Bus Hierarchy entries." },
-	{ mpcheck_test_compat_bus_address_space_entries, "Check MP Compatible Bus Address Space entries." },
+	{ mpcheck_test_header,  		"Test MP header." },
+	{ mpcheck_test_cpu_entries,		"Test MP CPU entries." },
+	{ mpcheck_test_bus_entries,		"Test MP Bus entries." },
+	{ mpcheck_test_io_apic_entries, 	"Test MP IO APIC entries." },
+	{ mpcheck_test_io_interrupt_entries,	"Test MP IO Interrupt entries." },
+	{ mpcheck_test_local_interrupt_entries, "Test MP Local Interrupt entries." },
+	{ mpcheck_test_sys_addr_entries,	"Test MP System Address entries." },
+	{ mpcheck_test_bus_hierarchy_entries,	"Test MP Bus Hierarchy entries." },
+	{ mpcheck_test_compat_bus_address_space_entries, "Test MP Compatible Bus Address Space entries." },
 	{ NULL, NULL }
 };
 
 static fwts_framework_ops mpcheck_ops = {
-	.description = "Check MultiProcessor Tables.",
+	.description = "MultiProcessor Tables tests.",
 	.init        = mpcheck_init,
 	.deinit      = mpcheck_deinit,
 	.minor_tests = mpcheck_tests,
diff --git a/src/bios/os2gap/os2gap.c b/src/bios/os2gap/os2gap.c
index 2dd4c64..40773f1 100644
--- a/src/bios/os2gap/os2gap.c
+++ b/src/bios/os2gap/os2gap.c
@@ -67,7 +67,7 @@ static int os2gap_test1(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test os2gap_tests[] = {
-	{ os2gap_test1, "Check the OS/2 15Mb memory hole is absent." },
+	{ os2gap_test1, "Test the OS/2 15Mb memory hole is absent." },
 	{ NULL, NULL }
 };
 
diff --git a/src/bios/pciirq/pciirq.c b/src/bios/pciirq/pciirq.c
index 4aa2501..5df0e37 100644
--- a/src/bios/pciirq/pciirq.c
+++ b/src/bios/pciirq/pciirq.c
@@ -243,12 +243,12 @@ static int pciirq_test1(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test pciirq_tests[] = {
-	{ pciirq_test1, "PCI IRQ Routing Table." },
+	{ pciirq_test1, "PCI IRQ Routing Table test." },
 	{ NULL, NULL }
 };
 
 static fwts_framework_ops pciirq_ops = {
-	.description = "Check PCI IRQ Routing Table.",
+	.description = "PCI IRQ Routing Table test.",
 	.minor_tests = pciirq_tests
 };
 
diff --git a/src/bios/pnp/pnp.c b/src/bios/pnp/pnp.c
index 6079aae..65a16d1 100644
--- a/src/bios/pnp/pnp.c
+++ b/src/bios/pnp/pnp.c
@@ -180,12 +180,12 @@ static int pnp_test1(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test pnp_tests[] = {
-	{ pnp_test1, "Check PnP BIOS Support Installation structure." },
+	{ pnp_test1, "PnP BIOS Support Installation structure test." },
 	{ NULL, NULL }
 };
 
 static fwts_framework_ops pnp_ops = {
-	.description = "Check BIOS Support Installation structure.",
+	.description = "BIOS Support Installation structure test.",
 	.minor_tests = pnp_tests
 };
 
diff --git a/src/cpu/cpufreq/cpufreq.c b/src/cpu/cpufreq/cpufreq.c
index 6f77416..f22205c 100644
--- a/src/cpu/cpufreq/cpufreq.c
+++ b/src/cpu/cpufreq/cpufreq.c
@@ -713,9 +713,9 @@ static int cpufreq_init(fwts_framework *fw)
 
 static fwts_framework_minor_test cpufreq_tests[] = {
 #ifdef FWTS_ARCH_INTEL
-	{ cpufreq_test1, "CPU P-State Checks." },
+	{ cpufreq_test1, "CPU P-State tests." },
 #else
-	{ cpufreq_test1, "CPU Frequency Checks." },
+	{ cpufreq_test1, "CPU Frequency tests." },
 #endif
 	{ NULL, NULL }
 };
diff --git a/src/cpu/maxfreq/maxfreq.c b/src/cpu/maxfreq/maxfreq.c
index e8e6ffa..51ed1e8 100644
--- a/src/cpu/maxfreq/maxfreq.c
+++ b/src/cpu/maxfreq/maxfreq.c
@@ -180,12 +180,12 @@ static int maxfreq_test1(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test maxfreq_tests[] = {
-	{ maxfreq_test1, "Maximum CPU frequency check." },
+	{ maxfreq_test1, "Maximum CPU frequency test." },
 	{ NULL, NULL }
 };
 
 static fwts_framework_ops maxfreq_ops = {
-	.description = "Check max CPU frequencies against max scaling frequency.",
+	.description = "Test max CPU frequencies against max scaling frequency.",
 	.minor_tests = maxfreq_tests
 };
 
diff --git a/src/cpu/microcode/microcode.c b/src/cpu/microcode/microcode.c
index d4f448c..8794c6c 100644
--- a/src/cpu/microcode/microcode.c
+++ b/src/cpu/microcode/microcode.c
@@ -299,12 +299,12 @@ static int microcode_test1(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test microcode_tests[] = {
-	{ microcode_test1, "Check for most recent microcode being loaded." },
+	{ microcode_test1, "Test for most recent microcode being loaded." },
 	{ NULL, NULL }
 };
 
 static fwts_framework_ops microcode_ops = {
-	.description = "Check if system is using latest microcode.",
+	.description = "Test if system is using latest microcode.",
 	.init        = microcode_init,
 	.deinit      = microcode_deinit,
 	.minor_tests = microcode_tests
diff --git a/src/cpu/msr/msr.c b/src/cpu/msr/msr.c
index be9608c..e87fc66 100644
--- a/src/cpu/msr/msr.c
+++ b/src/cpu/msr/msr.c
@@ -565,11 +565,11 @@ static int msr_cpu_specific(fwts_framework *fw)
 
 
 static fwts_framework_minor_test msr_tests[] = {
-	{ msr_cpu_generic,		"Check CPU generic MSRs." },
-	{ msr_cpu_specific,		"Check CPU specific model MSRs." },
-	{ msr_pstate_ratios, 		"Check all P State Ratios." },
-	{ msr_c1_c3_autodemotion, 	"Check C1 and C3 autodemotion." },
-	{ msr_smrr,			"Check SMRR MSR registers." },
+	{ msr_cpu_generic,		"Test CPU generic MSRs." },
+	{ msr_cpu_specific,		"Test CPU specific model MSRs." },
+	{ msr_pstate_ratios, 		"Test all P State Ratios." },
+	{ msr_c1_c3_autodemotion, 	"Test C1 and C3 autodemotion." },
+	{ msr_smrr,			"Test SMRR MSR registers." },
 	{ NULL, NULL }
 };
 
diff --git a/src/cpu/nx/nx.c b/src/cpu/nx/nx.c
index 9cf1da9..4a76085 100644
--- a/src/cpu/nx/nx.c
+++ b/src/cpu/nx/nx.c
@@ -176,9 +176,9 @@ static int nx_test3(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test nx_tests[] = {
-	{ nx_test1, "Check CPU NX capability." },
-	{ nx_test2, "Check all CPUs have same BIOS set NX flag." },
-	{ nx_test3, "Check all CPUs have same msr setting in MSR 0x1a0." },
+	{ nx_test1, "Test CPU NX capability." },
+	{ nx_test2, "Test all CPUs have same BIOS set NX flag." },
+	{ nx_test3, "Test all CPUs have same msr setting in MSR 0x1a0." },
 	{ NULL, NULL }
 };
 
diff --git a/src/cpu/virt/virt.c b/src/cpu/virt/virt.c
index 29dfa17..5e17f49 100644
--- a/src/cpu/virt/virt.c
+++ b/src/cpu/virt/virt.c
@@ -78,12 +78,12 @@ static int virt_test1(fwts_framework *fw)
 
 
 static fwts_framework_minor_test virt_tests[] = {
-	{ virt_test1, "Check CPU Virtualisation Configuration." },
+	{ virt_test1, "CPU Virtualisation Configuration test." },
 	{ NULL, NULL }
 };
 
 static fwts_framework_ops virt_ops = {
-	.description = "Test CPU Virtualisation Configuration.",
+	.description = "CPU Virtualisation Configuration test.",
 	.init        = virt_init,
 	.deinit      = virt_deinit,
 	.minor_tests = virt_tests
diff --git a/src/dmi/dmicheck/dmicheck.c b/src/dmi/dmicheck/dmicheck.c
index 77022ba..ab7d045 100644
--- a/src/dmi/dmicheck/dmicheck.c
+++ b/src/dmi/dmicheck/dmicheck.c
@@ -1477,13 +1477,13 @@ static int dmicheck_test2(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test dmicheck_tests[] = {
-	{ dmicheck_test1, "Find and Check SMBIOS Table Entry Point." },
+	{ dmicheck_test1, "Find and test SMBIOS Table Entry Point." },
 	{ dmicheck_test2, "Test DMI/SMBIOS tables for errors." },
 	{ NULL, NULL }
 };
 
 static fwts_framework_ops dmicheck_ops = {
-	.description = "Test DMI/SMBIOS tables for errors.",
+	.description = "DMI/SMBIOS table tests.",
 	.minor_tests = dmicheck_tests
 };
 
diff --git a/src/hpet/hpet_check/hpet_check.c b/src/hpet/hpet_check/hpet_check.c
index 8fe124a..14afbd7 100644
--- a/src/hpet/hpet_check/hpet_check.c
+++ b/src/hpet/hpet_check/hpet_check.c
@@ -408,15 +408,15 @@ static int hpet_check_test4(fwts_framework *fw)
 
 
 static fwts_framework_minor_test hpet_check_tests[] = {
-	{ hpet_check_test1, "Check HPET base in kernel log." },
-	{ hpet_check_test2, "Check HPET base in HPET table. "},
-	{ hpet_check_test3, "Check HPET base in DSDT and/or SSDT. "},
-	{ hpet_check_test4, "Sanity check HPET configuration." },
+	{ hpet_check_test1, "Test HPET base in kernel log." },
+	{ hpet_check_test2, "Test HPET base in HPET table. "},
+	{ hpet_check_test3, "Test HPET base in DSDT and/or SSDT. "},
+	{ hpet_check_test4, "Test HPET configuration." },
 	{ NULL, NULL }
 };
 
 static fwts_framework_ops hpet_check_ops = {
-	.description = "HPET configuration test.",
+	.description = "HPET configuration tests.",
 	.init        = hpet_check_init,
 	.deinit      = hpet_check_deinit,
 	.minor_tests = hpet_check_tests
diff --git a/src/pci/aspm/aspm.c b/src/pci/aspm/aspm.c
index 8161440..5fc5008 100644
--- a/src/pci/aspm/aspm.c
+++ b/src/pci/aspm/aspm.c
@@ -271,7 +271,7 @@ static fwts_framework_minor_test aspm_tests[] = {
 };
 
 static fwts_framework_ops aspm_ops = {
-	.description = "PCIe ASPM check.",
+	.description = "PCIe ASPM test.",
 	.minor_tests = aspm_tests
 };
 
diff --git a/src/pci/crs/crs.c b/src/pci/crs/crs.c
index 74d7c3c..9b48ed4 100644
--- a/src/pci/crs/crs.c
+++ b/src/pci/crs/crs.c
@@ -131,12 +131,12 @@ static int crs_test1(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test crs_tests[] = {
-	{ crs_test1, "Check PCI host bridge configuration using _CRS." },
+	{ crs_test1, "Test PCI host bridge configuration using _CRS." },
 	{ NULL, NULL },
 };
 
 static fwts_framework_ops crs_ops = {
-	.description = "Check PCI host bridge configuration using _CRS.",
+	.description = "Test PCI host bridge configuration using _CRS.",
 	.minor_tests = crs_tests
 };
 
diff --git a/src/pci/maxreadreq/maxreadreq.c b/src/pci/maxreadreq/maxreadreq.c
index 2af26d5..7a06cec 100644
--- a/src/pci/maxreadreq/maxreadreq.c
+++ b/src/pci/maxreadreq/maxreadreq.c
@@ -137,12 +137,12 @@ static int maxreadreq_test1(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test maxreadreq_tests[] = {
-	{ maxreadreq_test1, "Check firmware settings MaxReadReq for PCI Express devices." },
+	{ maxreadreq_test1, "Test firmware settings MaxReadReq for PCI Express devices." },
 	{ NULL, NULL },
 };
 
 static fwts_framework_ops maxreadreq_ops = {
-	.description = "Checks firmware has set PCI Express MaxReadReq to a higher value on non-motherboard devices.",
+	.description = "Test firmware has set PCI Express MaxReadReq to a higher value on non-motherboard devices.",
 	.minor_tests = maxreadreq_tests
 };
 
diff --git a/src/uefi/csm/csm.c b/src/uefi/csm/csm.c
index 16498fb..b48480e 100644
--- a/src/uefi/csm/csm.c
+++ b/src/uefi/csm/csm.c
@@ -103,12 +103,12 @@ static int csm_test1(fwts_framework *fw)
 }
 
 static fwts_framework_minor_test csm_tests[] = {
-	{ csm_test1, "Check for UEFI Compatibility Support Module." },
+	{ csm_test1, "UEFI Compatibility Support Module test." },
 	{ NULL, NULL }
 };
 
 static fwts_framework_ops csm_ops = {
-	.description = "Check for UEFI Compatibility Support Module.",
+	.description = "UEFI Compatibility Support Module test.",
 	.minor_tests = csm_tests
 };
 
