diff --git a/automationtests/src/main/java/io/mosip/testrig/apirig/admin/fw/util/AdminTestUtil.java b/automationtests/src/main/java/io/mosip/testrig/apirig/admin/fw/util/AdminTestUtil.java
index e6ebb5a23d..b25d8ea881 100644
--- a/automationtests/src/main/java/io/mosip/testrig/apirig/admin/fw/util/AdminTestUtil.java
+++ b/automationtests/src/main/java/io/mosip/testrig/apirig/admin/fw/util/AdminTestUtil.java
@@ -3723,7 +3723,7 @@ public String inputJsonKeyWordHandeler(String jsonString, String testCaseName) {
 
 	public static String signJWKForMock(String clientId, String accessToken, RSAKey jwkKey, String testCaseName) {
 //		String tempUrl = getValueFromActuator(GlobalConstants.RESIDENT_DEFAULT_PROPERTIES, "mosip.iam.base.url");
-		String tempUrl = getValueFromEsignetWellKnownEndPoint("issuer") + "/v1/esignet";
+		String tempUrl = getValueFromEsignetWellKnownEndPoint("issuer");
 		if (tempUrl.contains("esignet.")) {
 			tempUrl = tempUrl.replace("esignet.", propsKernel.getProperty("esignetMockBaseURL"));
 		}
diff --git a/automationtests/src/main/resources/esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC.yml b/automationtests/src/main/resources/esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC.yml
index ad010ecf00..3621696cf7 100644
--- a/automationtests/src/main/resources/esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC.yml
+++ b/automationtests/src/main/resources/esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC.yml
@@ -1,12 +1,12 @@
 AuthorizationCodeSunBirdRCNegTC:
-   ESignet_AuthorizationCode_SunBirdRCNegTC_Diff_Scope_Neg:
+   ESignet_AuthorizationCode_SunBirdRCNegTC_Diff_Scope_Pos:
       endPoint: $ESIGNETMOCKBASEURL$/v1/esignet/authorization/auth-code
       role: resident
       restMethod: post
       checkErrorsOnlyInResponse: true
       validityCheckRequired: true
       inputTemplate: esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC
-      outputTemplate: esignet/error
+      outputTemplate: esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTCRCResult
       input: '{
         "encodedHash": "$ID:OAuthDetailsRequest_SunBirdRCNegTC_Scen1_AuthCode_Valid_Smoke_sid_encodedResp$",
       	"requestTime": "$TIMESTAMP$",
@@ -14,21 +14,16 @@ AuthorizationCodeSunBirdRCNegTC:
       	"permittedAuthorizeScopes": [{scope: "openid profile"}]
 }'
       output: '{
-  "errors": [
-    {
-      "errorCode": "invalid_permitted_scope"
-    }
-  ]
 }'
 
-   ESignet_AuthorizationCode_SunBirdRCNegTC_Diff_Scope2_Neg:
+   ESignet_AuthorizationCode_SunBirdRCNegTC_Diff_Scope2_Pos:
       endPoint: $ESIGNETMOCKBASEURL$/v1/esignet/authorization/auth-code
       role: resident
       restMethod: post
       checkErrorsOnlyInResponse: true
       validityCheckRequired: true
       inputTemplate: esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC
-      outputTemplate: esignet/error
+      outputTemplate: esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTCRCResult
       input: '{
         "encodedHash": "$ID:OAuthDetailsRequest_SunBirdRCNegTC_Scen2_AuthCode_Valid_Smoke_sid_encodedResp$",
       	"requestTime": "$TIMESTAMP$",
@@ -36,21 +31,16 @@ AuthorizationCodeSunBirdRCNegTC:
       	"permittedAuthorizeScopes": [{scope: "openid profile"}, {scope: "sunbird_rc_insurance_vc_ldp"}]
 }'
       output: '{
-  "errors": [
-    {
-      "errorCode": "invalid_permitted_scope"
-    }
-  ]
 }'
 
-   ESignet_AuthorizationCode_SunBirdRCNegTC_Comma_Separated_Scope_Neg:
+   ESignet_AuthorizationCode_SunBirdRCNegTC_Comma_Separated_Scope_Pos:
       endPoint: $ESIGNETMOCKBASEURL$/v1/esignet/authorization/auth-code
       role: resident
       restMethod: post
       checkErrorsOnlyInResponse: true
       validityCheckRequired: true
       inputTemplate: esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC
-      outputTemplate: esignet/error
+      outputTemplate: esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTCRCResult
       input: '{
         "encodedHash": "$ID:OAuthDetailsRequest_SunBirdRCNegTC_Scen3_AuthCode_Valid_Smoke_sid_encodedResp$",
       	"requestTime": "$TIMESTAMP$",
@@ -58,21 +48,16 @@ AuthorizationCodeSunBirdRCNegTC:
       	"permittedAuthorizeScopes": [{scope: "sunbird_rc_insurance_vc_ldp,openid profile"}]
 }'
       output: '{
-  "errors": [
-    {
-      "errorCode": "invalid_permitted_scope"
-    }
-  ]
 }'
 
-   ESignet_AuthorizationCode_SunBirdRCNegTC_Missing_Scope_Neg:
+   ESignet_AuthorizationCode_SunBirdRCNegTC_Missing_Scope_Pos:
       endPoint: $ESIGNETMOCKBASEURL$/v1/esignet/authorization/auth-code
       role: resident
       restMethod: post
       checkErrorsOnlyInResponse: true
       validityCheckRequired: true
       inputTemplate: esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC
-      outputTemplate: esignet/error
+      outputTemplate: esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTCRCResult
       input: '{
         "encodedHash": "$ID:OAuthDetailsRequest_SunBirdRCNegTC_Scen4_AuthCode_Valid_Smoke_sid_encodedResp$",
       	"requestTime": "$TIMESTAMP$",
@@ -80,11 +65,6 @@ AuthorizationCodeSunBirdRCNegTC:
       	"permittedAuthorizeScopes": [{scope: "$REMOVE$"}]
 }'
       output: '{
-  "errors": [
-    {
-      "errorCode": "invalid_permitted_scope"
-    }
-  ]
 }'
 
    ESignet_AuthorizationCode_SunBirdRCNegTC_Empty_Scope_Neg:
@@ -131,14 +111,14 @@ AuthorizationCodeSunBirdRCNegTC:
   ]
 }'
 
-   ESignet_AuthorizationCode_SunBirdRCNegTC_Invalid_Scope_Neg:
+   ESignet_AuthorizationCode_SunBirdRCNegTC_Invalid_Scope_Pos:
       endPoint: $ESIGNETMOCKBASEURL$/v1/esignet/authorization/auth-code
       role: resident
       restMethod: post
       checkErrorsOnlyInResponse: true
       validityCheckRequired: true
       inputTemplate: esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC
-      outputTemplate: esignet/error
+      outputTemplate: esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTCRCResult
       input: '{
         "encodedHash": "$ID:OAuthDetailsRequest_SunBirdRCNegTC_Scen7_AuthCode_Valid_Smoke_sid_encodedResp$",
       	"requestTime": "$TIMESTAMP$",
@@ -146,21 +126,16 @@ AuthorizationCodeSunBirdRCNegTC:
       	"permittedAuthorizeScopes": [{scope: "sgsdfhg"}]
 }'
       output: '{
-  "errors": [
-    {
-      "errorCode": "invalid_permitted_scope"
-    }
-  ]
 }'
 
-   ESignet_AuthorizationCode_SunBirdRCNegTC_Null_Scope_Neg:
+   ESignet_AuthorizationCode_SunBirdRCNegTC_Null_Scope_Pos:
       endPoint: $ESIGNETMOCKBASEURL$/v1/esignet/authorization/auth-code
       role: resident
       restMethod: post
       checkErrorsOnlyInResponse: true
       validityCheckRequired: true
       inputTemplate: esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC
-      outputTemplate: esignet/error
+      outputTemplate: esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTCRCResult
       input: '{
         "encodedHash": "$ID:OAuthDetailsRequest_SunBirdRCNegTC_Scen8_AuthCode_Valid_Smoke_sid_encodedResp$",
       	"requestTime": "$TIMESTAMP$",
@@ -168,11 +143,6 @@ AuthorizationCodeSunBirdRCNegTC:
       	"permittedAuthorizeScopes": [{scope: "null"}]
 }'
       output: '{
-  "errors": [
-    {
-      "errorCode": "invalid_permitted_scope"
-    }
-  ]
 }'
 
    ESignet_AuthorizationCode_SunBirdRCNegTC_All_Valid_Smoke_sid: