diff --git a/tests/features/Vendor Extensibility/vendor_extensibility.robot b/tests/features/Vendor Extensibility/vendor_extensibility.robot
index 583b3ee1e4c0199c03dd2eb721425811f3bd69d8..b14dc71996b805d55ec5ae038ed1613f12bd50f4 100644
--- a/tests/features/Vendor Extensibility/vendor_extensibility.robot	
+++ b/tests/features/Vendor Extensibility/vendor_extensibility.robot	
@@ -16,8 +16,8 @@ ${API_INVOKER_NOT_REGISTERED}       not-valid
 *** Test Cases ***
 Published API with vendor extensibility
     [Tags]    vendor_extensibility-1
-    ${vendor_specific_service_api_key}=   Set Variable   vendorSpecific-urn:etsi:mec:capifext:service-info
-    ${vendor_specific_aef_profile_key}=   Set Variable   vendorSpecific-urn:etsi:mec:capifext:transport-info
+    ${vendor_specific_service_api_key}=    Set Variable    vendorSpecific-urn:etsi:mec:capifext:service-info
+    ${vendor_specific_aef_profile_key}=    Set Variable    vendorSpecific-urn:etsi:mec:capifext:transport-info
     # Register APF
     ${register_user_info}=    Provider Default Registration
 
@@ -35,7 +35,9 @@ Published API with vendor extensibility
     ...    vendor_specific_aef_profile=${vendor_specific_aef_profile}
 
     Dictionary Should Contain Key    ${service_api_description_published}    ${vendor_specific_service_api_key}
-    Dictionary Should Contain Key    ${service_api_description_published['aefProfiles'][0]}    ${vendor_specific_aef_profile_key}
+    Dictionary Should Contain Key
+    ...    ${service_api_description_published['aefProfiles'][0]}
+    ...    ${vendor_specific_aef_profile_key}
 
     # Default Invoker Registration and Onboarding
     ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
@@ -57,8 +59,8 @@ Published API with vendor extensibility
 
 Published API with vendor extensibility and discover with VendSpecQueryParams disabled
     [Tags]    vendor_extensibility-2
-    ${vendor_specific_service_api_key}=   Set Variable   vendorSpecific-urn:etsi:mec:capifext:service-info
-    ${vendor_specific_aef_profile_key}=   Set Variable   vendorSpecific-urn:etsi:mec:capifext:transport-info
+    ${vendor_specific_service_api_key}=    Set Variable    vendorSpecific-urn:etsi:mec:capifext:service-info
+    ${vendor_specific_aef_profile_key}=    Set Variable    vendorSpecific-urn:etsi:mec:capifext:transport-info
     # Register APF
     ${register_user_info}=    Provider Default Registration
 
@@ -76,7 +78,9 @@ Published API with vendor extensibility and discover with VendSpecQueryParams di
     ...    vendor_specific_aef_profile=${vendor_specific_aef_profile}
 
     Dictionary Should Contain Key    ${service_api_description_published}    ${vendor_specific_service_api_key}
-    Dictionary Should Contain Key    ${service_api_description_published['aefProfiles'][0]}    ${vendor_specific_aef_profile_key}
+    Dictionary Should Contain Key
+    ...    ${service_api_description_published['aefProfiles'][0]}
+    ...    ${vendor_specific_aef_profile_key}
 
     # Default Invoker Registration and Onboarding
     ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
@@ -99,8 +103,8 @@ Published API with vendor extensibility and discover with VendSpecQueryParams di
 
 Publish API with vendorExt active and discover without supported features filter
     [Tags]    vendor_extensibility-3
-    ${vendor_specific_service_api_key}=   Set Variable   vendorSpecific-urn:etsi:mec:capifext:service-info
-    ${vendor_specific_aef_profile_key}=   Set Variable   vendorSpecific-urn:etsi:mec:capifext:transport-info
+    ${vendor_specific_service_api_key}=    Set Variable    vendorSpecific-urn:etsi:mec:capifext:service-info
+    ${vendor_specific_aef_profile_key}=    Set Variable    vendorSpecific-urn:etsi:mec:capifext:transport-info
     # Register APF
     ${register_user_info}=    Provider Default Registration
 
@@ -118,7 +122,9 @@ Publish API with vendorExt active and discover without supported features filter
     ...    vendor_specific_aef_profile=${vendor_specific_aef_profile}
 
     Dictionary Should Contain Key    ${service_api_description_published}    ${vendor_specific_service_api_key}
-    Dictionary Should Contain Key    ${service_api_description_published['aefProfiles'][0]}    ${vendor_specific_aef_profile_key}
+    Dictionary Should Contain Key
+    ...    ${service_api_description_published['aefProfiles'][0]}
+    ...    ${vendor_specific_aef_profile_key}
 
     # Default Invoker Registration and Onboarding
     ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
@@ -136,24 +142,41 @@ Publish API with vendorExt active and discover without supported features filter
     Dictionary Should Contain Key    ${resp.json()}    serviceAPIDescriptions
     Should Not Be Empty    ${resp.json()['serviceAPIDescriptions']}
     Length Should Be    ${resp.json()['serviceAPIDescriptions']}    1
-    Dictionary Should Not Contain Key    ${resp.json()['serviceAPIDescriptions']}    ${vendor_specific_service_api_key}
-    Dictionary Should Not Contain Key    ${resp.json()['serviceAPIDescriptions']['aefProfiles'][0]}    ${vendor_specific_aef_profile_key}
+    Dictionary Should Not Contain Key
+    ...    ${resp.json()['serviceAPIDescriptions'][0]}
+    ...    ${vendor_specific_service_api_key}
+    Dictionary Should Not Contain Key
+    ...    ${resp.json()['serviceAPIDescriptions'][0]['aefProfiles'][0]}
+    ...    ${vendor_specific_aef_profile_key}
 
-    ${service_api_description_published_to_check}=   Copy Dictionary    ${service_api_description_published}    deepcopy=True
-    Remove From Dictionary    ${service_api_description_published_to_check}     ${vendor_specific_service_api_key}
-    Remove From Dictionary    ${service_api_description_published_to_check['aefProfiles'][0]}     ${vendor_specific_aef_profile_key}
+    ${service_api_description_published_to_check}=    Copy Dictionary
+    ...    ${service_api_description_published}
+    ...    deepcopy=True
+    Remove From Dictionary    ${service_api_description_published_to_check}    ${vendor_specific_service_api_key}
+    Remove From Dictionary
+    ...    ${service_api_description_published_to_check['aefProfiles'][0]}
+    ...    ${vendor_specific_aef_profile_key}
 
-    List Should Contain Value    ${resp.json()['serviceAPIDescriptions']}    ${service_api_description_published_to_check}
+    List Should Contain Value
+    ...    ${resp.json()['serviceAPIDescriptions']}
+    ...    ${service_api_description_published_to_check}
 
 Publish API with vendorExt active but without vendorSpecifics
     [Tags]    vendor_extensibility-4
     # Register APF
     ${register_user_info}=    Provider Default Registration
 
-    # Publish one api
-    ${service_api_description_published}    ${resource_url}    ${request_body}=    Publish Service Api
-    ...    ${register_user_info}
+    # Publish API with supported features
+    ${request_body}=    Create Service Api Description
+    ...    api_name=service_1
+    ...    aef_id=${register_user_info['aef_id']}
     ...    supported_features=100
+    ${resp}=    Post Request Capif
+    ...    /published-apis/v1/${register_user_info['apf_id']}/service-apis
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${register_user_info['apf_username']}
 
     Check Response Variable Type And Values
     ...    ${resp}
@@ -166,8 +189,8 @@ Publish API with vendorExt active but without vendorSpecifics
 
 Publish API with vendorExt inactive but with vendorSpecifics
     [Tags]    vendor_extensibility-5
-    ${vendor_specific_service_api_key}=   Set Variable   vendorSpecific-urn:etsi:mec:capifext:service-info
-    ${vendor_specific_aef_profile_key}=   Set Variable   vendorSpecific-urn:etsi:mec:capifext:transport-info
+    ${vendor_specific_service_api_key}=    Set Variable    vendorSpecific-urn:etsi:mec:capifext:service-info
+    ${vendor_specific_aef_profile_key}=    Set Variable    vendorSpecific-urn:etsi:mec:capifext:transport-info
     # Register APF
     ${register_user_info}=    Provider Default Registration
 
@@ -177,12 +200,19 @@ Publish API with vendorExt inactive but with vendorSpecifics
     ${vendor_specific_aef_profile}=    Create Vendor Specific Aef Profile
     ...    ${vendor_specific_aef_profile_key}
 
-    # Publish one api
-    ${service_api_description_published}    ${resource_url}    ${request_body}=    Publish Service Api
-    ...    ${register_user_info}
+    # Publish API with supported features
+    ${request_body}=    Create Service Api Description
+    ...    api_name=service_1
+    ...    aef_id=${register_user_info['aef_id']}
     ...    supported_features=0
     ...    vendor_specific_service_api_description=${vendor_specific_service_api_description}
     ...    vendor_specific_aef_profile=${vendor_specific_aef_profile}
+    ${resp}=    Post Request Capif
+    ...    /published-apis/v1/${register_user_info['apf_id']}/service-apis
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${register_user_info['apf_username']}
 
     Check Response Variable Type And Values
     ...    ${resp}
@@ -283,10 +313,17 @@ Publish API without supportedFeatures
     # Register APF
     ${register_user_info}=    Provider Default Registration
 
-    # Publish one api
-    ${service_api_description_published}    ${resource_url}    ${request_body}=    Publish Service Api
-    ...    ${register_user_info}
+    # Publish API without supported features
+    ${request_body}=    Create Service Api Description
+    ...    api_name=service_1
+    ...    aef_id=${register_user_info['aef_id']}
     ...    supported_features=${NONE}
+    ${resp}=    Post Request Capif
+    ...    /published-apis/v1/${register_user_info['apf_id']}/service-apis
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${register_user_info['apf_username']}
 
     Check Response Variable Type And Values
     ...    ${resp}