diff --git a/src/test/cord-api/Tests/targets/xoslibrary.xtarget b/src/test/cord-api/Tests/targets/xoslibrary.xtarget
index 478c39c..f052731 100644
--- a/src/test/cord-api/Tests/targets/xoslibrary.xtarget
+++ b/src/test/cord-api/Tests/targets/xoslibrary.xtarget
@@ -87,7 +87,7 @@
     {% elif f.name == "flavor" -%}
     ${json_{{ m.name | lower}}_{{ f.name }}_1}=    Generate Random Value    flavor
     ${json_{{ m.name | lower }}_1}=    Set Json Value    ${json_{{ m.name | lower }}_1}    /{{ f.name }}    "${json_{{ m.name | lower }}_{{ f.name }}_1}"
-    {% elif f.name == "s_tag" -%}
+    {% elif f.name == "s_tag" and m.name == "BNGPortMapping" -%}
     ${json_{{ m.name | lower}}_{{ f.name }}_1}=    Generate Random Value    vlan_tag
     ${json_{{ m.name | lower}}_1}=    Set Json Value    ${json_{{ m.name | lower }}_1}    /{{ f.name }}    "${json_{{ m.name | lower}}_{{ f.name }}_1}"    
     {% else -%}
@@ -193,7 +193,7 @@
     {% elif f.name == "flavor" -%}
     ${json_{{ m.name | lower}}_{{ f.name }}_tmp}=    Generate Random Value    flavor
     ${json_{{ m.name | lower}}_tmp}=    Set Json Value    ${json_{{ m.name | lower }}_tmp}    /{{ f.name }}    "${json_{{ m.name | lower}}_{{ f.name }}_tmp}"
-    {% elif f.name == "s_tag" -%}
+    {% elif f.name == "s_tag" and m.name == "BNGPortMapping" -%}
     ${json_{{ m.name | lower}}_{{ f.name }}_tmp}=    Generate Random Value    vlan_tag
     ${json_{{ m.name | lower}}_tmp}=    Set Json Value    ${json_{{ m.name | lower }}_tmp}    /{{ f.name }}    "${json_{{ m.name | lower}}_{{ f.name }}_tmp}"
     {% else -%}