diff --git a/libraries/utils.robot b/libraries/utils.robot
index 8001b1d..8ddbbe9 100644
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -240,7 +240,7 @@
     ...    Validate OLT Device    PREPROVISIONED    UNKNOWN    UNKNOWN    ${EMPTY}    ${olt_device_id}
     Sleep    5s
     Enable Device    ${olt_device_id}
-    Wait Until Keyword Succeeds    ${timeout}    5s
+    Wait Until Keyword Succeeds    180s    5s
     ...    Validate OLT Device    ENABLED    ACTIVE    REACHABLE    ${olt_serial_number}
     ${logical_id}=    Get Logical Device ID From SN    ${olt_serial_number}
     Set Suite Variable    ${logical_id}
@@ -253,8 +253,8 @@
     Delete Devices In Voltha    Root=true
     Wait Until Keyword Succeeds    ${timeout}    2s    Test Empty Device List
     # Clear devices from ONOS
-    Remove All Devices From ONOS
-    ...    http://karaf:karaf@${k8s_node_ip}:${ONOS_REST_PORT}
+    #Remove All Devices From ONOS
+    #...    http://karaf:karaf@${k8s_node_ip}:${ONOS_REST_PORT}
 
 Teardown
     [Documentation]    kills processes and cleans up interfaces on src+dst servers
@@ -386,6 +386,15 @@
         ...    ${dst['container_type']}    ${dst['container_name']}
     END
 
+Clean WPA Process
+    [Documentation]    Kills wpa_supplicant processes only for all RGs
+    FOR    ${I}    IN RANGE    0    ${num_onus}
+        ${src}=    Set Variable    ${hosts.src[${I}]}
+        ${dst}=    Set Variable    ${hosts.dst[${I}]}
+        Run Keyword And Ignore Error    Kill Linux Process    [w]pa_supplicant    ${src['ip']}
+        ...    ${src['user']}    ${src['pass']}    ${src['container_type']}    ${src['container_name']}
+    END
+
 Should Be Larger Than
     [Documentation]    Verify that value_1 is > value_2
     [Arguments]    ${value_1}    ${value_2}