diff --git a/src/test/dsep/courses/response-from-ps/cancel.response.json b/src/test/dsep/courses/response-from-ps/cancel.response.json
index 0a317865af1192b9b621492bbe371690b86b3d1f..82893e43dafe0b1820b9e515c8aa0786bc1f0ab1 100644
--- a/src/test/dsep/courses/response-from-ps/cancel.response.json
+++ b/src/test/dsep/courses/response-from-ps/cancel.response.json
@@ -105,7 +105,7 @@
                   "list": [
                     {
                       "value": "Amazon",
-                      "code": "course-brand-name",
+                      "descriptor": { "code": "course-brand-name" },
                       "display": true
                     }
                   ]
@@ -114,7 +114,11 @@
                   "display": true,
                   "descriptor": { "description": "DSEP" },
                   "list": [
-                    { "value": "AWS", "code": "course-name", "display": true }
+                    {
+                      "value": "AWS",
+                      "descriptor": { "code": "course-name" },
+                      "display": true
+                    }
                   ]
                 },
                 {
@@ -122,7 +126,7 @@
                   "list": [
                     {
                       "value": "30 days",
-                      "code": "course-duration",
+                      "descriptor": { "code": "course-duration" },
                       "display": true
                     }
                   ]
@@ -132,7 +136,7 @@
                   "list": [
                     {
                       "value": "https://www.udemy.com/course/aws-certified-cloud-practitioner-new/?couponCode=LETSLEARNNOWPP",
-                      "code": "course-url",
+                      "descriptor": { "code": "course-url" },
                       "display": true
                     }
                   ]
diff --git a/src/test/dsep/courses/response-from-ps/confirm.response.json b/src/test/dsep/courses/response-from-ps/confirm.response.json
index ac5afdb5a39280e4d7378d7bb02f225ddf91621d..bdcdb1615c19cf45b1cc468009be009352d0d1ac 100644
--- a/src/test/dsep/courses/response-from-ps/confirm.response.json
+++ b/src/test/dsep/courses/response-from-ps/confirm.response.json
@@ -131,7 +131,7 @@
                   "list": [
                     {
                       "value": "Amazon",
-                      "code": "course-brand-name",
+                      "descriptor": { "code": "course-brand-name" },
                       "display": true
                     }
                   ]
@@ -140,7 +140,11 @@
                   "display": true,
                   "descriptor": { "description": "DSEP" },
                   "list": [
-                    { "value": "AWS", "code": "course-name", "display": true }
+                    {
+                      "value": "AWS",
+                      "descriptor": { "code": "course-name" },
+                      "display": true
+                    }
                   ]
                 },
                 {
@@ -148,7 +152,7 @@
                   "list": [
                     {
                       "value": "30 days",
-                      "code": "course-duration",
+                      "descriptor": { "code": "course-duration" },
                       "display": true
                     }
                   ]
@@ -158,7 +162,7 @@
                   "list": [
                     {
                       "value": "https://www.udemy.com/course/aws-certified-cloud-practitioner-new/?couponCode=LETSLEARNNOWPP",
-                      "code": "course-url",
+                      "descriptor": { "code": "course-url" },
                       "display": true
                     }
                   ]
diff --git a/src/test/dsep/courses/response-from-ps/init.response.json b/src/test/dsep/courses/response-from-ps/init.response.json
index 1240e4676a8a8667b6ea2119b14355e9d0d26efa..8e64ac4b2251034f1d888c09972bb0e46dfcc006 100644
--- a/src/test/dsep/courses/response-from-ps/init.response.json
+++ b/src/test/dsep/courses/response-from-ps/init.response.json
@@ -110,9 +110,8 @@
                   "descriptor": { "description": "DSEP" },
                   "list": [
                     {
-                      "descriptor": { "description": "Amazon" },
                       "value": "Amazon",
-                      "code": "course-brand-name",
+                      "descriptor": { "code": "course-brand-name" },
                       "display": true
                     }
                   ]
@@ -122,9 +121,8 @@
                   "descriptor": { "description": "DSEP" },
                   "list": [
                     {
-                      "descriptor": { "description": "AWS" },
                       "value": "AWS",
-                      "code": "course-name",
+                      "descriptor": { "code": "course-name" },
                       "display": true
                     }
                   ]
@@ -133,9 +131,8 @@
                   "display": true,
                   "list": [
                     {
-                      "descriptor": { "description": "course-duration" },
                       "value": "30 days",
-                      "code": "course-duration",
+                      "descriptor": { "code": "course-duration" },
                       "display": true
                     }
                   ]
@@ -144,9 +141,8 @@
                   "display": true,
                   "list": [
                     {
-                      "descriptor": { "description": "course-url" },
                       "value": "https://www.udemy.com/course/aws-certified-cloud-practitioner-new/?couponCode=LETSLEARNNOWPP",
-                      "code": "course-url",
+                      "descriptor": { "code": "course-url" },
                       "display": true
                     }
                   ]
diff --git a/src/test/dsep/courses/response-from-ps/search.response.json b/src/test/dsep/courses/response-from-ps/search.response.json
index a99290653c923fb31c8b4ad76e2f9cd5aba74331..7fdc187e16fc2159c5da8b3b8a6f5ccd0ab06448 100644
--- a/src/test/dsep/courses/response-from-ps/search.response.json
+++ b/src/test/dsep/courses/response-from-ps/search.response.json
@@ -114,7 +114,7 @@
                       "list": [
                         {
                           "value": "Amazon",
-                          "code": "course-brand-name",
+                          "descriptor": { "code": "course-brand-name" },
                           "display": true
                         }
                       ]
@@ -125,7 +125,7 @@
                       "list": [
                         {
                           "value": "AWS",
-                          "code": "course-name",
+                          "descriptor": { "code": "course-name" },
                           "display": true
                         }
                       ]
@@ -135,7 +135,7 @@
                       "list": [
                         {
                           "value": "30 days",
-                          "code": "course-duration",
+                          "descriptor": { "code": "course-duration" },
                           "display": true
                         }
                       ]
@@ -145,7 +145,7 @@
                       "list": [
                         {
                           "value": "https://www.udemy.com/course/aws-certified-cloud-practitioner-new/?couponCode=LETSLEARNNOWPP",
-                          "code": "course-url",
+                          "descriptor": { "code": "course-url" },
                           "display": true
                         }
                       ]
diff --git a/src/test/dsep/courses/response-from-ps/select.response.json b/src/test/dsep/courses/response-from-ps/select.response.json
index b76bfbb08e71423086a635607ad01244709474c2..f6f8336837257d09e16eef685d7611b4fb57bc8a 100644
--- a/src/test/dsep/courses/response-from-ps/select.response.json
+++ b/src/test/dsep/courses/response-from-ps/select.response.json
@@ -150,9 +150,8 @@
                   "descriptor": { "description": "DSEP" },
                   "list": [
                     {
-                      "descriptor": { "description": "Amazon" },
                       "value": "Amazon",
-                      "code": "course-brand-name",
+                      "descriptor": { "code": "course-brand-name" },
                       "display": true
                     }
                   ]
@@ -162,9 +161,8 @@
                   "descriptor": { "description": "DSEP" },
                   "list": [
                     {
-                      "descriptor": { "description": "AWS" },
                       "value": "AWS",
-                      "code": "course-name",
+                      "descriptor": { "code": "course-name" },
                       "display": true
                     }
                   ]
@@ -173,9 +171,8 @@
                   "display": true,
                   "list": [
                     {
-                      "descriptor": { "description": "course-duration" },
                       "value": "30 days",
-                      "code": "course-duration",
+                      "descriptor": { "code": "course-duration" },
                       "display": true
                     }
                   ]
@@ -184,9 +181,8 @@
                   "display": true,
                   "list": [
                     {
-                      "descriptor": { "description": "course-url" },
                       "value": "https://www.udemy.com/course/aws-certified-cloud-practitioner-new/?couponCode=LETSLEARNNOWPP",
-                      "code": "course-url",
+                      "descriptor": { "code": "course-url" },
                       "display": true
                     }
                   ]
diff --git a/src/test/dsep/courses/response-to-ui/response.search.json b/src/test/dsep/courses/response-to-ui/response.search.json
index b3c7af7f3b94c1389760b9ac35610aae61e6c8fc..fe4d38995f41884fbbc7913dc81b45d8bae6eeea 100644
--- a/src/test/dsep/courses/response-to-ui/response.search.json
+++ b/src/test/dsep/courses/response-to-ui/response.search.json
@@ -10,8 +10,14 @@
         "country": "IND",
         "city": "std:080",
         "location": {
-          "country": { "name": "India", "code": "IND" },
-          "city": { "name": "Bangalore", "code": "std:080" }
+          "country": {
+            "name": "India",
+            "code": "IND"
+          },
+          "city": {
+            "name": "Bangalore",
+            "code": "std:080"
+          }
         },
         "bap_id": "bap-ps-network-dev.becknprotocol.io",
         "bap_uri": "https://bap-ps-network-dev.becknprotocol.io",
@@ -33,12 +39,21 @@
                 "id": "2",
                 "gps": "44.6616,111.1001",
                 "address": "Max pvt lmtd",
-                "city": { "name": "Delhi" },
-                "country": { "name": "India" },
-                "state": { "name": "Delhi" },
+                "city": {
+                  "name": "Delhi"
+                },
+                "country": {
+                  "name": "India"
+                },
+                "state": {
+                  "name": "Delhi"
+                },
                 "area_code": "110000"
               },
-              { "id": "undefined", "area_code": "undefined" }
+              {
+                "id": "undefined",
+                "area_code": "undefined"
+              }
             ],
             "items": [
               {
@@ -46,20 +61,48 @@
                 "short_desc": "A high paced hands on course on AWS, complete with in depth professional courses notes.",
                 "long_desc": "About the courses:\nThis course will help you set up WordPress on AWS EC2, and link to RDS database, build reliable NodeJS backend using Elastic Beanstalk, manage files via AWS S3, send emails with SES, and set CloudWatch alarms. \n\nCourse details:\nCourse Provider: Udemy\nCourse Instructor: BackSpace Academy\nCourse Length: 3 hours\nModules: 14\nSkills taught: AWS, NodeJS\nLevel: Beginner\nSchedule: Flexible\nCourse delivery: Online",
                 "name": "Amazon Web Services (AWS) - Zero to Hero",
-                "price": { "value": "4000", "currency": "INR" },
+                "price": {
+                  "value": "4000",
+                  "currency": "INR"
+                },
                 "fulfillments": [
                   {
                     "id": "8",
                     "type": "RECORDED COURSE",
                     "tracking": false,
                     "tags": [
-                      { "display": true, "list": [{ "value": "Amazon" }] },
-                      { "display": true, "list": [{ "value": "AWS" }] },
-                      { "display": true, "list": [{ "value": "30 days" }] },
                       {
                         "display": true,
                         "list": [
                           {
+                            "code": "course-brand-name",
+                            "value": "Amazon"
+                          }
+                        ]
+                      },
+                      {
+                        "display": true,
+                        "list": [
+                          {
+                            "code": "course-name",
+                            "value": "AWS"
+                          }
+                        ]
+                      },
+                      {
+                        "display": true,
+                        "list": [
+                          {
+                            "code": "course-duration",
+                            "value": "30 days"
+                          }
+                        ]
+                      },
+                      {
+                        "display": true,
+                        "list": [
+                          {
+                            "code": "course-url",
                             "value": "https://www.udemy.com/course/aws-certified-cloud-practitioner-new/?couponCode=LETSLEARNNOWPP"
                           }
                         ]
@@ -71,13 +114,38 @@
                     "type": "RECORDED COURSE",
                     "tracking": false,
                     "tags": [
-                      { "display": true, "list": [{ "value": "Amazon" }] },
-                      { "display": true, "list": [{ "value": "AWS" }] },
-                      { "display": true, "list": [{ "value": "30 days" }] },
                       {
                         "display": true,
                         "list": [
                           {
+                            "code": "course-brand-name",
+                            "value": "Amazon"
+                          }
+                        ]
+                      },
+                      {
+                        "display": true,
+                        "list": [
+                          {
+                            "code": "course-name",
+                            "value": "AWS"
+                          }
+                        ]
+                      },
+                      {
+                        "display": true,
+                        "list": [
+                          {
+                            "code": "course-duration",
+                            "value": "30 days"
+                          }
+                        ]
+                      },
+                      {
+                        "display": true,
+                        "list": [
+                          {
+                            "code": "course-url",
                             "value": "https://www.udemy.com/course/aws-certified-cloud-practitioner-new/?couponCode=LETSLEARNNOWPP"
                           }
                         ]
@@ -95,15 +163,30 @@
                 "tags": [
                   {
                     "display": true,
-                    "list": [{ "code": "course-brand-name", "value": "Amazon" }]
+                    "list": [
+                      {
+                        "code": "course-brand-name",
+                        "value": "Amazon"
+                      }
+                    ]
                   },
                   {
                     "display": true,
-                    "list": [{ "code": "course-name", "value": "AWS" }]
+                    "list": [
+                      {
+                        "code": "course-name",
+                        "value": "AWS"
+                      }
+                    ]
                   },
                   {
                     "display": true,
-                    "list": [{ "code": "course-duration", "value": "30 days" }]
+                    "list": [
+                      {
+                        "code": "course-duration",
+                        "value": "30 days"
+                      }
+                    ]
                   },
                   {
                     "display": true,
@@ -115,11 +198,17 @@
                     ]
                   }
                 ],
-                "quantity": { "available": { "count": 100000 } }
+                "quantity": {
+                  "available": {
+                    "count": 100000
+                  }
+                }
               }
             ],
             "images": [
-              { "url": "https://makerspace/assembly/makerspace_logo.png" }
+              {
+                "url": "https://makerspace/assembly/makerspace_logo.png"
+              }
             ]
           }
         ]
diff --git a/src/test/dsep/scholarships/response-from-ps/cancel.response.json b/src/test/dsep/scholarships/response-from-ps/cancel.response.json
index 7ece999c3f04f287c70e1a775a85e5db639a47a1..bf9e87f8a6590821050a67b5921a83d03f4f4a39 100644
--- a/src/test/dsep/scholarships/response-from-ps/cancel.response.json
+++ b/src/test/dsep/scholarships/response-from-ps/cancel.response.json
@@ -102,7 +102,7 @@
                   "list": [
                     {
                       "value": "scholarship",
-                      "code": "scholarship",
+                      "descriptor": { "code": "scholarship" },
                       "display": true
                     }
                   ]
diff --git a/src/test/dsep/scholarships/response-from-ps/confirm.response.json b/src/test/dsep/scholarships/response-from-ps/confirm.response.json
index a0ee3f60831ad4bfd145fd9ffe303fc357610344..30ee53b66aaed70dae824011ce79300f629eb86e 100644
--- a/src/test/dsep/scholarships/response-from-ps/confirm.response.json
+++ b/src/test/dsep/scholarships/response-from-ps/confirm.response.json
@@ -128,7 +128,7 @@
                   "list": [
                     {
                       "value": "scholarship",
-                      "code": "scholarship",
+                      "descriptor": { "code": "scholarship" },
                       "display": true
                     }
                   ]
diff --git a/src/test/dsep/scholarships/response-from-ps/init.response.json b/src/test/dsep/scholarships/response-from-ps/init.response.json
index cc0ff3160c6f6f7f8d472b31af61c6c8a5a6fc25..bb1b37efb55b0b76686cf901ba88ed7d6414d53d 100644
--- a/src/test/dsep/scholarships/response-from-ps/init.response.json
+++ b/src/test/dsep/scholarships/response-from-ps/init.response.json
@@ -113,9 +113,8 @@
                   "descriptor": { "description": "scholarships" },
                   "list": [
                     {
-                      "descriptor": { "description": "Scholarship" },
                       "value": "scholarship",
-                      "code": "scholarship",
+                      "descriptor": { "code": "scholarship" },
                       "display": true
                     }
                   ]
@@ -123,22 +122,12 @@
                 {
                   "display": true,
                   "descriptor": { "description": "scholarships" },
-                  "list": [
-                    {
-                      "descriptor": { "description": "Ramaiah" },
-                      "display": true
-                    }
-                  ]
+                  "list": [{ "display": true }]
                 },
                 {
                   "display": true,
                   "descriptor": { "description": "DSEP" },
-                  "list": [
-                    {
-                      "descriptor": { "description": "Entrance" },
-                      "display": true
-                    }
-                  ]
+                  "list": [{ "display": true }]
                 }
               ]
             }
diff --git a/src/test/dsep/scholarships/response-from-ps/search.response.json b/src/test/dsep/scholarships/response-from-ps/search.response.json
index a27b73f98e81dcbede27e08827f262fa0570e987..f082d044a55993e42e1ad87f8f9fadb2d8be6391 100644
--- a/src/test/dsep/scholarships/response-from-ps/search.response.json
+++ b/src/test/dsep/scholarships/response-from-ps/search.response.json
@@ -113,7 +113,7 @@
                       "list": [
                         {
                           "value": "scholarship",
-                          "code": "scholarship",
+                          "descriptor": { "code": "scholarship" },
                           "display": true
                         }
                       ]
diff --git a/src/test/dsep/scholarships/response-from-ps/select.response.json b/src/test/dsep/scholarships/response-from-ps/select.response.json
index 5cf0e255c9cab0b81f234ff8d5eda1db25c97bf4..b5ac1bed1b59920d877349821a79f07402611860 100644
--- a/src/test/dsep/scholarships/response-from-ps/select.response.json
+++ b/src/test/dsep/scholarships/response-from-ps/select.response.json
@@ -112,9 +112,8 @@
                   "descriptor": { "description": "scholarships" },
                   "list": [
                     {
-                      "descriptor": { "description": "Scholarship" },
                       "value": "scholarship",
-                      "code": "scholarship",
+                      "descriptor": { "code": "scholarship" },
                       "display": true
                     }
                   ]
@@ -122,22 +121,12 @@
                 {
                   "display": true,
                   "descriptor": { "description": "scholarships" },
-                  "list": [
-                    {
-                      "descriptor": { "description": "Ramaiah" },
-                      "display": true
-                    }
-                  ]
+                  "list": [{ "display": true }]
                 },
                 {
                   "display": true,
                   "descriptor": { "description": "DSEP" },
-                  "list": [
-                    {
-                      "descriptor": { "description": "Entrance" },
-                      "display": true
-                    }
-                  ]
+                  "list": [{ "display": true }]
                 }
               ],
               "xinput": {
diff --git a/src/test/dsep/scholarships/response-from-ps/status.reponse.json b/src/test/dsep/scholarships/response-from-ps/status.reponse.json
index ab6c64386df1698b02f90fb8c989b20a25ef5586..917c71ea1dce6219e9ee47572df5e95cbfb705b1 100644
--- a/src/test/dsep/scholarships/response-from-ps/status.reponse.json
+++ b/src/test/dsep/scholarships/response-from-ps/status.reponse.json
@@ -106,7 +106,7 @@
                   "list": [
                     {
                       "value": "scholarship",
-                      "code": "scholarship",
+                      "descriptor": { "code": "scholarship" },
                       "display": true
                     }
                   ]
diff --git a/src/test/dsep/scholarships/response-to-ui/response.search.json b/src/test/dsep/scholarships/response-to-ui/response.search.json
index 20e04ccec5e0bfcfed4bc0f6b47f5442146ca73c..3d8985a73e86425ac5042dbb3e3f5675568e9452 100644
--- a/src/test/dsep/scholarships/response-to-ui/response.search.json
+++ b/src/test/dsep/scholarships/response-to-ui/response.search.json
@@ -54,7 +54,12 @@
                     "type": "scholarship",
                     "tracking": false,
                     "tags": [
-                      { "display": true, "list": [{ "value": "scholarship" }] },
+                      {
+                        "display": true,
+                        "list": [
+                          { "code": "scholarship", "value": "scholarship" }
+                        ]
+                      },
                       { "display": true, "list": [null] },
                       { "display": true, "list": [null] }
                     ]