diff --git a/omod/src/main/webapp/resources/jsonforms/HMIS-HIV-003-HivCareArtCard-ClinicalAssessmentPage.json b/omod/src/main/webapp/resources/jsonforms/HMIS-HIV-003-HivCareArtCard-ClinicalAssessmentPage.json
index fe3ad050..9073c1b5 100644
--- a/omod/src/main/webapp/resources/jsonforms/HMIS-HIV-003-HivCareArtCard-ClinicalAssessmentPage.json
+++ b/omod/src/main/webapp/resources/jsonforms/HMIS-HIV-003-HivCareArtCard-ClinicalAssessmentPage.json
@@ -955,10 +955,10 @@
               "id": "testsOrdered",
               "type": "testOrder",
               "questionOptions": {
-                "rendering": "repeating",
+                "rendering": "select",
                 "orderSettingUuid": "INPATIENT",
                 "orderType": "testorder",
-                "selectableOrders": [
+                "answers": [
                   {
                     "concept": "1eb05918-f50c-4cad-a827-3c78f296a10a",
                     "label": "VL",
@@ -966,13 +966,7 @@
                   }
                 ]
               },
-              "validators": [
-                {
-                  "type": "js_expression",
-                  "failsWhenExpression": "testsOrdered.map(test => test.concept).filter(item => item === '1eb05918-f50c-4cad-a827-3c78f296a10a').length > 1",
-                  "message": "You cannot add 'VL' more than once."
-                }
-              ]
+              "validators": []
             },
             {
               "label": "Indication for viral load testing",
diff --git a/omod/src/main/webapp/resources/jsonforms/HMIS-LAB-001-GENERAL-LABORATORY-TEST-REQUEST-FORM.json b/omod/src/main/webapp/resources/jsonforms/HMIS-LAB-001-GENERAL-LABORATORY-TEST-REQUEST-FORM.json
index 1b98a784..fed2ee53 100644
--- a/omod/src/main/webapp/resources/jsonforms/HMIS-LAB-001-GENERAL-LABORATORY-TEST-REQUEST-FORM.json
+++ b/omod/src/main/webapp/resources/jsonforms/HMIS-LAB-001-GENERAL-LABORATORY-TEST-REQUEST-FORM.json
@@ -1,5 +1,5 @@
 {
-  "name": "HMIS LAB 001:GENERAL LABORATORY TEST REQUEST FORM",
+  "name": "HMIS LAB 001:General Laboratory Test Request Form",
   "version": "4.0.0",
   "description": "A request for Lab test to Lab",
   "encounterType": "cbf01392-ca29-11e9-a32f-2a2ae2dbcce4",