diff --git a/src/test/cord-api/Tests/targets/xoslibrary.xtarget b/src/test/cord-api/Tests/targets/xoslibrary.xtarget
index 7b903ab..2f80bd1 100644
--- a/src/test/cord-api/Tests/targets/xoslibrary.xtarget
+++ b/src/test/cord-api/Tests/targets/xoslibrary.xtarget
@@ -106,12 +106,13 @@
     ${json_{{ m.name | lower}}_updated_1}=    Set Json Value    ${json_{{ m.name | lower }}_updated_1}    /name    "${json_{{ m.name | lower}}_name_updated_1}"
     {% endif %}
     {% if  m.name  == "RCORDSubscriber" -%}
+    ## Create req objects for subscriber (voltservice -> oltdevice -> ponport -> onudevice)
+    CORD Post    /xosapi/v1/volt/voltservices    {"name": "testvoltservice123"}
+    CORD Post    /xosapi/v1/volt/oltdevices    {"volt_service_id": ${id}, "uplink": "testoltdevice123"}
+    CORD Post    /xosapi/v1/volt/ponports    {"s_tag": "1234", "olt_device_id": ${id}, "port_no": "123", "name": "testponport123"}
     ${json_{{ m.name | lower}}_onudevice}=    Set Variable    onudevice123
     ${json_{{ m.name | lower}}_1}=    Set Json Value    ${json_{{ m.name | lower }}_1}    /onu_device    "${json_{{ m.name | lower}}_onudevice}"
-    ${json_{{ m.name | lower}}_onudevice_updated_1}=    Set Variable    onudevice1234
-    ${json_{{ m.name | lower}}_updated_1}=    Set Json Value    ${json_{{ m.name | lower }}_updated_1}    /onu_device    "${json_{{ m.name | lower}}_onudevice_updated_1}"
-    CORD Post    /xosapi/v1/volt/onudevices    {"serial_number": "onudevice123", "pon_port_id": 1, "vendor": "abcdefg"}
-    CORD Post    /xosapi/v1/volt/onudevices    {"serial_number": "onudevice1234", "pon_port_id": 2, "vendor": "zzcdefg"}
+    CORD Post    /xosapi/v1/volt/onudevices    {"serial_number": "onudevice123", "pon_port_id": ${id}, "vendor": "abcdefg"}
     {% endif %}
     ${json_{{ m.name | lower }}_1}=     To JSON    ${json_{{ m.name | lower }}_1}
     ${json_{{ m.name | lower }}_updated_1}=     To JSON    ${json_{{ m.name | lower }}_updated_1}
@@ -190,5 +191,4 @@
     \    Run Keyword And Ignore Error    CORD Delete    /xosapi/v1/{{ xproto_unquote(m.options.app_label) }}/${dependent_{{ m.name | lower }}_ids[0]}    ${dependent_{{ m.name | lower }}_ids[${INDEX}]}
     {% endif -%}
     {% endfor -%}
-    Delete All Sessions
-
+    Delete All Sessions
\ No newline at end of file