diff --git a/test_lists/BMC_WEB_CI b/test_lists/BMC_WEB_CI
index 6fda7d8..392ec34 100644
--- a/test_lists/BMC_WEB_CI
+++ b/test_lists/BMC_WEB_CI
@@ -1,5 +1,5 @@
 #Basic GUI operations
--i Verify_IP_address
--i Verify_Select_Health_Status_From_Server_Health
--i Verify_Event_Log_Text_Appears_By_Clicking_Server_Health
--i OpenBMC GUI Logoff
+--include Verify_IP_address
+--include Verify_Select_Health_Status_From_Server_Health
+--include Verify_Event_Log_Text_Appears_By_Clicking_Server_Health
+--include OpenBMC GUI Logoff
diff --git a/test_lists/CT_basic_run b/test_lists/CT_basic_run
index 11b15e6..6ae0a36 100644
--- a/test_lists/CT_basic_run
+++ b/test_lists/CT_basic_run
@@ -1,41 +1,41 @@
 # Redfish Test.
--i Redfish_Login_And_Logout
--i Redfish_Login_Using_Unsecured_HTTP
--i Login_And_Verify_HTTP_Response_Header
+--include Redfish_Login_And_Logout
+--include Redfish_Login_Using_Unsecured_HTTP
+--include Login_And_Verify_HTTP_Response_Header
 # Local user management
--i Verify_AccountService_Available
--i Verify_IPMI_User_Summary
--i Create_Admin_Redfish_User_And_Verify_Login_Via_IPMI
+--include Verify_AccountService_Available
+--include Verify_IPMI_User_Summary
+--include Create_Admin_Redfish_User_And_Verify_Login_Via_IPMI
 #REST SSL connection test
--i Test_SSL_Connection
+--include Test_SSL_Connection
 #Basic REST test
--i REST_Login_Session_To_BMC
--i Verify_REST_JSON_Data_On_Success
--i Verify_REST_JSON_Data_On_Failure
+--include REST_Login_Session_To_BMC
+--include Verify_REST_JSON_Data_On_Success
+--include Verify_REST_JSON_Data_On_Failure
 #Basic poweron test
--i Verify_Front_And_Rear_LED_At_Standby
--i Verify_Redfish_Host_PowerOn
--i Verify_Redfish_Host_PowerOff
+--include Verify_Front_And_Rear_LED_At_Standby
+--include Verify_Redfish_Host_PowerOn
+--include Verify_Redfish_Host_PowerOff
 # Check for apps failures
--i Check_For_Application_Failures
+--include Check_For_Application_Failures
 #Power test via IPMI external
--i Verify_SOL_During_Boot
--i Verify_Host_PowerOff_Via_IPMI
--i Verify_Deactivate_Non_Existing_SOL
+--include Verify_SOL_During_Boot
+--include Verify_Host_PowerOff_Via_IPMI
+--include Verify_Deactivate_Non_Existing_SOL
 # IPMI SEL
--i Verify_IPMI_SEL_Version
--i Get_System_Time
+--include Verify_IPMI_SEL_Version
+--include Get_System_Time
 # Redfish Date Time
--i Verify_Redfish_BMC_Time
+--include Verify_Redfish_BMC_Time
 #Power restore.
--i Test_Restore_Policy_ALWAYS_POWER_OFF_With_Host_Off
+--include Test_Restore_Policy_ALWAYS_POWER_OFF_With_Host_Off
 #Inventory
--i Get_Processor_Inventory_Via_Redfish_And_Verify
+--include Get_Processor_Inventory_Via_Redfish_And_Verify
 #Sensors
--i Get_Ambient_Temperature_Records
+--include Get_Ambient_Temperature_Records
 #Certificate via Open SSL
--i Verify_Server_Certificate_View_Via_Openssl
+--include Verify_Server_Certificate_View_Via_Openssl
 #BMC sync list test
--i Test_BMC_Alt_Side_Mirroring
+--include Test_BMC_Alt_Side_Mirroring
 # Check for BMC dump.
--i Verify_No_BMC_Dump_And_Application_Failures_In_BMC
+--include Verify_No_BMC_Dump_And_Application_Failures_In_BMC
diff --git a/test_lists/HW_CI b/test_lists/HW_CI
index ee19485..ac0ca00 100644
--- a/test_lists/HW_CI
+++ b/test_lists/HW_CI
@@ -1,27 +1,27 @@
 #Verify SSH and IPMI interfaces
--i Test_SSH_And_IPMI_Connections
+--include Test_SSH_And_IPMI_Connections
 #Basic poweron test
--i Verify_Redfish_Host_PowerOn
--i Verify_Redfish_Host_PowerOff
+--include Verify_Redfish_Host_PowerOn
+--include Verify_Redfish_Host_PowerOff
 #Check for apps failures.
--i Check_For_Application_Failures
+--include Check_For_Application_Failures
 #Verify system boot time average
--i Verify_Uptime_Average_Against_Threshold
+--include Verify_Uptime_Average_Against_Threshold
 #Redfish tests cases.
--i Redfish_Login_And_Logout
--i GET_Redfish_Resources_With_Login
--i GET_Redfish_SessionService_Without_Login
--i Redfish_Login_Using_Invalid_Token
--i Delete_Redfish_Session_Using_Valid_Login
--i Redfish_Login_With_Invalid_Credentials
--i Redfish_Login_Using_Unsecured_HTTP
--i Verify_Update_Service_Enabled
--i Verify_Redfish_Software_Inventory_Collection
--i Redfish_Software_Inventory_Status_Check
+--include Redfish_Login_And_Logout
+--include GET_Redfish_Resources_With_Login
+--include GET_Redfish_SessionService_Without_Login
+--include Redfish_Login_Using_Invalid_Token
+--include Delete_Redfish_Session_Using_Valid_Login
+--include Redfish_Login_With_Invalid_Credentials
+--include Redfish_Login_Using_Unsecured_HTTP
+--include Verify_Update_Service_Enabled
+--include Verify_Redfish_Software_Inventory_Collection
+--include Redfish_Software_Inventory_Status_Check
 #IPMI tests.
--i Enable_IPMI_User_And_Verify
--i Verify_IPMI_User_Deletion
+--include Enable_IPMI_User_And_Verify
+--include Verify_IPMI_User_Deletion
 #Local user tests.
--i Verify_AccountService_Available
+--include Verify_AccountService_Available
 #Check for BMC dump.
--i Verify_No_BMC_Dump_And_Application_Failures_In_BMC
+--include Verify_No_BMC_Dump_And_Application_Failures_In_BMC
diff --git a/test_lists/HW_CI_DEV b/test_lists/HW_CI_DEV
index ee19485..ac0ca00 100644
--- a/test_lists/HW_CI_DEV
+++ b/test_lists/HW_CI_DEV
@@ -1,27 +1,27 @@
 #Verify SSH and IPMI interfaces
--i Test_SSH_And_IPMI_Connections
+--include Test_SSH_And_IPMI_Connections
 #Basic poweron test
--i Verify_Redfish_Host_PowerOn
--i Verify_Redfish_Host_PowerOff
+--include Verify_Redfish_Host_PowerOn
+--include Verify_Redfish_Host_PowerOff
 #Check for apps failures.
--i Check_For_Application_Failures
+--include Check_For_Application_Failures
 #Verify system boot time average
--i Verify_Uptime_Average_Against_Threshold
+--include Verify_Uptime_Average_Against_Threshold
 #Redfish tests cases.
--i Redfish_Login_And_Logout
--i GET_Redfish_Resources_With_Login
--i GET_Redfish_SessionService_Without_Login
--i Redfish_Login_Using_Invalid_Token
--i Delete_Redfish_Session_Using_Valid_Login
--i Redfish_Login_With_Invalid_Credentials
--i Redfish_Login_Using_Unsecured_HTTP
--i Verify_Update_Service_Enabled
--i Verify_Redfish_Software_Inventory_Collection
--i Redfish_Software_Inventory_Status_Check
+--include Redfish_Login_And_Logout
+--include GET_Redfish_Resources_With_Login
+--include GET_Redfish_SessionService_Without_Login
+--include Redfish_Login_Using_Invalid_Token
+--include Delete_Redfish_Session_Using_Valid_Login
+--include Redfish_Login_With_Invalid_Credentials
+--include Redfish_Login_Using_Unsecured_HTTP
+--include Verify_Update_Service_Enabled
+--include Verify_Redfish_Software_Inventory_Collection
+--include Redfish_Software_Inventory_Status_Check
 #IPMI tests.
--i Enable_IPMI_User_And_Verify
--i Verify_IPMI_User_Deletion
+--include Enable_IPMI_User_And_Verify
+--include Verify_IPMI_User_Deletion
 #Local user tests.
--i Verify_AccountService_Available
+--include Verify_AccountService_Available
 #Check for BMC dump.
--i Verify_No_BMC_Dump_And_Application_Failures_In_BMC
+--include Verify_No_BMC_Dump_And_Application_Failures_In_BMC
diff --git a/test_lists/QEMU_CI b/test_lists/QEMU_CI
index 91f5904..ba9061a 100644
--- a/test_lists/QEMU_CI
+++ b/test_lists/QEMU_CI
@@ -1,21 +1,21 @@
 #Verify SSH and IPMI interfaces
--i Test_SSH_And_IPMI_Connections
+--include Test_SSH_And_IPMI_Connections
 #Check for apps failures.
--i Check_For_Application_Failures
+--include Check_For_Application_Failures
 #Redfish tests cases.
--i Redfish_Login_And_Logout
--i GET_Redfish_Resources_With_Login
--i GET_Redfish_SessionService_Without_Login
--i Redfish_Login_Using_Invalid_Token
--i Delete_Redfish_Session_Using_Valid_Login
--i Redfish_Login_With_Invalid_Credentials
--i Verify_Update_Service_Enabled
--i Verify_Redfish_Software_Inventory_Collection
--i Redfish_Software_Inventory_Status_Check
+--include Redfish_Login_And_Logout
+--include GET_Redfish_Resources_With_Login
+--include GET_Redfish_SessionService_Without_Login
+--include Redfish_Login_Using_Invalid_Token
+--include Delete_Redfish_Session_Using_Valid_Login
+--include Redfish_Login_With_Invalid_Credentials
+--include Verify_Update_Service_Enabled
+--include Verify_Redfish_Software_Inventory_Collection
+--include Redfish_Software_Inventory_Status_Check
 #IPMI tests.
--i Enable_IPMI_User_And_Verify
--i Verify_IPMI_User_Deletion
+--include Enable_IPMI_User_And_Verify
+--include Verify_IPMI_User_Deletion
 #Local user tests.
--i Verify_AccountService_Available
+--include Verify_AccountService_Available
 #Check for BMC dump.
--i Verify_No_BMC_Dump_And_Application_Failures_In_BMC
+--include Verify_No_BMC_Dump_And_Application_Failures_In_BMC
diff --git a/test_lists/WEBUI_CI b/test_lists/WEBUI_CI
index 6845d20..8ee62ff 100644
--- a/test_lists/WEBUI_CI
+++ b/test_lists/WEBUI_CI
@@ -1,3 +1,3 @@
 #Basic GUI operations
--i Verify_Header_Text
--i Verify_GUI_Logout
+--include Verify_Header_Text
+--include Verify_GUI_Logout
diff --git a/test_lists/skip_test_palmetto b/test_lists/skip_test_palmetto
index 4786143..0177928 100644
--- a/test_lists/skip_test_palmetto
+++ b/test_lists/skip_test_palmetto
@@ -1,51 +1,51 @@
 # https://github.com/openbmc/openbmc/issues/93
--e System_Present
--e Chassis_Present
+--exclude System_Present
+--exclude Chassis_Present
 # https://github.com/openbmc/openbmc-test-automation/issues/207
--e Disable_PowerCap
+--exclude Disable_PowerCap
 # https://github.com/openbmc/openbmc-test-automation/issues/123
--e Execute_ipmi_BT_capabilities_command
+--exclude Execute_ipmi_BT_capabilities_command
 ##Testcase NA for Palmetto system
--e io_board_Present
--e io_board_Fault
--e Verify_Enabling_OCC_Turbo_Setting_Via_IPMI
--e Verify_Disabling_OCC_Turbo_Setting_Via_IPMI
--e Verify_Setting_OCC_Turbo_Via_REST
+--exclude io_board_Present
+--exclude io_board_Fault
+--exclude Verify_Enabling_OCC_Turbo_Setting_Via_IPMI
+--exclude Verify_Disabling_OCC_Turbo_Setting_Via_IPMI
+--exclude Verify_Setting_OCC_Turbo_Via_REST
 # https://github.com/openbmc/openbmc/issues/901
--e Set_BMC_Time_With_Split_And_Manual
+--exclude Set_BMC_Time_With_Split_And_Manual
 # https://github.com/openbmc/openbmc/issues/1142
--e Check_BMC_Name_Property_Is_Set
+--exclude Check_BMC_Name_Property_Is_Set
 # https://github.com/openbmc/openbmc-test-automation/issues/396
--e NetworkManager
+--exclude NetworkManager
 # Test cases are NA for Palmetto
--e LED_Group
--e Check_BMC_GPIO_FSI_Name_Property_Is_Set
--e Check_BMC_GPIO_FSI_Compatible_Property_Is_Set
--e Check_BMC_GPIO_keys_Name_Property_Is_Set
--e Check_BMC_GPIO_keys_Compatible_Property_Is_Set
--e Check_BMC_IIO-HWMON_Name_Property_Is_Set
--e Check_BMC_IIO-HWMON_Compatible_Property_Is_Set
+--exclude LED_Group
+--exclude Check_BMC_GPIO_FSI_Name_Property_Is_Set
+--exclude Check_BMC_GPIO_FSI_Compatible_Property_Is_Set
+--exclude Check_BMC_GPIO_keys_Name_Property_Is_Set
+--exclude Check_BMC_GPIO_keys_Compatible_Property_Is_Set
+--exclude Check_BMC_IIO-HWMON_Name_Property_Is_Set
+--exclude Check_BMC_IIO-HWMON_Compatible_Property_Is_Set
 # https://github.com/openbmc/openbmc-test-automation/issues/546
--e CPU_Present
--e DIMM3_Present
+--exclude CPU_Present
+--exclude DIMM3_Present
 # System LED test cases which are NA for Palmetto system.
--e Test_Beep_LED_And_Verify_Via_REST
--e Test_Fault_LED_And_Verify_Via_REST
--e Test_Rear_Identify_LED_And_Verify_Via_REST
--e Verify_Enclosure_Fault_LED_On_Assertion
--e Verify_Rear_Power_LED_Association_With_Group_LED
+--exclude Test_Beep_LED_And_Verify_Via_REST
+--exclude Test_Fault_LED_And_Verify_Via_REST
+--exclude Test_Rear_Identify_LED_And_Verify_Via_REST
+--exclude Verify_Enclosure_Fault_LED_On_Assertion
+--exclude Verify_Rear_Power_LED_Association_With_Group_LED
 # Network tests for xyz interface.
 # https://github.com/openbmc/openbmc-test-automation/issues/729
--e Network_Test
+--exclude Network_Test
 # FSI Related Test Cases NA for Palmetto System.
--e Verify_Enabling_OCC_Turbo_Setting_Via_IPMI
--e Verify_Disabling_OCC_Turbo_Setting_Via_IPMI
--e Verify_Setting_OCC_Turbo_Via_REST
--e Check_BMC_FSI_Compatible_Property_Is_Set
--e Check_BMC_FSI_Name_Property_Is_Set
+--exclude Verify_Enabling_OCC_Turbo_Setting_Via_IPMI
+--exclude Verify_Disabling_OCC_Turbo_Setting_Via_IPMI
+--exclude Verify_Setting_OCC_Turbo_Via_REST
+--exclude Check_BMC_FSI_Compatible_Property_Is_Set
+--exclude Check_BMC_FSI_Name_Property_Is_Set
 # Applicable only for witherspoon
--e Verify_Boxelder_Present_Property
--e Verify_Boxelder_MAC_Address_Property_Is_Populated
+--exclude Verify_Boxelder_Present_Property
+--exclude Verify_Boxelder_MAC_Address_Property_Is_Populated
 # https://github.com/openbmc/openbmc-test-automation/issues/1411
--e Check_BMC_Memory_Name_Property_Is_Set
--e Check_BMC_Memory_Device_Type_Property_Is_Set
+--exclude Check_BMC_Memory_Name_Property_Is_Set
+--exclude Check_BMC_Memory_Device_Type_Property_Is_Set
diff --git a/test_lists/skip_test_witherspoon b/test_lists/skip_test_witherspoon
index c720d03..8640d5b 100644
--- a/test_lists/skip_test_witherspoon
+++ b/test_lists/skip_test_witherspoon
@@ -1,74 +1,74 @@
 # https://github.com/openbmc/openbmc-test-automation/issues/822
--e Verify_Minimal_Memory_Buffer_Inventory
--e Verify_Minimal_Main_Planar_Inventory
--e Verify_Minimal_System_Inventory
+--exclude Verify_Minimal_Memory_Buffer_Inventory
+--exclude Verify_Minimal_Main_Planar_Inventory
+--exclude Verify_Minimal_System_Inventory
 # NA test case for Witherspoon
--e io_board_Present
--e io_board_Fault
+--exclude io_board_Present
+--exclude io_board_Fault
 # System LED test cases which are NA for Witherspoon system.
--e Test_Heartbeat_LED_And_Verify_Via_REST
--e Test_Beep_LED_And_Verify_Via_REST
--e Test_Identify_LED_And_Verify_Via_REST
+--exclude Test_Heartbeat_LED_And_Verify_Via_REST
+--exclude Test_Beep_LED_And_Verify_Via_REST
+--exclude Test_Identify_LED_And_Verify_Via_REST
 # NXDMAENG UE error injection is not available in latest p9dd1ffdcv104.xlsm
--e Verify_Unrecoverable_Callout_Handling_For_NXDMAENG
+--exclude Verify_Unrecoverable_Callout_Handling_For_NXDMAENG
 # NA test case with nginx support.
--e Test_Non_SSL_Connection_To_Port_80
--e Test_Non_SSL_Connection_To_Port_443
+--exclude Test_Non_SSL_Connection_To_Port_80
+--exclude Test_Non_SSL_Connection_To_Port_443
 # MRW changes required for this to work.
--e Test_GPU_SDR_Info_At_Power_On
+--exclude Test_GPU_SDR_Info_At_Power_On
 # Core dump is disabled.
--e Verify_Core_Dump_Size
+--exclude Verify_Core_Dump_Size
 # Skip org code update.
--e Initiate_Code_Update_BMC
--e BIOS_Code_Update
--e Upload_Test
--e BMC_Code_Update
--e Host_Code_Update
--e BMC_Update_Recoverable_Error
--e Host_Update_Recoverable_Error
--e BMC_Multi_Code_Update
--e Host_Multi_Code_Update
--e Verify_IPMI_Disable_Policy_Post_BMC_Code_Update
+--exclude Initiate_Code_Update_BMC
+--exclude BIOS_Code_Update
+--exclude Upload_Test
+--exclude BMC_Code_Update
+--exclude Host_Code_Update
+--exclude BMC_Update_Recoverable_Error
+--exclude Host_Update_Recoverable_Error
+--exclude BMC_Multi_Code_Update
+--exclude Host_Multi_Code_Update
+--exclude Verify_IPMI_Disable_Policy_Post_BMC_Code_Update
 # Others NA tests.
--e Run_Keyword_Pgm
+--exclude Run_Keyword_Pgm
 # Factory reset must not run in CT.
--e Factory_Reset
--e Full_Suite_Regression
--e AC_Cycles
--e Network_Nping
+--exclude Factory_Reset
+--exclude Full_Suite_Regression
+--exclude AC_Cycles
+--exclude Network_Nping
 # Multiple runs only needed for stability.
--e Run_Multiple_Power_Cycle
--e Run_Multiple_BMC_Reset_Via_REST
--e Run_Multiple_BMC_Reset_Via_Reboot
--e General_boot_testing
--e SLP_Service_Test
--e Check_Network_Latency
+--exclude Run_Multiple_Power_Cycle
+--exclude Run_Multiple_BMC_Reset_Via_REST
+--exclude Run_Multiple_BMC_Reset_Via_Reboot
+--exclude General_boot_testing
+--exclude SLP_Service_Test
+--exclude Check_Network_Latency
 # Configure invalid IP address use cases.
--e Configure_Broadcast_IP
--e Configure_Multicast_IP
--e Configure_Loopback_IP
--e Configure_Network_ID
+--exclude Configure_Broadcast_IP
+--exclude Configure_Multicast_IP
+--exclude Configure_Loopback_IP
+--exclude Configure_Network_ID
 # Invalid gateway address configuration.
--e Configure_Broadcast_IP_For_Gateway
--e Configure_Loopback_IP_For_Gateway
--e Configure_Multicast_IP_For_Gateway
--e Configure_Network_ID_For_Gateway
--e Verify_Network_Interface_Recovery
+--exclude Configure_Broadcast_IP_For_Gateway
+--exclude Configure_Loopback_IP_For_Gateway
+--exclude Configure_Multicast_IP_For_Gateway
+--exclude Configure_Network_ID_For_Gateway
+--exclude Verify_Network_Interface_Recovery
 # Skipping RAS test cases
--e Host_RAS
+--exclude Host_RAS
 # Skip multi threading test causing XML parser failure.
--e Stress_BMC_REST_Server
--e Stress_BMC_SSH_Server
--e Stress_BMC_IPMI_Server
+--exclude Stress_BMC_REST_Server
+--exclude Stress_BMC_SSH_Server
+--exclude Stress_BMC_IPMI_Server
 # Applicable only for master build.
--e Verify_eSEL_Description_And_EntryID_Using_REST
+--exclude Verify_eSEL_Description_And_EntryID_Using_REST
 # Needs fix and improvement.
--e Test_SBE_Side_Switch
+--exclude Test_SBE_Side_Switch
 # IPMI disable and enable use cases.
--e Verify_Disabling_And_Enabling_IPMI_Via_Host
--e Verify_Disabling_IPMI_Via_OOB_IPMI
--e Verify_IPMI_Disable_Persistency_After_BMC_Reboot
+--exclude Verify_Disabling_And_Enabling_IPMI_Via_Host
+--exclude Verify_Disabling_IPMI_Via_OOB_IPMI
+--exclude Verify_IPMI_Disable_Persistency_After_BMC_Reboot
 # Remote logging
--e Verify_BMC_Journald_Contains_No_Credential_Data
+--exclude Verify_BMC_Journald_Contains_No_Credential_Data
 # Non bmcweb certificate.
--e Certificate_Test
+--exclude Certificate_Test
diff --git a/test_lists/witherspoon/regression_bucket_master b/test_lists/witherspoon/regression_bucket_master
index e468b3d..a5a463b 100644
--- a/test_lists/witherspoon/regression_bucket_master
+++ b/test_lists/witherspoon/regression_bucket_master
@@ -1,68 +1,68 @@
 # Power on and reset BMC test.
--i Verify_Redfish_Host_PowerOn
--i Verify_Redfish_Host_GracefulRestart
--i Redfish Power Off
--i Redfish_BMC_Manager_GracefulRestart_When_Host_Booted
+--include Verify_Redfish_Host_PowerOn
+--include Verify_Redfish_Host_GracefulRestart
+--include Redfish Power Off
+--include Redfish_BMC_Manager_GracefulRestart_When_Host_Booted
 # Redfish interface.
--i Redfish_Login_Via_SessionService
--i Verify_Redfish_Invalid_URL_Response_Code
--i Redfish_Login_Using_Unsecured_HTTP
--i Redfish_Login_Using_HTTPS_Wrong_Port_80_Protocol
--i Attempt_Login_With_Expired_Session
--i Login_And_Verify_HTTP_Response_Header
+--include Redfish_Login_Via_SessionService
+--include Verify_Redfish_Invalid_URL_Response_Code
+--include Redfish_Login_Using_Unsecured_HTTP
+--include Redfish_Login_Using_HTTPS_Wrong_Port_80_Protocol
+--include Attempt_Login_With_Expired_Session
+--include Login_And_Verify_HTTP_Response_Header
 # Inventory test.
--i Verify_MAC_Address_Property_Is_Populated
--i Verify_Redfish_BMC_Firmware_Version
--i Verify_AccountService_Available
--i Get_Processor_Inventory_Via_Redfish_And_Verify
--i Get_Memory_Inventory_Via_Redfish_And_Verify
--i Get_System_Serial_And_Verify_Populated
--i Get_Model_And_Verify_Populated
--i Get_Available_Power_Supplies_And_Verify
--i Get_Motherboard_Serial_And_Verify_Populated
--i Verify_UpdateService_Supports_TransferProtocol_TFTP
--i Verify_Redfish_BIOS_Version
+--include Verify_MAC_Address_Property_Is_Populated
+--include Verify_Redfish_BMC_Firmware_Version
+--include Verify_AccountService_Available
+--include Get_Processor_Inventory_Via_Redfish_And_Verify
+--include Get_Memory_Inventory_Via_Redfish_And_Verify
+--include Get_System_Serial_And_Verify_Populated
+--include Get_Model_And_Verify_Populated
+--include Get_Available_Power_Supplies_And_Verify
+--include Get_Motherboard_Serial_And_Verify_Populated
+--include Verify_UpdateService_Supports_TransferProtocol_TFTP
+--include Verify_Redfish_BIOS_Version
 # Firmware update(non-disruptive)
--i Verify_Firmware_Update_ApplyTime_Immediate
--i Verify_Firmware_Update_ApplyTime_OnReset
+--include Verify_Firmware_Update_ApplyTime_Immediate
+--include Verify_Firmware_Update_ApplyTime_OnReset
 # DateTime
--i Verify_Redfish_BMC_Time
--i Verify_Enable_NTP
+--include Verify_Redfish_BMC_Time
+--include Verify_Enable_NTP
 # Local user IPMI and Redfish test.
--i Create_Admin_Redfish_User_And_Verify_Login_Via_IPMI
--i Update_User_Password_Via_Redfish_And_Verify_Using_IPMI
--i Update_User_Privilege_Via_Redfish_And_Verify_Using_IPMI
--i Delete_User_Via_Redfish_And_Verify_Using_IPMI
--i Create_IPMI_User_And_Verify_Login_Via_Redfish
--i Verify_IPMI_User_Summary
--i Test_IPMI_User_Creation_With_Valid_Name_And_ID
--i Verify_Setting_Valid_Password_For_IPMI_User
--i Verify_IPMI_User_Deletion
--i Test_IPMI_User_Privilege_Level
--i Test_IPMI_Operator_Privilege_Level
--i Test_IPMI_Administrator_Privilege_Level
--i Test_IPMI_No_Access_Privilege_Level
--i Enable_IPMI_User_And_Verify
--i Disable_IPMI_User_And_Verify
--i Redfish_Create_and_Verify_Users
--i Verify_Login_with_Deleted_Redfish_Users
--i Verify_Modifying_User_Attributes
--i Verify_User_Account_Locked
--i Verify_Admin_User_Privilege
--i Verify_operator_User_Privilege
--i Verify_User_User_Privilege
+--include Create_Admin_Redfish_User_And_Verify_Login_Via_IPMI
+--include Update_User_Password_Via_Redfish_And_Verify_Using_IPMI
+--include Update_User_Privilege_Via_Redfish_And_Verify_Using_IPMI
+--include Delete_User_Via_Redfish_And_Verify_Using_IPMI
+--include Create_IPMI_User_And_Verify_Login_Via_Redfish
+--include Verify_IPMI_User_Summary
+--include Test_IPMI_User_Creation_With_Valid_Name_And_ID
+--include Verify_Setting_Valid_Password_For_IPMI_User
+--include Verify_IPMI_User_Deletion
+--include Test_IPMI_User_Privilege_Level
+--include Test_IPMI_Operator_Privilege_Level
+--include Test_IPMI_Administrator_Privilege_Level
+--include Test_IPMI_No_Access_Privilege_Level
+--include Enable_IPMI_User_And_Verify
+--include Disable_IPMI_User_And_Verify
+--include Redfish_Create_and_Verify_Users
+--include Verify_Login_with_Deleted_Redfish_Users
+--include Verify_Modifying_User_Attributes
+--include Verify_User_Account_Locked
+--include Verify_Admin_User_Privilege
+--include Verify_operator_User_Privilege
+--include Verify_User_User_Privilege
 # Certificate
--i Certificate_Test
+--include Certificate_Test
 # Network test cases(non-disruptive)
--i Get_IP_Address_And_Verify
--i Get_Netmask_And_Verify
--i Get_Gateway_And_Verify
--i Get_MAC_Address_And_Verify
--i Verify_All_Configured_IP_And_Netmask
--i Get_Hostname_And_Verify
--i Configure_Hostname_And_Verify
--i Add_Valid_IPv4_Address_And_Verify
--i Configure_DNS_Server_And_Verify
--i Configure_Valid_MAC_And_Verify
+--include Get_IP_Address_And_Verify
+--include Get_Netmask_And_Verify
+--include Get_Gateway_And_Verify
+--include Get_MAC_Address_And_Verify
+--include Verify_All_Configured_IP_And_Netmask
+--include Get_Hostname_And_Verify
+--include Configure_Hostname_And_Verify
+--include Add_Valid_IPv4_Address_And_Verify
+--include Configure_DNS_Server_And_Verify
+--include Configure_Valid_MAC_And_Verify
 # Remote Logging
--i Test_Remote_Logging_Configuration
+--include Test_Remote_Logging_Configuration
diff --git a/test_lists/witherspoon/skip_inband_ipmi b/test_lists/witherspoon/skip_inband_ipmi
index 2ce4553..6af4437 100755
--- a/test_lists/witherspoon/skip_inband_ipmi
+++ b/test_lists/witherspoon/skip_inband_ipmi
@@ -1,5 +1,5 @@
 #Skipping inband IPMI test cases to run all out-of-band IPMI test cases
--e Verify_Disabling_And_Enabling_IPMI_Via_Host
--e Verify_Disabling_IPMI_Via_OOB_IPMI
--e Verify_IPMI_Disable_Persistency_After_BMC_Reboot
--e eSEL_Logging
+--exclude Verify_Disabling_And_Enabling_IPMI_Via_Host
+--exclude Verify_Disabling_IPMI_Via_OOB_IPMI
+--exclude Verify_IPMI_Disable_Persistency_After_BMC_Reboot
+--exclude eSEL_Logging
diff --git a/test_lists/witherspoon/skip_oob_ipmi b/test_lists/witherspoon/skip_oob_ipmi
index 650b7c3..23947df 100755
--- a/test_lists/witherspoon/skip_oob_ipmi
+++ b/test_lists/witherspoon/skip_oob_ipmi
@@ -1,5 +1,5 @@
 #Skipping out-of-band IPMI test cases to run all inband IPMI test cases
--e Verify_Disabling_And_Enabling_IPMI_Via_Host
--e Verify_Disabling_IPMI_Via_OOB_IPMI
--e Verify_IPMI_Disable_Persistency_After_BMC_Reboot
--e SOL_Test
+--exclude Verify_Disabling_And_Enabling_IPMI_Via_Host
+--exclude Verify_Disabling_IPMI_Via_OOB_IPMI
+--exclude Verify_IPMI_Disable_Persistency_After_BMC_Reboot
+--exclude SOL_Test