diff --git a/apitest/src/main/resources/pms/DeactivateOIDCClient/DeactivateOIDCClient.yml b/apitest/src/main/resources/pms/DeactivateOIDCClient/DeactivateOIDCClient.yml
index 69c24552a9..a1421c32a2 100644
--- a/apitest/src/main/resources/pms/DeactivateOIDCClient/DeactivateOIDCClient.yml
+++ b/apitest/src/main/resources/pms/DeactivateOIDCClient/DeactivateOIDCClient.yml
@@ -1,6 +1,6 @@
 DeactivateOIDCClient:
    Pms_DeactivateOIDCClient_all_Valid_Smoke_sid:
-      endPoint: /v1/partnermanager/oauth/client/{client_id}
+      endPoint: /v1/partnermanager/oauth/clients/{client_id}
       description: Deactivating The Oidc Client
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
@@ -24,7 +24,7 @@ DeactivateOIDCClient:
 }'
 
    Pms_DeactivateOIDCClient_Retry_with_same_policy_Neg:
-      endPoint: /v1/partnermanager/oauth/client/{client_id}
+      endPoint: /v1/partnermanager/oauth/clients/{client_id}
       description: Deactivating The Oidc Client
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
@@ -51,7 +51,7 @@ DeactivateOIDCClient:
 }'
 
    Pms_DeactivateOIDCClient_Missing_Requesttime_Neg:
-      endPoint: /v1/partnermanager/oauth/client/{client_id}
+      endPoint: /v1/partnermanager/oauth/clients/{client_id}
       description: Deactivating The Oidc Client
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
@@ -77,7 +77,7 @@ DeactivateOIDCClient:
 }'
 
    Pms_DeactivateOIDCClient_Missing_client_id_Neg:
-      endPoint: /v1/partnermanager/oauth/client/{client_id}
+      endPoint: /v1/partnermanager/oauth/clients/{client_id}
       description: Deactivating The Oidc Client
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
@@ -103,7 +103,7 @@ DeactivateOIDCClient:
 }'
 
    Pms_DeactivateOIDCClient_Missing_clientName_Neg:
-      endPoint: /v1/partnermanager/oauth/client/{client_id}
+      endPoint: /v1/partnermanager/oauth/clients/{client_id}
       description: Deactivating The Oidc Client
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
@@ -129,7 +129,7 @@ DeactivateOIDCClient:
 }'
 
    Pms_DeactivateOIDCClient_Missing_status_Neg:
-      endPoint: /v1/partnermanager/oauth/client/{client_id}
+      endPoint: /v1/partnermanager/oauth/clients/{client_id}
       description: Deactivating The Oidc Client
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
@@ -155,7 +155,7 @@ DeactivateOIDCClient:
 }'
 
    Pms_DeactivateOIDCClient_Missing_logoUri_Neg:
-      endPoint: /v1/partnermanager/oauth/client/{client_id}
+      endPoint: /v1/partnermanager/oauth/clients/{client_id}
       description: Deactivating The Oidc Client
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
@@ -181,7 +181,7 @@ DeactivateOIDCClient:
 }'
 
    Pms_DeactivateOIDCClient_Missing_redirectUris_Neg:
-      endPoint: /v1/partnermanager/oauth/client/{client_id}
+      endPoint: /v1/partnermanager/oauth/clients/{client_id}
       description: Deactivating The Oidc Client
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
@@ -207,7 +207,7 @@ DeactivateOIDCClient:
 }'
 
    Pms_DeactivateOIDCClient_Missing_grantTypes_Neg:
-      endPoint: /v1/partnermanager/oauth/client/{client_id}
+      endPoint: /v1/partnermanager/oauth/clients/{client_id}
       description: Deactivating The Oidc Client
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
@@ -233,7 +233,7 @@ DeactivateOIDCClient:
 }'
 
    Pms_DeactivateOIDCClient_Missing_clientNameLangMap_Neg:
-      endPoint: /v1/partnermanager/oauth/client/{client_id}
+      endPoint: /v1/partnermanager/oauth/clients/{client_id}
       description: Deactivating The Oidc Client
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
@@ -259,7 +259,7 @@ DeactivateOIDCClient:
 }'
 
    Pms_DeactivateOIDCClient_Missing_clientAuthMethods_Neg:
-      endPoint: /v1/partnermanager/oauth/client/{client_id}
+      endPoint: /v1/partnermanager/oauth/clients/{client_id}
       description: Deactivating The Oidc Client
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
diff --git a/apitest/src/main/resources/pms/GetAllActivePolicyGroups/GetAllActivePolicyGroups.yml b/apitest/src/main/resources/pms/GetAllActivePolicyGroups/GetAllActivePolicyGroups.yml
index 237e39b415..04af709b33 100644
--- a/apitest/src/main/resources/pms/GetAllActivePolicyGroups/GetAllActivePolicyGroups.yml
+++ b/apitest/src/main/resources/pms/GetAllActivePolicyGroups/GetAllActivePolicyGroups.yml
@@ -1,6 +1,6 @@
 GetAllActivePolicyGroups:
    Pms_GetAllActivePolicyGroups_All_Valid_Smoke:
-      endPoint: /v1/policymanager/policies/getAllPolicyGroups
+      endPoint: /v1/policymanager/policies/policy-groups
       description: Fetching all the active PolicyGroups
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
@@ -12,7 +12,7 @@ GetAllActivePolicyGroups:
       output: ' {
 }'
    Pms_GetAllActivePolicyGroups_without_auth:
-      endPoint: /v1/policymanager/policies/getAllPolicyGroups
+      endPoint: /v1/policymanager/policies/policy-groups
       description: Fetching all the active PolicyGroups without token
       role: batch
       checkErrorsOnlyInResponse: true
@@ -29,7 +29,7 @@ GetAllActivePolicyGroups:
        ]
 }'
    Pms_GetAllActivePolicyGroups_Invalid_auth:
-      endPoint: /v1/policymanager/policies/getAllPolicyGroups
+      endPoint: /v1/policymanager/policies/policy-groups
       description: Fetching all the active PolicyGroups with invalid token
       role: regproc
       checkErrorsOnlyInResponse: true
diff --git a/apitest/src/main/resources/pms/GetAllApiKeyForAuthPartner/GetAllApiKeyForAuthPartner.yml b/apitest/src/main/resources/pms/GetAllApiKeyForAuthPartner/GetAllApiKeyForAuthPartner.yml
index 81d3717e21..9ec0cd07e9 100644
--- a/apitest/src/main/resources/pms/GetAllApiKeyForAuthPartner/GetAllApiKeyForAuthPartner.yml
+++ b/apitest/src/main/resources/pms/GetAllApiKeyForAuthPartner/GetAllApiKeyForAuthPartner.yml
@@ -1,6 +1,6 @@
 GetAllApiKeyForAuthPartner:
    Pms_GetAllApiKeyForAuthPartner_All_Valid_Smoke:
-      endPoint: /v1/partnermanager/partners/getAllApiKeysForAuthPartners
+      endPoint: /v1/partnermanager/partners/api-keys-for-auth-partners
       description: Fetching all the API Key available for Auth Partner
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
@@ -12,7 +12,7 @@ GetAllApiKeyForAuthPartner:
       output: '{
 }'
    Pms_GetAllApiKeyForAuthPartner_without_auth:
-      endPoint: /v1/partnermanager/partners/getAllApiKeysForAuthPartners
+      endPoint: /v1/partnermanager/partners/api-keys-for-auth-partners
       description: Fetching all the API Key available for Auth Partner without token
       role: batch
       checkErrorsOnlyInResponse: true
@@ -29,7 +29,7 @@ GetAllApiKeyForAuthPartner:
        ]
 }'
    Pms_GetAllApiKeyForAuthPartner_invalid_auth:
-      endPoint: /v1/partnermanager/partners/getAllApiKeysForAuthPartners
+      endPoint: /v1/partnermanager/partners/api-keys-for-auth-partners
       description: Fetching all the API Key available for Auth Partner with invalid token
       role: regproc
       checkErrorsOnlyInResponse: true
diff --git a/apitest/src/main/resources/pms/GetAllApiKeyForAuthPartner2/GetAllApiKeyForAuthPartnernegativescenario.yml b/apitest/src/main/resources/pms/GetAllApiKeyForAuthPartner2/GetAllApiKeyForAuthPartnernegativescenario.yml
index f640885a5c..5a86a70a46 100644
--- a/apitest/src/main/resources/pms/GetAllApiKeyForAuthPartner2/GetAllApiKeyForAuthPartnernegativescenario.yml
+++ b/apitest/src/main/resources/pms/GetAllApiKeyForAuthPartner2/GetAllApiKeyForAuthPartnernegativescenario.yml
@@ -1,6 +1,6 @@
 GetAllApiKeyForAuthPartner:
    Pms_GetAllApiKeyForAuthPartner:
-      endPoint: /v1/partnermanager/partners/getAllApiKeysForAuthPartners
+      endPoint: /v1/partnermanager/partners/api-keys-for-auth-partners
       description: Fetching all the API Key available for Auth Partner
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
diff --git a/apitest/src/main/resources/pms/GetAllApprovedAuthPartnerPolicy/GetAllApprovedAuthPartnerPolicy.yml b/apitest/src/main/resources/pms/GetAllApprovedAuthPartnerPolicy/GetAllApprovedAuthPartnerPolicy.yml
index d6744c58a4..d08d790143 100644
--- a/apitest/src/main/resources/pms/GetAllApprovedAuthPartnerPolicy/GetAllApprovedAuthPartnerPolicy.yml
+++ b/apitest/src/main/resources/pms/GetAllApprovedAuthPartnerPolicy/GetAllApprovedAuthPartnerPolicy.yml
@@ -1,6 +1,6 @@
 GetAllApprovedAuthPartnerPolicy:
    Pms_GetAllApprovedAuthPartnerPolicy_All_Valid_Smoke:
-      endPoint: /v1/partnermanager/partners/getAllApprovedAuthPartnerPolicies
+      endPoint: /v1/partnermanager/partners/auth-partners-policies
       description: Fetching all Approved Auth Partner Policies
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
diff --git a/apitest/src/main/resources/pms/GetAllApprovedAuthPartnerPolicy/GetAllApprovedAuthPartnerPolicyNegativeScenarios.yml b/apitest/src/main/resources/pms/GetAllApprovedAuthPartnerPolicy/GetAllApprovedAuthPartnerPolicyNegativeScenarios.yml
index 7fb8d40411..f7f6d1e8bb 100644
--- a/apitest/src/main/resources/pms/GetAllApprovedAuthPartnerPolicy/GetAllApprovedAuthPartnerPolicyNegativeScenarios.yml
+++ b/apitest/src/main/resources/pms/GetAllApprovedAuthPartnerPolicy/GetAllApprovedAuthPartnerPolicyNegativeScenarios.yml
@@ -1,6 +1,6 @@
 GetAllApprovedAuthPartnerPolicy:
    Pms_GetAllApprovedAuthPartnerPolicy_without_auth:
-      endPoint: /v1/partnermanager/partners/getAllApprovedAuthPartnerPolicies
+      endPoint: /v1/partnermanager/partners/auth-partners-policies
       description: Fetching all Approved Auth Partner Policies without token
       role: batch
       checkErrorsOnlyInResponse: true
@@ -17,7 +17,7 @@ GetAllApprovedAuthPartnerPolicy:
        ]
 }'
    Pms_GetAllApprovedAuthPartnerPolicy_invalid_auth:
-      endPoint: /v1/partnermanager/partners/getAllApprovedAuthPartnerPolicies
+      endPoint: /v1/partnermanager/partners/auth-partners-policies
       description: Fetching all Approved Auth Partner Policies with invalid token
       role: regproc
       checkErrorsOnlyInResponse: true
diff --git a/apitest/src/main/resources/pms/GetAllApprovedPartnerId/GetAllApprovedPartnerId.yml b/apitest/src/main/resources/pms/GetAllApprovedPartnerId/GetAllApprovedPartnerId.yml
index 72fcdd69c6..fa2967b11f 100644
--- a/apitest/src/main/resources/pms/GetAllApprovedPartnerId/GetAllApprovedPartnerId.yml
+++ b/apitest/src/main/resources/pms/GetAllApprovedPartnerId/GetAllApprovedPartnerId.yml
@@ -1,6 +1,6 @@
 GetAllApprovedPartnerId:
    Pms_GetAllApprovedPartnerId_allValid_smoke:
-      endPoint: /v1/partnermanager/partners/getAllApprovedPartnerIdsWithPolicyGroups
+      endPoint: /v1/partnermanager/partners/approved-partner-ids-with-policy-groups
       description: Fetching all approved Partner Id
       role: partnerrevamp
       restMethod: get
diff --git a/apitest/src/main/resources/pms/GetAllApprovedPartnerId/GetAllApprovedPartnerIdNegativeScenarios.yml b/apitest/src/main/resources/pms/GetAllApprovedPartnerId/GetAllApprovedPartnerIdNegativeScenarios.yml
index 7d9a241d36..d1f5eee3ea 100644
--- a/apitest/src/main/resources/pms/GetAllApprovedPartnerId/GetAllApprovedPartnerIdNegativeScenarios.yml
+++ b/apitest/src/main/resources/pms/GetAllApprovedPartnerId/GetAllApprovedPartnerIdNegativeScenarios.yml
@@ -1,6 +1,6 @@
 GetAllApprovedPartnerId:
    Pms_GetAllApprovedPartnerId_without_auth:
-      endPoint: /v1/partnermanager/partners/getAllApprovedPartnerIdsWithPolicyGroups
+      endPoint: /v1/partnermanager/partners/approved-partner-ids-with-policy-groups
       description: Fetching all approved Partner Id without token
       role: batch
       restMethod: get
@@ -16,7 +16,7 @@ GetAllApprovedPartnerId:
        ]
 }'
    Pms_GetAllApprovedPartnerId_invalid_auth:
-      endPoint: /v1/partnermanager/partners/getAllApprovedPartnerIdsWithPolicyGroups
+      endPoint: /v1/partnermanager/partners/approved-partner-ids-with-policy-groups
       description: Fetching all approved Partner Id with invalid token
       role: regproc
       restMethod: get
diff --git a/apitest/src/main/resources/pms/GetAllCertificate/GetAllCertificate.yml b/apitest/src/main/resources/pms/GetAllCertificate/GetAllCertificate.yml
index 3bda9b462d..2aec7d029c 100644
--- a/apitest/src/main/resources/pms/GetAllCertificate/GetAllCertificate.yml
+++ b/apitest/src/main/resources/pms/GetAllCertificate/GetAllCertificate.yml
@@ -1,6 +1,6 @@
 GetAllCertificate:
    Pms_GetAllCertificate_allValid_smoke:
-      endPoint: /v1/partnermanager/partners/getAllCertificateDetails
+      endPoint: /v1/partnermanager/partners/partner-certificates
       description: Fetching all the API certificates of the Logged in Partner
       role: partnerrevamp
       restMethod: get
@@ -15,7 +15,7 @@ GetAllCertificate:
 }'
 
    Pms_GetAllCertificate_allValid_smoke:
-      endPoint: /v1/partnermanager/partners/getAllCertificateDetails
+      endPoint: /v1/partnermanager/partners/partner-certificates
       description: Fetching all the API certificates of the Loggedin Partner
       role: partnerrevamp
       restMethod: get
@@ -29,7 +29,7 @@ GetAllCertificate:
       "isCertificateAvailable": true
 }'
    Pms_GetAllCertificate_without_auth:
-      endPoint: /v1/partnermanager/partners/getAllCertificateDetails
+      endPoint: /v1/partnermanager/partners/partner-certificates
       description: Fetching all the API certificates of the partner without login
       role: batch
       restMethod: get
@@ -45,7 +45,7 @@ GetAllCertificate:
        ]
 }'
    Pms_GetAllCertificate_invalid_auth:
-      endPoint: /v1/partnermanager/partners/getAllCertificateDetails
+      endPoint: /v1/partnermanager/partners/partner-certificates
       description: Fetching all the API certificates of the partner invalid partner
       role: regproc
       restMethod: get
diff --git a/apitest/src/main/resources/pms/GetAllCertificate/GetAllCertificateNegativeScenarios.yml b/apitest/src/main/resources/pms/GetAllCertificate/GetAllCertificateNegativeScenarios.yml
index 02abf19880..66bf9c5d88 100644
--- a/apitest/src/main/resources/pms/GetAllCertificate/GetAllCertificateNegativeScenarios.yml
+++ b/apitest/src/main/resources/pms/GetAllCertificate/GetAllCertificateNegativeScenarios.yml
@@ -1,6 +1,6 @@
 GetAllCertificate:
    Pms_GetAllCertificate_beforecertifiactes_upload:
-      endPoint: /v1/partnermanager/partners/getAllCertificateDetails
+      endPoint: /v1/partnermanager/partners/partner-certificates
       description: Fetching all the API certificates of the Logged in Partner
       role: partnerrevamp
       restMethod: get
diff --git a/apitest/src/main/resources/pms/GetAllOidcClient/GetAllOidcClient.yml b/apitest/src/main/resources/pms/GetAllOidcClient/GetAllOidcClient.yml
index efa27fca6a..a048da99b8 100644
--- a/apitest/src/main/resources/pms/GetAllOidcClient/GetAllOidcClient.yml
+++ b/apitest/src/main/resources/pms/GetAllOidcClient/GetAllOidcClient.yml
@@ -1,6 +1,6 @@
 GetAllOidcClient:
    Pms_GetAllOidcClient_All_Valid_Smoke:
-      endPoint: /v1/partnermanager/getAllOidcClients
+      endPoint: /v1/partnermanager/oauth/clients
       description: Fetching all OIDC Clients of the loggedin Partner
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
diff --git a/apitest/src/main/resources/pms/GetAllOidcClient/GetAllOidcClientNegativeScenarios.yml b/apitest/src/main/resources/pms/GetAllOidcClient/GetAllOidcClientNegativeScenarios.yml
index 71902d8c4d..b00b2c1983 100644
--- a/apitest/src/main/resources/pms/GetAllOidcClient/GetAllOidcClientNegativeScenarios.yml
+++ b/apitest/src/main/resources/pms/GetAllOidcClient/GetAllOidcClientNegativeScenarios.yml
@@ -1,6 +1,6 @@
 GetAllOidcClient:
    Pms_GetAllOidcClient_without_Auth:
-      endPoint: /v1/partnermanager/getAllOidcClients
+      endPoint: /v1/partnermanager/oauth/clients
       description: Fetching all OIDC Clients of the loggedin Partner
       role: batch
       checkErrorsOnlyInResponse: true
@@ -17,7 +17,7 @@ GetAllOidcClient:
        ]
 }'
    Pms_GetAllOidcClient_Invalid_Auth:
-      endPoint: /v1/partnermanager/getAllOidcClients
+      endPoint: /v1/partnermanager/oauth/clients
       description: Fetching all OIDC Clients of the loggedin Partner
       role: regproc
       checkErrorsOnlyInResponse: true
diff --git a/apitest/src/main/resources/pms/GetAllRequestedPolicy/GetAllRequestedPolicy.yml b/apitest/src/main/resources/pms/GetAllRequestedPolicy/GetAllRequestedPolicy.yml
index 1c76c17297..6cae05eac0 100644
--- a/apitest/src/main/resources/pms/GetAllRequestedPolicy/GetAllRequestedPolicy.yml
+++ b/apitest/src/main/resources/pms/GetAllRequestedPolicy/GetAllRequestedPolicy.yml
@@ -1,6 +1,6 @@
 GetAllRequestedPolicies:
    Pms_GetAllRequestedPolicies_All_Valid_Smoke:
-      endPoint: /v1/partnermanager/partners/getAllRequestedPolicies
+      endPoint: /v1/partnermanager/partners/policy-requests
       description: Fetching all the Requested Policies
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
diff --git a/apitest/src/main/resources/pms/GetAllRequestedPolicy/GetAllRequestedPolicyNegativeScenarios.yml b/apitest/src/main/resources/pms/GetAllRequestedPolicy/GetAllRequestedPolicyNegativeScenarios.yml
index e0e89cc6bf..9171816cb3 100644
--- a/apitest/src/main/resources/pms/GetAllRequestedPolicy/GetAllRequestedPolicyNegativeScenarios.yml
+++ b/apitest/src/main/resources/pms/GetAllRequestedPolicy/GetAllRequestedPolicyNegativeScenarios.yml
@@ -1,6 +1,6 @@
 GetAllRequestedPolicies:
    Pms_GetAllRequestedPolicies_without_auth:
-      endPoint: /v1/partnermanager/partners/getAllRequestedPolicies
+      endPoint: /v1/partnermanager/partners/policy-requests
       description: Fetching all the Requested Policies without login token
       role: batch
       checkErrorsOnlyInResponse: true
@@ -17,7 +17,7 @@ GetAllRequestedPolicies:
        ]
 }'
    Pms_GetAllRequestedPolicies_invalid_auth:
-      endPoint: /v1/partnermanager/partners/getAllRequestedPolicies
+      endPoint: /v1/partnermanager/partners/policy-requests
       description: Fetching all the Requested Policies with invalid role
       role: regproc
       checkErrorsOnlyInResponse: true
diff --git a/apitest/src/main/resources/pms/OIDCClient/OIDCClient.yml b/apitest/src/main/resources/pms/OIDCClient/OIDCClient.yml
index f0354408b9..d15e498e0b 100644
--- a/apitest/src/main/resources/pms/OIDCClient/OIDCClient.yml
+++ b/apitest/src/main/resources/pms/OIDCClient/OIDCClient.yml
@@ -1,6 +1,6 @@
 CreateOIDCClient:
    Pms_CreateOIDCClient_all_Valid_Smoke_sid:
-      endPoint: /v1/partnermanager/oauth/client
+      endPoint: /v1/partnermanager/oauth/clients
       description: Creating OAUTH Client
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
@@ -23,10 +23,9 @@ CreateOIDCClient:
     	"status": "ACTIVE"
 }'
    Pms_CreateOIDCClient_invalid_policyID:
-      endPoint: /v1/partnermanager/oauth/client
+      endPoint: /v1/partnermanager/oauth/clients
       description: Creating OAUTH Client with invalid policyid      
       role: partnerrevamp
-      checkErrorsOnlyInResponse: true
       restMethod: post
       inputTemplate: pms/OIDCClient/oIDCClient
       outputTemplate: pms/error
@@ -49,7 +48,7 @@ CreateOIDCClient:
        ]
 }'
    Pms_CreateOIDCClient_invalid_logoUri:
-      endPoint: /v1/partnermanager/oauth/client
+      endPoint: /v1/partnermanager/oauth/clients
       description: Creating OAUTH Client with invalid logoUri      
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
@@ -75,7 +74,7 @@ CreateOIDCClient:
        ]
 }'
    Pms_CreateOIDCClient_invalid_RedirectUri:
-      endPoint: /v1/partnermanager/oauth/client
+      endPoint: /v1/partnermanager/oauth/clients
       description: Creating OAUTH Client with invalid redirectUri      
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
@@ -101,7 +100,7 @@ CreateOIDCClient:
        ]
 }'
    Pms_CreateOIDCClient_invalid_auth:
-      endPoint: /v1/partnermanager/oauth/client
+      endPoint: /v1/partnermanager/oauth/clients
       description: Creating OAUTH Client without token      
       role: regproc
       checkErrorsOnlyInResponse: true
@@ -127,7 +126,7 @@ CreateOIDCClient:
        ]
 }'
    Pms_CreateOIDCClient_without_publickey:
-      endPoint: /v1/partnermanager/oauth/client
+      endPoint: /v1/partnermanager/oauth/clients
       description: Creating OAUTH Client without publickkey      
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
@@ -153,7 +152,7 @@ CreateOIDCClient:
        ]
 }'
    Pms_CreateOIDCClient_invalid_granttypes:
-      endPoint: /v1/partnermanager/oauth/client
+      endPoint: /v1/partnermanager/oauth/clients
       description: Creating OAUTH Client with invalid granttypes      
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
@@ -179,7 +178,7 @@ CreateOIDCClient:
        ]
 }'
    Pms_CreateOIDCClient_without_granttypes:
-      endPoint: /v1/partnermanager/oauth/client
+      endPoint: /v1/partnermanager/oauth/clients
       description: Creating OAUTH Client without granttypes      
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
@@ -205,7 +204,7 @@ CreateOIDCClient:
        ]
 }'
    Pms_CreateOIDCClient_without_name:
-      endPoint: /v1/partnermanager/oauth/client
+      endPoint: /v1/partnermanager/oauth/clients
       description: Creating OAUTH Client without name field      
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
@@ -231,7 +230,7 @@ CreateOIDCClient:
        ]
 }'
    Pms_CreateOIDCClient_invalid_publickey:
-      endPoint: /v1/partnermanager/oauth/client
+      endPoint: /v1/partnermanager/oauth/clients
       description: Creating OAUTH Client with invalid publickkey      
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
diff --git a/apitest/src/main/resources/pms/OIDCClient/UpdateOIDCClient.yml b/apitest/src/main/resources/pms/OIDCClient/UpdateOIDCClient.yml
index 17a207c1fa..8d3cd5cd3c 100644
--- a/apitest/src/main/resources/pms/OIDCClient/UpdateOIDCClient.yml
+++ b/apitest/src/main/resources/pms/OIDCClient/UpdateOIDCClient.yml
@@ -1,6 +1,6 @@
 UpdateOIDCClient:
    Pms_UpdateOIDCClient_all_Valid_Smoke_sid:
-      endPoint: /v1/partnermanager/oauth/client/{client_id}
+      endPoint: /v1/partnermanager/oauth/clients/{client_id}
       role: partnerrevamp
       checkErrorsOnlyInResponse: true
       restMethod: put
diff --git a/apitest/testNgXmlFiles/pmsApi.xml b/apitest/testNgXmlFiles/pmsApi.xml
index b695f61852..1eb020c078 100644
--- a/apitest/testNgXmlFiles/pmsApi.xml
+++ b/apitest/testNgXmlFiles/pmsApi.xml
@@ -1,379 +1,269 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-
-
 <suite name="Partner Management Service API Suite">
-
-	<!-- Passing Group as parmeter unsing "testType" Possible Groups are: smoke 
-		regression smokeAndRegression -->
 	<listeners>
 		<listener class-name="io.mosip.testrig.apirig.report.EmailableReport" />
 	</listeners>
-	
 	<test name="CreatePolicyGroup">
-		<parameter name="ymlFile"
-			value="pms/DefinePolicyGroup/DefinePolicyGroup.yml" />
+		<parameter name="ymlFile" value="pms/DefinePolicyGroup/DefinePolicyGroup.yml" />
 		<parameter name="idKeyName" value="id" />
 		<classes>
-			<class
-				name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
-	
 	<test name="DefinePolicy">
-		<parameter name="ymlFile"
-			value="pms/DefinePolicy/DefinePolicy.yml" />
+		<parameter name="ymlFile" value="pms/DefinePolicy/DefinePolicy.yml" />
 		<parameter name="idKeyName" value="id" />
 		<classes>
-			<class
-				name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
-	
 	<test name="PublishPolicy">
-		<parameter name="ymlFile"
-			value="pms/PublishPolicy/PublishPolicy.yml" />
+		<parameter name="ymlFile" value="pms/PublishPolicy/PublishPolicy.yml" />
 		<classes>
-			<class
-				name="io.mosip.testrig.apirig.testscripts.PostWithOnlyPathParam" />
+			<class name="io.mosip.testrig.apirig.testscripts.PostWithOnlyPathParam" />
 		</classes>
 	</test>
-	
 	<test name="GetAllActivePolicyGroups">
-		<parameter name="ymlFile"
-			value="pms/GetAllActivePolicyGroups/GetAllActivePolicyGroups.yml" />
+		<parameter name="ymlFile" value="pms/GetAllActivePolicyGroups/GetAllActivePolicyGroups.yml" />
 		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
 	</test>
-	<test name ="GetAllApiKeyForAuthPartnerwithoutpartnerregister">
-		<parameter name ="ymlFile"
-			value= "pms/GetAllApiKeyForAuthPartner2/GetAllApiKeyForAuthPartnernegativescenario.yml" />
-	<classes>
+	<test name="GetAllApiKeyForAuthPartnerwithoutpartnerregister">
+		<parameter name="ymlFile" value="pms/GetAllApiKeyForAuthPartner2/GetAllApiKeyForAuthPartnernegativescenario.yml" />
+		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
 	</test>
-	
-	<test name ="GetAllCertificateBeforePartnerCreate">
-		<parameter name ="ymlFile"
-			value= "pms/GetAllCertificate/GetAllCertificateNegativeScenarios.yml" />
-	<classes>
+	<test name="GetAllCertificateBeforePartnerCreate">
+		<parameter name="ymlFile" value="pms/GetAllCertificate/GetAllCertificateNegativeScenarios.yml" />
+		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
 	</test>
-
-	<test name ="GetAllApprovedPartnerIdBeforePartnerCreate">
-		<parameter name ="ymlFile"
-			value= "pms/GetAllApprovedPartnerId/GetAllApprovedPartnerId.yml" />
-	<classes>
+	<test name="GetAllApprovedPartnerIdBeforePartnerCreate">
+		<parameter name="ymlFile" value="pms/GetAllApprovedPartnerId/GetAllApprovedPartnerId.yml" />
+		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
-	</test>	
-
+	</test>
 	<test name="CreatePartner">
-		<parameter name="ymlFile"
-			value="pms/CreatePartner/CreatePartner.yml" />
+		<parameter name="ymlFile" value="pms/CreatePartner/CreatePartner.yml" />
 		<parameter name="idKeyName" value="id" />
 		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
 		</classes>
 	</test>
-
-	<test name ="GetAllApiKeyForAuthPartnerwithoutpartnercertifcates">
-		<parameter name ="ymlFile"
-			value= "pms/GetAllApiKeyForAuthPartner2/GetAllApiKeyForAuthPartnernegativescenario.yml" />
-	<classes>
+	<test name="GetAllApiKeyForAuthPartnerwithoutpartnercertifcates">
+		<parameter name="ymlFile" value="pms/GetAllApiKeyForAuthPartner2/GetAllApiKeyForAuthPartnernegativescenario.yml" />
+		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
-	</test>	
-
-
+	</test>
 	<test name="VerifyPartnersEmail">
-		<parameter name="ymlFile"
-			value="pms/VerifyPartnersEmail/VerifyPartnersEmail.yml" />
+		<parameter name="ymlFile" value="pms/VerifyPartnersEmail/VerifyPartnersEmail.yml" />
 		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.SimplePut" />
 		</classes>
 	</test>
-	
-	<test name ="GetAllCertificateBeforeCACertificateUpload">
-		<parameter name ="ymlFile"
-			value= "pms/GetAllCertificate/GetAllCertificateNegativeScenarios.yml" />
-	<classes>
+	<test name="GetAllCertificateBeforeCACertificateUpload">
+		<parameter name="ymlFile" value="pms/GetAllCertificate/GetAllCertificateNegativeScenarios.yml" />
+		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
 	</test>
-		
-	<test name ="UploadCACertificate">
-		<parameter name ="ymlFile"
-			value= "pms/UploadCACertificate/UploadCACertificate.yml" />
-	<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
-		</classes>
-	</test>
-	
-	<test name ="GetAllCertificateBeforePartnerCertificateUpload">
-		<parameter name ="ymlFile"
-			value= "pms/GetAllCertificate/GetAllCertificateNegativeScenarios.yml" />
-	<classes>
+	<test name="GetAllCertificateBeforePartnerCertificateUpload">
+		<parameter name="ymlFile" value="pms/GetAllCertificate/GetAllCertificateNegativeScenarios.yml" />
+		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
-	</test>	 
-
+	</test>
 	<test name="UploadCACertificate">
-		<parameter name="ymlFile"
-			value="pms/UploadCACertificate/UploadCACertificate.yml" />
+		<parameter name="ymlFile" value="pms/UploadCACertificate/UploadCACertificate.yml" />
 		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
 		</classes>
 	</test>
-
 	<test name="UploadPartnerCertificate">
-		<parameter name="ymlFile"
-			value="pms/UploadPartnerCert/UploadPartnerCert.yml" />
+		<parameter name="ymlFile" value="pms/UploadPartnerCert/UploadPartnerCert.yml" />
 		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
 		</classes>
 	</test>
-
 	<test name="GetPartnerCertificate">
-		<parameter name="ymlFile"
-			value="pms/GetCertificate/GetCert.yml" />
+		<parameter name="ymlFile" value="pms/GetCertificate/GetCert.yml" />
 		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
 	</test>
-
 	<test name="GetAllCertificate">
-		<parameter name="ymlFile"
-			value="pms/GetAllCertificate/GetAllCertificate.yml" />
+		<parameter name="ymlFile" value="pms/GetAllCertificate/GetAllCertificate.yml" />
 		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
 	</test>
-
 	<test name="GetAllApprovedPartnerId">
-		<parameter name="ymlFile"
-			value="pms/GetAllApprovedPartnerId/GetAllApprovedPartnerId.yml" />
+		<parameter name="ymlFile" value="pms/GetAllApprovedPartnerId/GetAllApprovedPartnerId.yml" />
 		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
 	</test>
 
-	<test name ="GetAllApprovedPartnerIdWithoutAuthentication">
-		<parameter name ="ymlFile"
-			value= "pms/GetAllApprovedPartnerId/GetAllApprovedPartnerIdNegativeScenarios.yml" />
-	<classes>
+	<test name="GetAllApprovedPartnerIdWithoutAuthentication">
+		<parameter name="ymlFile" value="pms/GetAllApprovedPartnerId/GetAllApprovedPartnerIdNegativeScenarios.yml" />
+		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
 	</test>
-	
-	<test name ="GetAllApiKeyForAuthPartnerbeforepolicyMapping">
-		<parameter name ="ymlFile"
-			value= "pms/GetAllApiKeyForAuthPartner2/GetAllApiKeyForAuthPartnernegativescenario.yml" />
-	<classes>
+	<test name="GetAllApiKeyForAuthPartnerbeforepolicyMapping">
+		<parameter name="ymlFile" value="pms/GetAllApiKeyForAuthPartner2/GetAllApiKeyForAuthPartnernegativescenario.yml" />
+		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
 	</test>
-
-	<test name ="GetAllRequestedPolicyBeforeMapping">
-		<parameter name ="ymlFile"
-			value= "pms/GetAllRequestedPolicy/GetAllRequestedPolicy.yml" />
-	<classes>
+	<test name="GetAllRequestedPolicyBeforeMapping">
+		<parameter name="ymlFile" value="pms/GetAllRequestedPolicy/GetAllRequestedPolicy.yml" />
+		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
 	</test>
-	<test name ="GetAllApprovedAuthPartnerPolicyBeforePolicyMapping">
-		<parameter name ="ymlFile"
-			value= "pms/GetAllApprovedAuthPartnerPolicy/GetAllApprovedAuthPartnerPolicy.yml" />
-	<classes>
+	<test name="GetAllApprovedAuthPartnerPolicyBeforePolicyMapping">
+		<parameter name="ymlFile" value="pms/GetAllApprovedAuthPartnerPolicy/GetAllApprovedAuthPartnerPolicy.yml" />
+		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="partnerPolicyMapping">
-		<parameter name="ymlFile"
-			value="pms/partnerPolicyMapping/partnerPolicyMapping.yml" />
+		<parameter name="ymlFile" value="pms/partnerPolicyMapping/partnerPolicyMapping.yml" />
 		<parameter name="idKeyName" value="mappingkey" />
 		<classes>
-			<class
-				name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 
 	<test name="ApproveMappingKey">
-		<parameter name="ymlFile"
-			value="pms/ApproveMappingKey/ApproveMappingKey.yml" />
+		<parameter name="ymlFile" value="pms/ApproveMappingKey/ApproveMappingKey.yml" />
 		<parameter name="pathParams" value="mappingkey" />
 		<classes>
-			<class
-				name="io.mosip.testrig.apirig.testscripts.PutWithPathParamsAndBody" />
+			<class name="io.mosip.testrig.apirig.testscripts.PutWithPathParamsAndBody" />
 		</classes>
 	</test>
 
 	<test name="GetAllRequestedPolicy">
-		<parameter name="ymlFile"
-			value="pms/GetAllRequestedPolicy/GetAllRequestedPolicy.yml" />
+		<parameter name="ymlFile" value="pms/GetAllRequestedPolicy/GetAllRequestedPolicy.yml" />
 		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
 	</test>
-	
-	<test name ="GetAllRequestedPolicyAuthvalidations">
-		<parameter name ="ymlFile"
-			value= "pms/GetAllRequestedPolicy/GetAllRequestedPolicyNegativeScenarios.yml" />
-	<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
-		</classes>
-	</test>	
-	
-	<test name ="GetAllApprovedAuthPartnerPolicy">
-		<parameter name ="ymlFile"
-			value= "pms/GetAllApprovedAuthPartnerPolicy/GetAllApprovedAuthPartnerPolicy.yml" />
-	<classes>
+	<test name="GetAllRequestedPolicyAuthvalidations">
+		<parameter name="ymlFile" value="pms/GetAllRequestedPolicy/GetAllRequestedPolicyNegativeScenarios.yml" />
+		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
 	</test>
-	<test name ="GetAllApprovedAuthPartnerPolicyAuthValidations">
-		<parameter name ="ymlFile"
-			value= "pms/GetAllApprovedAuthPartnerPolicy/GetAllApprovedAuthPartnerPolicyNegativeScenarios.yml" />
-	<classes>
+	<test name="GetAllApprovedAuthPartnerPolicyAuthValidations">
+		<parameter name="ymlFile" value="pms/GetAllApprovedAuthPartnerPolicy/GetAllApprovedAuthPartnerPolicyNegativeScenarios.yml" />
+		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
-	</test>	
+	</test>
 
-	<test name ="GetAllApiKeyForAuthPartnerbeforeApikeygenerated">
-		<parameter name ="ymlFile"
-			value= "pms/GetAllApiKeyForAuthPartner2/GetAllApiKeyForAuthPartnernegativescenario.yml" />
-	<classes>
+	<test name="GetAllApiKeyForAuthPartnerbeforeApikeygenerated">
+		<parameter name="ymlFile" value="pms/GetAllApiKeyForAuthPartner2/GetAllApiKeyForAuthPartnernegativescenario.yml" />
+		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
 	</test>
-
 	<test name="GetAllApprovedAuthPartnerPolicy">
-		<parameter name="ymlFile"
-			value="pms/GetAllApprovedAuthPartnerPolicy/GetAllApprovedAuthPartnerPolicy.yml" />
+		<parameter name="ymlFile" value="pms/GetAllApprovedAuthPartnerPolicy/GetAllApprovedAuthPartnerPolicy.yml" />
 		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
 	</test>
-
 	<test name="GenerateApiKey">
-		<parameter name="ymlFile"
-			value="pms/GenerateApiKey/GenerateApiKey.yml" />
+		<parameter name="ymlFile" value="pms/GenerateApiKey/GenerateApiKey.yml" />
 		<parameter name="idKeyName" value="apiKey" />
 		<classes>
-			<class
-				name="io.mosip.testrig.apirig.testscripts.SimplePatchForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.testscripts.SimplePatchForAutoGenId" />
 		</classes>
 	</test>
-	
-	
-	
-	
 	<test name="ActivatePartnerApiKey">
-		<parameter name="ymlFile"
-			value="pms/ActivateDeactivatePartnerApiKey/ActivatePartnerApiKey.yml" />
-			<parameter name="pathParams"	value="partnerId,policyId" />
-		<classes>	
-						<class
-				name="io.mosip.testrig.apirig.testscripts.PatchWithPathParamsAndBody" />
-		</classes>
-		</test>
-
+		<parameter name="ymlFile" value="pms/ActivateDeactivatePartnerApiKey/ActivatePartnerApiKey.yml" />
+		<parameter name="pathParams" value="partnerId,policyId" />
+		<classes>
+			<class name="io.mosip.testrig.apirig.testscripts.PatchWithPathParamsAndBody" />
+		</classes>
+	</test>
 	<test name="ActivateDeactivatePartnerApiKey">
-		<parameter name="ymlFile"
-			value="pms/ActivateDeactivatePartnerApiKey/ActivateDeactivatePartnerApiKey.yml" />
+		<parameter name="ymlFile" value="pms/ActivateDeactivatePartnerApiKey/ActivateDeactivatePartnerApiKey.yml" />
 		<parameter name="pathParams" value="partnerId,policyId" />
-
 		<classes>
-			<class
-				name="io.mosip.testrig.apirig.testscripts.PatchWithPathParamsAndBody" />
+			<class name="io.mosip.testrig.apirig.testscripts.PatchWithPathParamsAndBody" />
 		</classes>
 	</test>
-
 	<test name="GetAllApiKeyForAuthPartner">
-		<parameter name="ymlFile"
-			value="pms/GetAllApiKeyForAuthPartner/GetAllApiKeyForAuthPartner.yml" />
+		<parameter name="ymlFile" value="pms/GetAllApiKeyForAuthPartner/GetAllApiKeyForAuthPartner.yml" />
 		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
 	</test>
-	
 	<test name="DeactivatePartnerApiKey">
-		<parameter name="ymlFile"
-			value="pms/ActivateDeactivatePartnerApiKey/DeactivatePartnerApiKey.yml" />
-			<parameter name="pathParams"	value="partnerId,policyId" />
+		<parameter name="ymlFile" value="pms/ActivateDeactivatePartnerApiKey/DeactivatePartnerApiKey.yml" />
+		<parameter name="pathParams" value="partnerId,policyId" />
 		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.PatchWithPathParamsAndBody" />
 		</classes>
 	</test>
-	
-	<test name ="GetAllApiKeyForAuthPartnerafterdeactive">
-		<parameter name ="ymlFile"
-			value= "pms/GetAllApiKeyForAuthPartner/GetAllApiKeyForAuthPartner.yml" />
-	<classes>
+	<test name="GetAllApiKeyForAuthPartnerafterdeactive">
+		<parameter name="ymlFile" value="pms/GetAllApiKeyForAuthPartner/GetAllApiKeyForAuthPartner.yml" />
+		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
-	</test>	
-	
-	<test name ="GetAllOidcClientBeforeOIDCCreation">
-		<parameter name ="ymlFile"
-			value= "pms/GetAllOidcClient/GetAllOidcClient.yml" />
-	<classes>
+	</test>
+	<test name="GetAllOidcClientBeforeOIDCCreation">
+		<parameter name="ymlFile" value="pms/GetAllOidcClient/GetAllOidcClient.yml" />
+		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="OAuthClient">
-		<parameter name="ymlFile"
-			value="pms/OIDCClient/OIDCClient.yml" />
+		<parameter name="ymlFile" value="pms/OIDCClient/OIDCClient.yml" />
 		<parameter name="idKeyName" value="clientId" />
 		<classes>
-			<class
-				name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
-	
 	<test name="UpdateOAuthClient">
-		<parameter name="ymlFile"
-			value="pms/OIDCClient/UpdateOIDCClient.yml" />
+		<parameter name="ymlFile" value="pms/OIDCClient/UpdateOIDCClient.yml" />
 		<parameter name="pathParams" value="client_id" />
 		<classes>
-			<class
-				name="io.mosip.testrig.apirig.testscripts.PutWithPathParamsAndBody" />
+			<class name="io.mosip.testrig.apirig.testscripts.PutWithPathParamsAndBody" />
 		</classes>
 	</test>
-	
 	<test name="GetAllOidcClient">
-		<parameter name="ymlFile"
-			value="pms/GetAllOidcClient/GetAllOidcClient.yml" />
+		<parameter name="ymlFile" value="pms/GetAllOidcClient/GetAllOidcClient.yml" />
 		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
 	</test>
-	<test name ="GetAllOidcClientWithoutAuthentication">
-		<parameter name ="ymlFile"
-			value= "pms/GetAllOidcClient/GetAllOidcClientNegativeScenarios.yml" />
-	<classes>
+	<test name="GetAllOidcClientWithoutAuthentication">
+		<parameter name="ymlFile" value="pms/GetAllOidcClient/GetAllOidcClientNegativeScenarios.yml" />
+		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="DeactivateOIDCClient">
-		<parameter name="ymlFile"
-			value="pms/DeactivateOIDCClient/DeactivateOIDCClient.yml" />
+		<parameter name="ymlFile" value="pms/DeactivateOIDCClient/DeactivateOIDCClient.yml" />
 		<parameter name="pathParams" value="client_id" />
 		<classes>
-			<class
-				name="io.mosip.testrig.apirig.testscripts.PutWithPathParamsAndBody" />
+			<class name="io.mosip.testrig.apirig.testscripts.PutWithPathParamsAndBody" />
 		</classes>
 	</test>
-	<test name ="GetAllOidcClientAfterDeactivateOfOIDC">
-		<parameter name ="ymlFile"
-			value= "pms/GetAllOidcClient/GetAllOidcClient.yml" />
-	<classes>
+	<test name="GetAllOidcClientAfterDeactivateOfOIDC">
+		<parameter name="ymlFile" value="pms/GetAllOidcClient/GetAllOidcClient.yml" />
+		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
-	</test>	
-	
-	
-
+	</test>
 </suite>