diff --git a/tests/atests/robot/voltha_automated_test_suite.robot b/tests/atests/robot/voltha_automated_test_suite.robot
index 0ac9ae4..68cd305 100755
--- a/tests/atests/robot/voltha_automated_test_suite.robot
+++ b/tests/atests/robot/voltha_automated_test_suite.robot
@@ -20,6 +20,7 @@
 Library           ../common/preprovisioning.py
 Library           volthaMngr.VolthaMngr
 Library           preprovisioning.Preprovisioning
+
 Test Setup        Start Voltha      
 Test Teardown     Stop Voltha
 
@@ -27,11 +28,11 @@
 ${LOG_DIR}        /tmp/voltha_test_results
 ${ROOT_DIR}       ${EMPTY}
 ${VOLTHA_DIR}     ${EMPTY}
-${PONSIM_PID}     ${EMPTY}
 ${ONOS_SSH_PORT}  8101
 ${OLT_IP_ADDR}    olt.voltha.svc
 ${OLT_PORT_ID}    50060
-
+${OLT_TYPE}       ponsim_olt
+${ONU_TYPE}       ponsim_onu
 
 *** Test Cases ***
 Provisioning
@@ -41,12 +42,16 @@
     ...                 information. It then verifies that all the physical and logical devices are ACTIVE
     ...                 and REACHEABLE
     PSet Log Dirs    ${LOG_DIR}
-    Configure   ${OLT_IP_ADDR}    ${OLT_PORT_ID}
+    Configure   ${OLT_IP_ADDR}    ${OLT_PORT_ID}    ${OLT_TYPE}    ${ONU_TYPE} 
     Preprovision Olt
-    Wait Until Keyword Succeeds    60s    2s    Query Devices Before Enable
+    Wait Until Keyword Succeeds    60s    2s    Query Devices Before Enabling
+    Status Should Be Success After Preprovision Command
+    Check Olt Fields Before Enabling
     Enable
-    Wait Until Keyword Succeeds    60s    2s    Query Devices After Enable
-
+    Wait Until Keyword Succeeds    60s    2s    Query Devices After Enabling
+    Status Should Be Success After Enable Command
+    Check Olt Fields After Enabling
+    Check Onu Fields After Enabling
 
 *** Keywords ***
 Start Voltha