diff --git a/ipmi/test_ipmi_disable.robot b/ipmi/test_ipmi_disable.robot
index d19073c..6fd02bb 100644
--- a/ipmi/test_ipmi_disable.robot
+++ b/ipmi/test_ipmi_disable.robot
@@ -36,7 +36,8 @@
     ...  AND  Run Inband IPMI Standard Command  lan set ${CHANNEL_NUMBER} access on
 
     # Disable IPMI via OOB IPMI and verify
-    ${resp}=  Run Keyword and Ignore Error  Run External IPMI Standard Command  lan set ${CHANNEL_NUMBER} access off
+    ${resp}=  Run Keyword and Ignore Error
+    ...  Run External IPMI Standard Command  lan set ${CHANNEL_NUMBER} access off
     Should Contain any  ${resp}  ${EMPTY}  Set Channel Access for channel ${CHANNEL_NUMBER} was successful.
     Run Keyword and Expect Error  *Unable to establish IPMI*
     ...  Run External IPMI Standard Command  lan print ${CHANNEL_NUMBER}
diff --git a/ipmi/test_ipmi_systeminfo_parameters.robot b/ipmi/test_ipmi_systeminfo_parameters.robot
index b626b6b..0e6b3a2 100644
--- a/ipmi/test_ipmi_systeminfo_parameters.robot
+++ b/ipmi/test_ipmi_systeminfo_parameters.robot
@@ -265,7 +265,8 @@
 
     # Check if the Get System Info Parameter for param 3 - Primary OS Name throws
     # error for invalid request data.
-    Run Keyword and Expect Error  *${IPMI_RAW_CMD['System_Info']['param3_Primary_Operating_System_Name']['Get'][1]}*
+    Run Keyword and Expect Error
+    ...  *${IPMI_RAW_CMD['System_Info']['param3_Primary_Operating_System_Name']['Get'][1]}*
     ...  Run IPMI Command
     ...  ${IPMI_RAW_CMD['System_Info']['param3_Primary_Operating_System_Name']['Get'][0]} 0x00
 
@@ -286,7 +287,8 @@
 
     # Check if the Set System Info Parameter for param 3 - Primary OS Name throws error
     # for invalid data request.
-    Run Keyword and Expect Error  *${IPMI_RAW_CMD['System_Info']['param3_Primary_Operating_System_Name']['Set'][1]}*
+    Run Keyword and Expect Error
+    ...  *${IPMI_RAW_CMD['System_Info']['param3_Primary_Operating_System_Name']['Set'][1]}*
     ...  Run IPMI Command
     ...  ${IPMI_RAW_CMD['System_Info']['param3_Primary_Operating_System_Name']['Set'][0]} ${os_name}
 
diff --git a/snmp/test_bmc_snmp_config.robot b/redfish/events/test_bmc_snmp_config.robot
similarity index 96%
rename from snmp/test_bmc_snmp_config.robot
rename to redfish/events/test_bmc_snmp_config.robot
index 1329b03..377567b 100644
--- a/snmp/test_bmc_snmp_config.robot
+++ b/redfish/events/test_bmc_snmp_config.robot
@@ -3,17 +3,17 @@
 ...            configured and installed. For download, installation and
 ...            configuration refer http://www.net-snmp.org/.
 
-Resource  ../lib/snmp/resource.robot
-Resource  ../lib/snmp/snmp_utils.robot
-Resource  ../lib/openbmc_ffdc.robot
-Resource  ../lib/logging_utils.robot
+Resource        ../../lib/snmp/resource.robot
+Resource        ../../lib/snmp/snmp_utils.robot
+Resource        ../../lib/openbmc_ffdc.robot
+Resource        ../../lib/logging_utils.robot
 
-Library  String
-Library  SSHLibrary
+Library         String
+Library         SSHLibrary
 
-Test Teardown  FFDC On Test Case Fail
+Test Teardown   FFDC On Test Case Fail
 
-Force Tags     BMC_SNMP_Config
+Force Tags      BMC_SNMP_Config
 
 *** Variables ***