diff --git a/lib/bmc_network_utils.robot b/lib/bmc_network_utils.robot
new file mode 100644
index 0000000..3ea269f
--- /dev/null
+++ b/lib/bmc_network_utils.robot
@@ -0,0 +1,43 @@
+*** Settings ***
+Resource                ../lib/utils.robot
+Resource                ../lib/connection_client.robot
+Resource                ../lib/boot_utils.robot
+
+*** Variables ***
+# MAC input from user.
+${MAC_ADDRESS}          ${EMPTY}
+
+
+*** Keywords ***
+
+###############################################################################
+Check And Reset MAC
+    [Documentation]  Update BMC with user input MAC address.
+    [Arguments]  ${mac_address}=${MAC_ADDRESS}
+
+    # Description of argument(s):
+    # mac_address  The mac address (e.g. 00:01:6c:80:02:28).
+
+    Should Not Be Empty  ${mac_address}
+    Open Connection And Log In
+    ${bmc_mac_addr}=  Execute Command On BMC  cat /sys/class/net/eth0/address
+    Run Keyword If  '${mac_address.lower()}' != '${bmc_mac_addr.lower()}'
+    ...  Set MAC Address
+
+###############################################################################
+
+
+###############################################################################
+Set MAC Address
+    [Documentation]  Update eth0 with input MAC address.
+    [Arguments]  ${mac_address}=${MAC_ADDRESS}
+
+    # Description of argument(s):
+    # mac_address  The mac address (e.g. 00:01:6c:80:02:28).
+
+    Write  fw_setenv ethaddr ${mac_address}
+    OBMC Reboot (off)
+    ${bmc_mac_addr}=  Execute Command On BMC  cat /sys/class/net/eth0/address
+    Should Be Equal  ${bmc_mac_addr}  ${mac_address}  ignore_case=True
+
+###############################################################################
diff --git a/lib/utils.robot b/lib/utils.robot
index d558847..569edb3 100755
--- a/lib/utils.robot
+++ b/lib/utils.robot
@@ -2,7 +2,6 @@
 Resource                ../lib/resource.txt
 Resource                ../lib/rest_client.robot
 Resource                ../lib/connection_client.robot
-Resource                ../extended/obmc_boot_test_resource.robot
 Library                 DateTime
 Library                 Process
 Library                 OperatingSystem
@@ -36,8 +35,6 @@
 ${BOOT_COUNT}    ${0}
 ${count}  ${0}
 ${devicetree_base}  /sys/firmware/devicetree/base/model
-# MAC input from user.
-${MAC_ADDRESS}  ${EMPTY}
 
 # Initialize default debug value to 0.
 ${DEBUG}         ${0}
@@ -934,30 +931,6 @@
     # Set BOOT_TIME variable to current boot time.
     Set Global Variable  ${BOOT_COUNT}  ${count}
 
-Check And Reset MAC
-    [Documentation]  Update BMC with user input MAC address.
-    [Arguments]  ${mac_address}=${MAC_ADDRESS}
-
-    # Description of argument(s):
-    # mac_address  The mac address (e.g. 00:01:6c:80:02:28).
-
-    Should Not Be Empty  ${mac_address}
-    Open Connection And Log In
-    ${bmc_mac_addr}=  Execute Command On BMC  cat /sys/class/net/eth0/address
-    Run Keyword If  '${mac_address}' != '${bmc_mac_addr}'
-    ...  Set MAC Address
-
-Set MAC Address
-    [Documentation]  Update eth0 with input MAC address.
-    [Arguments]  ${mac_address}=${MAC_ADDRESS}
-
-    # Description of argument(s):
-    # mac_address  The mac address (e.g. 00:01:6c:80:02:28).
-    Write  fw_setenv ethaddr ${mac_address}
-    Run Key U  OBMC Boot Test \ OBMC Reboot (off)
-    ${bmc_mac_addr}=  Execute Command On BMC  cat /sys/class/net/eth0/address
-    Should Be Equal  ${bmc_mac_addr}  ${mac_address}
-
 ###############################################################################
 Delete Error logs
     [Documentation]  Delete error logs.