diff --git a/src/test/cord-api/Tests/BBSim/BBSIMScale.robot b/src/test/cord-api/Tests/BBSim/BBSIMScale.robot
index b93cad4..a511cf6 100644
--- a/src/test/cord-api/Tests/BBSim/BBSIMScale.robot
+++ b/src/test/cord-api/Tests/BBSim/BBSIMScale.robot
@@ -35,7 +35,7 @@
 *** Variables ***
 ${number_of_onus}    16
 ${timeout}           300s
-${olt_sn}            bbsim.voltha.svc:50060
+${olt_sn}             bbsim.voltha.svc:50060
 
 *** Test Cases ***
 Create Subscriber and Whitelist for ONUs
@@ -44,13 +44,13 @@
     ${att_workflow_service_id}=    Get Service Owner Id    ${ATT_SERVICE}
     ${volt_service_id}=    Get Service Owner Id    ${VOLT_SERVICE}
     ${rcord_service_id}=    Get Service Owner Id    /xosapi/v1/rcord/rcordservices
-    CORD Post    ${VOLT_DEVICE}    {'device_type': 'openolt', 'host': 'bbsim.voltha.svc', 'port': 50060, 'switch_datapath_id': 'of:0000000000000002', 'switch_port': '3', 'outer_tpid': '0x8100', 'uplink': '65536', 'nas_id': 'NAS_ID', 'serial_number': '${olt_sn}', 'volt_service_id': ${volt_service_id}}
     @{subscribers}=    Generate Subscribers    ${number_of_onus}    ${rcord_service_id}
     : FOR    ${subscriber}    IN    @{subscribers}
     \    CORD Post    ${VOLT_SUBSCRIBER}    ${subscriber}
     @{whitelists}=    Generate Whitelists    ${number_of_onus}    ${att_workflow_service_id}
     : FOR    ${whitelist}    IN    @{whitelists}
     \    CORD Post    ${ATT_WHITELIST}    ${whitelist}
+    CORD Post    ${VOLT_DEVICE}    {'device_type': 'openolt', 'host': 'bbsim.voltha.svc', 'port': 50060, 'switch_datapath_id': 'of:0000000000000002', 'switch_port': '3', 'outer_tpid': '0x8100', 'uplink': '65536', 'nas_id': 'NAS_ID', 'serial_number': '${olt_sn}', 'volt_service_id': ${volt_service_id}}
 
 Validate ONUs in VOLTHA
     [Documentation]    Verify number of onus that appear in voltha and its states
@@ -60,8 +60,8 @@
 Validate OLT and AAA-Users in ONOS
     [Documentation]    Verify olt devices in ONOS and all onus are authenticated via AAA app
     [Tags]    onos
-    Wait Until Keyword Succeeds    ${timeout}    5s    OLT Device in ONOS
-    Wait Until Keyword Succeeds    ${timeout}    5s    Verify Number of AAA-Users    ${number_of_onus}
+    Wait Until Keyword Succeeds    3s    1s    OLT Device in ONOS
+    #Wait Until Keyword Succeeds    ${timeout}    5s    Verify Number of AAA-Users    ${number_of_onus}
 
 Validate ONUs in XOS
     [Documentation]    Validates All ONU Devices are discovered in XOS
@@ -77,8 +77,8 @@
 Validate Hosts and DHCP Allocations in ONOS
     [Documentation]    Verify number of hosts in ONOS match number of onus and verify number of DHCP allocations
     [Tags]    onosdhcp
+    Wait Until Keyword Succeeds    ${timeout}    5s    Validate Hosts in ONOS    ${number_of_onus}
     Wait Until Keyword Succeeds    ${timeout}    5s    Validate DHCP Allocations    ${number_of_onus}
-    #Wait Until Keyword Succeeds    ${timeout}    5s    Validate Hosts in ONOS    ${number_of_onus}
 
 Validate ATT WF Driver SIs
     [Documentation]    Validates all service instances per onu devices become "approved" and "dhcpdiscovered"