diff --git a/tests/Voltha_PODTests.robot b/tests/Voltha_PODTests.robot
index d73437d..8f14c99 100644
--- a/tests/Voltha_PODTests.robot
+++ b/tests/Voltha_PODTests.robot
@@ -24,7 +24,7 @@
 Library           RequestsLibrary
 Library           ../../voltha/tests/atests/common/testCaseUtils.py
 Resource          ../../cord-tester/src/test/cord-api/Framework/Subscriber.robot
-Resource          ../../cord-tester/src/test/cord-api/Framework/Voltha_OLT.robot
+Resource          ../../cord-tester/src/test/cord-api/Framework/OLT.robot
 Resource          ../../cord-tester/src/test/cord-api/Framework/DHCP.robot
 Resource          ../../cord-tester/src/test/cord-api/Framework/Kubernetes.robot
 Resource          ../libraries/onos.robot
@@ -105,14 +105,14 @@
 
 Setup
     #create/preprovision device
-    #${olt_device_id}=    Create Device    ${olt_ip}    ${OLT_PORT}
-    #Set Suite Variable    ${olt_device_id}
+    ${olt_device_id}=    Create Device    ${olt_ip}    ${OLT_PORT}
+    Set Suite Variable    ${olt_device_id}
     #enable device
-    #Enable Device    ${olt_device_id}
+    Enable Device    ${olt_device_id}
     #validate olt states
     Wait Until Keyword Succeeds    60s    5s    Validate Device    ${olt_serial_number}    ENABLED    ACTIVE    REACHABLE
     #validate onu states
-    #Wait Until Keyword Succeeds    60s    5s    Validate Device    ${onu_serial_number}    ENABLED    ACTIVE    REACHABLE    onu=True    onu_reason=tech-profile-config-download-success
+    Wait Until Keyword Succeeds    60s    5s    Validate Device    ${onu_serial_number}    ENABLED    ACTIVE    REACHABLE    onu=True    onu_reason=tech-profile-config-download-success
     #get onu device id
     ${onu_device_id}=    Get Device ID From SN    ${onu_serial_number}
     Set Suite Variable    ${onu_device_id}
@@ -123,7 +123,7 @@
     [Documentation]    kills processes and cleans up interfaces on src+dst servers
     Get Device Output from Voltha    ${of_id}
     Get Logical Device Output from Voltha    ${logical_id}
-    Get ONOS Command output    ${k8s_node_ip}
+    Get ONOS Status    ${k8s_node_ip}
     Clean Up Linux
     Log Kubernetes Containers Logs Since Time    ${datetime}    ${container_list}