diff --git a/Jenkinsfile-voltha-build b/Jenkinsfile-voltha-build
index 3f25e40..04bb1a3 100644
--- a/Jenkinsfile-voltha-build
+++ b/Jenkinsfile-voltha-build
@@ -120,11 +120,10 @@
             if ( params.configurePod ) {
                 stage('Configure ONOS Netcfg') {
                     timeout(1) {
-                        waitUntil {
                             sh returnStdout: true, script: """
-                            curl -w '\n%{http_code}' --fail -sSL --user karaf:karaf -X POST -H Content-Type:application/json http://${deployment_config.nodes[0].ip}:30120/onos/v1/network/configuration --data @voltha-system-tests/tests/data/${configFileName}-onos-netcfg.json
+                            curl -sSL --user karaf:karaf -X POST -H Content-Type:application/json http://${deployment_config.nodes[0].ip}:30120/onos/v1/network/configuration --data @$WORKSPACE/voltha-system-tests/tests/data/${configFileName}-onos-netcfg.json
+                            curl -sSL --user karaf:karaf -X POST http://${deployment_config.nodes[0].ip}:30120/onos/v1/applications/org.onosproject.segmentrouting/active
                             """
-                        }
                     }
                 }
                 stage('Push Tech-Profile') {
diff --git a/libraries/onos.robot b/libraries/onos.robot
index 31e1c8a..8ec81db 100644
--- a/libraries/onos.robot
+++ b/libraries/onos.robot
@@ -48,7 +48,7 @@
     \    ${sn}=    Get From Dictionary    ${value}    serial
     \    ${of_id}=    Get From Dictionary    ${value}    id
     Should Be Equal As Strings    ${sn}    ${serial_number}
-    Set Suite Variable    ${of_id}
+    [Return]    ${of_id}
 
 Verify Eapol Flows Added
     [Arguments]    ${ip}    ${port}    ${expected_flows}
@@ -59,11 +59,13 @@
 Verify Number of AAA-Users
     [Arguments]    ${ip}    ${port}    ${expected_onus}
     [Documentation]    Matches for number of aaa-users authorized based on number of onus
+    ##TODO: filter by onu serial number instead of count
     ${aaa_users}=    Execute ONOS Command    ${ip}    ${port}    aaa-users | grep AUTHORIZED | wc -l
     Should Contain    ${aaa_users}    ${expected_onus}
 
 Validate DHCP Allocations
     [Arguments]    ${ip}    ${port}    ${expected_onus}
     [Documentation]    Matches for number of dhcpacks based on number of onus
+    ##TODO: filter by onu serial number instead of count
     ${allocations}=    Execute ONOS Command    ${ip}    ${port}    dhcpl2relay-allocations | grep DHCPACK | wc -l
     Should Contain    ${allocations}    ${expected_onus}
\ No newline at end of file
diff --git a/tests/sanity/sanity.robot b/tests/sanity/sanity.robot
index 819b91a..e6e76d1 100644
--- a/tests/sanity/sanity.robot
+++ b/tests/sanity/sanity.robot
@@ -52,7 +52,7 @@
 Validate OLT Connected to ONOS
     [Documentation]    Verifies the BBSIM-OLT device is activated in onos
     [Tags]    sanity
-    Wait Until Keyword Succeeds    ${timeout}    5s    Validate OLT Device in ONOS    ${BBSIM_OLT_SN}
+    ${of_id}=    Wait Until Keyword Succeeds    ${timeout}    5s    Validate OLT Device in ONOS    ${BBSIM_OLT_SN}
 
 Check EAPOL Flows in ONOS
     [Documentation]    Validates eapol flows for the onu are pushed from voltha