diff --git a/libraries/onos.robot b/libraries/onos.robot
index fefa21a..4e68927 100755
--- a/libraries/onos.robot
+++ b/libraries/onos.robot
@@ -349,6 +349,7 @@
 Get Bandwidth Profile Details Rest
     [Arguments]    ${bw_profile_id}
     [Documentation]    Retrieves the details of the given bandwidth profile using REST API
+    ${bw_profile_id}=    Remove String    ${bw_profile_id}    '    "
     ${resp}=    Get Request    ONOS    onos/sadis/bandwidthprofile/${bw_profile_id}
     ${jsondata}=    To Json    ${resp.content}
     Should Not Be Empty    ${jsondata['entry']}
@@ -735,8 +736,8 @@
     [Arguments]    ${bandwidth_profile_name}
     [Documentation]    Collects the bandwidth profile details for the given bandwidth profile and
     ...    returns the limiting bandwidth
-    ${cir}    ${cbs}    ${eir}    ${ebs}    ${air}    Get Bandwidth Profile Details
-    ...    ${ONOS_SSH_IP}    ${ONOS_SSH_PORT}    ${bandwidth_profile_name}
+    ${cir}    ${cbs}    ${eir}    ${ebs}    ${air}=    Get Bandwidth Profile Details Rest
+    ...    ${bandwidth_profile_name}
     ${limiting_BW}=    Evaluate    ${eir}+${cir}+${air}
     [Return]    ${limiting_BW}
 
diff --git a/tests/data/flex-ocp-cord-sadis-TT.json b/tests/data/flex-ocp-cord-sadis-TT.json
index 906dc18..2baa675 100644
--- a/tests/data/flex-ocp-cord-sadis-TT.json
+++ b/tests/data/flex-ocp-cord-sadis-TT.json
@@ -61,39 +61,39 @@
           "air" : 9000000
         }, {
           "id" : "TCONT_TYPE1_200Mbps_Fixed_ForVOIP",
-          "pir" : 0,
-          "pbs" : 0,
+          "eir" : 0,
+          "ebs" : 0,
           "cir" : 0,
           "cbs" : 0,
-          "gir" : 200000
+          "air" : 200000
         }, {
           "id" : "TCONT_TYPE2_500Mbps_Assured_ForVoD",
-          "pir" : 500000,
-          "pbs" : 10000,
+          "eir" : 0,
+          "ebs" : 0,
           "cir" : 500000,
           "cbs" : 10000,
-          "gir" : 0
+          "air" : 0
         }, {
           "id" : "TCONT_TYPE3_700Mbps_Peak_500Mbps_Assured_ForVoD",
-          "pir" : 700000,
-          "pbs" : 10000,
+          "eir" : 200000,
+          "ebs" : 10000,
           "cir" : 500000,
           "cbs" : 10000,
-          "gir" : 0
+          "air" : 0
         }, {
           "id" : "TCONT_TYPE4_1Gbps_Peak_User1_HSI_Upstream",
-          "pir" : 1000000,
-          "pbs" : 10000,
+          "eir" : 1000000,
+          "ebs" : 10000,
           "cir" : 0,
           "cbs" : 0,
-          "gir" : 0
+          "air" : 0
         }, {
           "id" : "TCONT_TYPE5_1Gbps_Peak_500Mbps_Assured_200Mbps_Fixed_User1_HSI_Upstream",
-          "pir" : 1000000,
-          "pbs" : 10000,
+          "eir" : 300000,
+          "ebs" : 10000,
           "cir" : 500000,
           "cbs" : 10000,
-          "gir" : 200000
+          "air" : 200000
         } ]
       },
       "sadis" : {
diff --git a/tests/tt-workflow/Voltha_TT_MultiTcontTests.robot b/tests/tt-workflow/Voltha_TT_MultiTcontTests.robot
index 6ca11d4..2166a6d 100755
--- a/tests/tt-workflow/Voltha_TT_MultiTcontTests.robot
+++ b/tests/tt-workflow/Voltha_TT_MultiTcontTests.robot
@@ -59,9 +59,9 @@
 ${lower_margin_pct}      90      # Allow 10% under the limit
 
 *** Test Cases ***
-Test that the BW is limited to GIR
+Test that the BW is limited to Limiting Bandwidth
     [Documentation]    Verify support for Tcont type 1.
-    ...    Verify that traffic is limited to GIR configured for the service/onu.
+    ...    Verify that traffic is limited to Limiting Bandwidth (eir+cir+air) configured for the service/onu.
     ...    Pump 500Mbps in the upstream from RG and verify that the received traffic is only 200Mbps at the BNG.
     ...    Note: Currently, only Flex Pod supports the deployment configuration required to test this scenario.
     [Tags]    functionalTT    VOL-4093
@@ -84,15 +84,14 @@
     ${stdout}    ${stderr}    ${rc}=    Execute Remote Command    which iperf3 jq
     ...    ${src['ip']}    ${src['user']}    ${src['pass']}    ${src['container_type']}    ${src['container_name']}
     Pass Execution If    ${rc} != 0    Skipping test: iperf3 / jq not found on the RG
-    ${us_cir}    ${us_cbs}    ${us_pir}    ${us_pbs}    ${us_gir}=    Get Bandwidth Profile Details Ietf Rest
-    ...    ${test_us_bw_profile}
+    ${limiting_bw_value_upstream}=    Get Limiting Bandwidth Details    ${test_us_bw_profile}
     # Stream UDP packets from RG to server
     ${updict}=    Run Iperf3 Test Client    ${src}    server=${dst['dp_iface_ip_qinq']}
     ...    args=-u -b 500M -t 30 -p 5201
     # With UDP test, bits per second is the sending rate.  Multiply by the loss rate to get the throughput.
     ${actual_upstream_bw_used}=    Evaluate
     ...    (100 - ${updict['end']['sum']['lost_percent']})*${updict['end']['sum']['bits_per_second']}/100000
-    ${pct_limit_up}=    Evaluate    100*${actual_upstream_bw_used}/${us_gir}
+    ${pct_limit_up}=    Evaluate    100*${actual_upstream_bw_used}/${limiting_bw_value_upstream}
     Should Be True    ${pct_limit_up} >= ${lower_margin_pct}
     ...    The upstream bandwidth guarantee was not met (${pct_limit_up}% of resv)