diff --git a/packages/fhir-group-management/src/components/CommodityAddEdit/Default/tests/index.test.tsx b/packages/fhir-group-management/src/components/CommodityAddEdit/Default/tests/index.test.tsx
index 0122a0054..cd13af01c 100644
--- a/packages/fhir-group-management/src/components/CommodityAddEdit/Default/tests/index.test.tsx
+++ b/packages/fhir-group-management/src/components/CommodityAddEdit/Default/tests/index.test.tsx
@@ -16,6 +16,7 @@ import { groupResourceType, listResourceType, unitOfMeasure } from '../../../../
 import userEvent from '@testing-library/user-event';
 import * as notifications from '@opensrp/notifications';
 import flushPromises from 'flush-promises';
+import { fillSearchableSelect } from './test-utils';
 
 jest.mock('@opensrp/notifications', () => ({
   __esModule: true,
@@ -473,50 +474,3 @@ test('#1116 adding new group but list does not exist', async () => {
 
   await flushPromises();
 });
-
-export interface SearchableSelectValues {
-  selectId: string;
-  searchOptionText: string;
-  fullOptionText: string;
-  beforeFilterOptions: string[];
-  afterFilterOptions: string[];
-}
-
-/**
- * @param searchableSelectOptions options
- */
-export function fillSearchableSelect(searchableSelectOptions: SearchableSelectValues) {
-  const { selectId, fullOptionText, searchOptionText, beforeFilterOptions, afterFilterOptions } =
-    searchableSelectOptions;
-
-  // simulate value selection for type
-  const selectComponent = document.querySelector(`input#${selectId}`)!;
-  fireEvent.mouseDown(selectComponent);
-
-  const optionTexts = [
-    ...document.querySelectorAll(
-      `#${selectId}_list+div.rc-virtual-list .ant-select-item-option-content`
-    ),
-  ].map((option) => {
-    return option.textContent;
-  });
-
-  expect(optionTexts).toHaveLength(beforeFilterOptions.length);
-  expect(optionTexts).toEqual(beforeFilterOptions);
-
-  // filter searching through members works
-  userEvent.type(selectComponent, searchOptionText);
-
-  // options after search
-  const afterFilterOptionTexts = [
-    ...document.querySelectorAll(
-      `#${selectId}_list+div.rc-virtual-list .ant-select-item-option-content`
-    ),
-  ].map((option) => {
-    return option.textContent;
-  });
-
-  expect(afterFilterOptionTexts).toEqual(afterFilterOptions);
-
-  fireEvent.click(document.querySelector(`[title="${fullOptionText}"]`)!);
-}
diff --git a/packages/fhir-group-management/src/components/CommodityAddEdit/Default/tests/test-utils.ts b/packages/fhir-group-management/src/components/CommodityAddEdit/Default/tests/test-utils.ts
new file mode 100644
index 000000000..411275062
--- /dev/null
+++ b/packages/fhir-group-management/src/components/CommodityAddEdit/Default/tests/test-utils.ts
@@ -0,0 +1,50 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+import { fireEvent } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+
+export interface SearchableSelectValues {
+  selectId: string;
+  searchOptionText: string;
+  fullOptionText: string;
+  beforeFilterOptions: string[];
+  afterFilterOptions: string[];
+}
+
+/**
+ * @param searchableSelectOptions options
+ */
+export function fillSearchableSelect(searchableSelectOptions: SearchableSelectValues) {
+  const { selectId, fullOptionText, searchOptionText, beforeFilterOptions, afterFilterOptions } =
+    searchableSelectOptions;
+
+  // simulate value selection for type
+  const selectComponent = document.querySelector(`input#${selectId}`)!;
+  fireEvent.mouseDown(selectComponent);
+
+  const optionTexts = [
+    ...document.querySelectorAll(
+      `#${selectId}_list+div.rc-virtual-list .ant-select-item-option-content`
+    ),
+  ].map((option) => {
+    return option.textContent;
+  });
+
+  expect(optionTexts).toHaveLength(beforeFilterOptions.length);
+  expect(optionTexts).toEqual(beforeFilterOptions);
+
+  // filter searching through members works
+  userEvent.type(selectComponent, searchOptionText);
+
+  // options after search
+  const afterFilterOptionTexts = [
+    ...document.querySelectorAll(
+      `#${selectId}_list+div.rc-virtual-list .ant-select-item-option-content`
+    ),
+  ].map((option) => {
+    return option.textContent;
+  });
+
+  expect(afterFilterOptionTexts).toEqual(afterFilterOptions);
+
+  fireEvent.click(document.querySelector(`[title="${fullOptionText}"]`)!);
+}
diff --git a/packages/fhir-group-management/src/components/CommodityAddEdit/Eusm/tests/__snapshots__/index.test.tsx.snap b/packages/fhir-group-management/src/components/CommodityAddEdit/Eusm/tests/__snapshots__/index.test.tsx.snap
index d225727f1..0d1af58e0 100644
--- a/packages/fhir-group-management/src/components/CommodityAddEdit/Eusm/tests/__snapshots__/index.test.tsx.snap
+++ b/packages/fhir-group-management/src/components/CommodityAddEdit/Eusm/tests/__snapshots__/index.test.tsx.snap
@@ -11,15 +11,6 @@ exports[`renders correctly: active radio button 1`] = `
 />
 `;
 
-exports[`renders correctly: active radio button 2`] = `
-<input
-  checked=""
-  class="ant-radio-input"
-  type="radio"
-  value="true"
-/>
-`;
-
 exports[`renders correctly: attractive item no radio button 1`] = `
 <input
   class="ant-radio-input"
@@ -43,11 +34,3 @@ exports[`renders correctly: disabled radio button 1`] = `
   value="false"
 />
 `;
-
-exports[`renders correctly: disabled radio button 2`] = `
-<input
-  class="ant-radio-input"
-  type="radio"
-  value="false"
-/>
-`;
diff --git a/packages/fhir-group-management/src/components/CommodityAddEdit/Eusm/tests/index.test.tsx b/packages/fhir-group-management/src/components/CommodityAddEdit/Eusm/tests/index.test.tsx
index b6af08b51..f82b0ca7a 100644
--- a/packages/fhir-group-management/src/components/CommodityAddEdit/Eusm/tests/index.test.tsx
+++ b/packages/fhir-group-management/src/components/CommodityAddEdit/Eusm/tests/index.test.tsx
@@ -24,9 +24,9 @@ import {
 import { binaryResourceType, groupResourceType, listResourceType } from '../../../../constants';
 import userEvent from '@testing-library/user-event';
 import * as notifications from '@opensrp/notifications';
-import { fillSearchableSelect } from '../../Default/tests/index.test';
 import { photoUploadCharacteristicCode } from '../../../../helpers/utils';
 import { cloneDeep } from 'lodash';
+import { fillSearchableSelect } from '../../Default/tests/test-utils';
 
 jest.mock('@opensrp/notifications', () => ({
   __esModule: true,
diff --git a/packages/fhir-group-management/src/components/LocationInventory/form.tsx b/packages/fhir-group-management/src/components/LocationInventory/form.tsx
index 0070d306a..e856edae8 100644
--- a/packages/fhir-group-management/src/components/LocationInventory/form.tsx
+++ b/packages/fhir-group-management/src/components/LocationInventory/form.tsx
@@ -10,7 +10,6 @@ import {
 import { useTranslation } from '../../mls';
 import { useQueryClient, useMutation } from 'react-query';
 import { supplyMgSnomedCode, snomedCodeSystem } from '../../helpers/utils';
-import { Rule } from 'rc-field-form/lib/interface';
 import {
   sendSuccessNotification,
   sendErrorNotification,
@@ -33,6 +32,7 @@ import {
   name,
   type,
   actual,
+  unicefDonorValueSetId,
 } from '../../constants';
 import {
   getLocationInventoryPayload,
@@ -149,12 +149,7 @@ const AddLocationInventoryForm = (props: LocationInventoryFormProps) => {
     }
   };
 
-  const validationRules = validationRulesFactory(t);
-  let serialNumebrRule: Rule[] = [{ required: false }];
-  if (attractiveProduct) {
-    serialNumebrRule = validationRules[serialNumber];
-  }
-
+  const validationRules = validationRulesFactory(t, attractiveProduct);
   const productQueryFilters = getProductQueryFilters(commodityListId);
 
   return (
@@ -167,25 +162,25 @@ const AddLocationInventoryForm = (props: LocationInventoryFormProps) => {
       }}
       initialValues={initialValues}
     >
-      <FormItem id="project" name={product} label={t('Product name')}>
+      <FormItem id={product} name={product} label={t('Product name')}>
         <PaginatedAsyncSelect<IGroup>
           baseUrl={fhirBaseURL}
           resourceType={groupResourceType}
           transformOption={processProductOptions}
           extraQueryParams={productQueryFilters}
-          showSearch={true}
+          showSearch={false}
           placeholder={t('Select product')}
           getFullOptionOnChange={productChangeHandler}
           disabled={editMode}
         />
       </FormItem>
 
-      <FormItem id="quantity" name={quantity} label={t('Quantity')}>
-        <Input placeholder={t('Quantity')} type="number" />
+      <FormItem id={quantity} name={quantity} label={t('Quantity')}>
+        <Input min={0} placeholder={t('Quantity')} type="number" />
       </FormItem>
 
       <FormItem
-        id="deliveryDate"
+        id={deliveryDate}
         rules={validationRules[deliveryDate]}
         name={deliveryDate}
         label={t('Delivery date')}
@@ -198,7 +193,7 @@ const AddLocationInventoryForm = (props: LocationInventoryFormProps) => {
       </FormItem>
 
       <FormItem
-        id="accounterbilityEndDate"
+        id={accountabilityEndDate}
         name={accountabilityEndDate}
         label={t('Accountability end date')}
         rules={validationRules[accountabilityEndDate]}
@@ -225,30 +220,30 @@ const AddLocationInventoryForm = (props: LocationInventoryFormProps) => {
       </FormItem>
 
       <FormItem
-        id="serialNumber"
-        rules={serialNumebrRule}
+        id={serialNumber}
+        rules={validationRules[serialNumber]}
         name={serialNumber}
         label={t('Serial number')}
       >
-        <Input disabled={!attractiveProduct} type="number" placeholder={t('Serial number')} />
+        <Input disabled={!attractiveProduct} placeholder={t('Serial number')} />
       </FormItem>
 
       <FormItem id={donor} name={donor} label={t('Donor')}>
         <ValueSetAsyncSelect
           placeholder={t('Select donor')}
           showSearch={true}
-          valueSetId={unicefSectionValueSetId}
+          valueSetId={unicefDonorValueSetId}
           fhirBaseUrl={fhirBaseURL}
         />
       </FormItem>
 
       <FormItem
-        id="poNumber"
+        id={PONumber}
         rules={validationRules[PONumber]}
         name={PONumber}
         label={t('PO number')}
       >
-        <Input type="number" placeholder={t('PO number')} />
+        <Input placeholder={t('PO number')} />
       </FormItem>
 
       {/* start hidden fields */}
@@ -272,7 +267,7 @@ const AddLocationInventoryForm = (props: LocationInventoryFormProps) => {
       <FormItem {...tailLayout}>
         <Space>
           <Button type="primary" id="submit-button" disabled={isLoading} htmlType="submit">
-            {isLoading ? t('Saving') : t('save')}
+            {isLoading ? t('Saving') : t('Save')}
           </Button>
           <Button id="cancel-button" onClick={() => history.goBack()}>
             {t('Cancel')}
diff --git a/packages/fhir-group-management/src/components/LocationInventory/tests/fixtures.ts b/packages/fhir-group-management/src/components/LocationInventory/tests/fixtures.ts
index e016b5c82..720d4a8c4 100644
--- a/packages/fhir-group-management/src/components/LocationInventory/tests/fixtures.ts
+++ b/packages/fhir-group-management/src/components/LocationInventory/tests/fixtures.ts
@@ -197,12 +197,7 @@ export const locationResourcePayload = {
 export const locationInventoryList = {
   resourceType: 'List',
   id: '67bb848e-f049-41f4-9c75-3b726664db67',
-  identifier: [
-    {
-      use: 'official',
-      value: '67bb848e-f049-41f4-9c75-3b726664db67',
-    },
-  ],
+  identifier: [{ use: 'official', value: '67bb848e-f049-41f4-9c75-3b726664db67' }],
   status: 'current',
   code: {
     coding: [
@@ -215,9 +210,7 @@ export const locationInventoryList = {
     text: 'Supply Inventory List',
   },
   title: 'Service Point',
-  subject: {
-    reference: `Location/${servicePointId}`,
-  },
+  subject: { reference: 'Location/46bb8a3f-cf50-4cc2-b421-fe4f77c3e75d' },
   entry: [
     {
       flag: {
@@ -230,23 +223,16 @@ export const locationInventoryList = {
         ],
         text: 'Supply Inventory List',
       },
-      date: '2024-03-25T17:40:23.971Z',
-      item: {
-        reference: `Group/${mockResourceId}`,
-      },
+      date: '2017-07-13T19:31:00.000Z',
+      item: { reference: 'Group/67bb848e-f049-41f4-9c75-3b726664db67' },
     },
   ],
 };
 
-export const locationServicePointList = {
+export const allInventoryList = {
   resourceType: 'List',
   id: 'list-resource-id',
-  identifier: [
-    {
-      use: 'official',
-      value: 'list-resource-id',
-    },
-  ],
+  identifier: [{ use: 'official', value: 'list-resource-id' }],
   status: 'current',
   code: {
     coding: [
@@ -260,5 +246,976 @@ export const locationServicePointList = {
   },
   mode: 'working',
   title: 'Supply Chain commodities',
-  entry: [],
+  entry: [
+    { item: { reference: 'Group/67bb848e-f049-41f4-9c75-3b726664db67' } },
+    { item: { reference: 'List/67bb848e-f049-41f4-9c75-3b726664db67' } },
+  ],
+};
+
+export const productsList = {
+  resourceType: 'Bundle',
+  id: 'df796c9e-002c-47ff-a88f-6b86edca9262',
+  meta: {
+    lastUpdated: '2024-04-03T07:56:54.936+00:00',
+  },
+  type: 'searchset',
+  total: 6,
+  link: [
+    {
+      relation: 'self',
+      url: 'https://unicef-mg-eusm-preview.smartregister.org/fhir/Group/_search?_count=20&_getpagesoffset=0&_has%3AList%3Aitem%3A_id=ea15c35a-8e8c-47ce-8122-c347cefa1b4a&code=http%3A%2F%2Fsnomed.info%2Fsct%7C386452003',
+    },
+  ],
+  entry: [
+    {
+      fullUrl:
+        'https://unicef-mg-eusm-preview.smartregister.org/fhir/Group/5421983c-6701-4ecc-820d-3d9f3da77829',
+      resource: {
+        resourceType: 'Group',
+        id: '5421983c-6701-4ecc-820d-3d9f3da77829',
+        meta: {
+          versionId: '1',
+          lastUpdated: '2024-03-27T14:30:25.701+00:00',
+          source: '#0046f4275e77e281',
+        },
+        identifier: [
+          {
+            use: 'official',
+            value: '585895',
+          },
+        ],
+        active: true,
+        type: 'substance',
+        code: {
+          coding: [
+            {
+              system: 'http://snomed.info/sct',
+              code: '386452003',
+              display: 'Supply management',
+            },
+          ],
+        },
+        name: 'Yellow sunshine',
+        characteristic: [
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '67869606',
+                  display: 'Accountability period (in months)',
+                },
+              ],
+            },
+            valueQuantity: {
+              value: 24,
+            },
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '56758595',
+                  display: 'Is it being used appropriately? (optional)',
+                },
+              ],
+            },
+            valueCodeableConcept: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '56758595-1',
+                  display: 'Value entered on the Is it being used appropriately? (optional)',
+                },
+              ],
+              text: 'Yellow sunshine',
+            },
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '45647484',
+                  display: 'Is it in good condition? (optional)',
+                },
+              ],
+            },
+            valueCodeableConcept: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '45647484-1',
+                  display: 'Value entered on the Is it in good condition? (optional)',
+                },
+              ],
+              text: 'Sunshine',
+            },
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '34536373',
+                  display: 'Is it there code',
+                },
+              ],
+            },
+            valueCodeableConcept: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '34536373-1',
+                  display: 'Value entered on the It is there code',
+                },
+              ],
+              text: 'Yelllow',
+            },
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '23435363',
+                  display: 'Attractive Item code',
+                },
+              ],
+            },
+            valueBoolean: false,
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '1231415',
+                  display: 'Product Image code',
+                },
+              ],
+            },
+            valueReference: {
+              reference: 'Binary/7c5445cc-8bc8-4545-86b0-f36f46e3e631',
+            },
+          },
+        ],
+      },
+      search: {
+        mode: 'match',
+      },
+    },
+    {
+      fullUrl:
+        'https://unicef-mg-eusm-preview.smartregister.org/fhir/Group/d538bfbd-5f35-47ec-b54f-63bb98cba83e',
+      resource: {
+        resourceType: 'Group',
+        id: 'd538bfbd-5f35-47ec-b54f-63bb98cba83e',
+        meta: {
+          versionId: '2',
+          lastUpdated: '2024-03-27T14:37:23.892+00:00',
+          source: '#745956222c5d8747',
+        },
+        identifier: [
+          {
+            use: 'official',
+            value: '678899',
+          },
+        ],
+        active: true,
+        type: 'device',
+        code: {
+          coding: [
+            {
+              system: 'http://snomed.info/sct',
+              code: '386452003',
+              display: 'Supply management',
+            },
+          ],
+        },
+        name: 'Fig tree',
+        characteristic: [
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '67869606',
+                  display: 'Accountability period (in months)',
+                },
+              ],
+            },
+            valueQuantity: {
+              value: 12,
+            },
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '56758595',
+                  display: 'Is it being used appropriately? (optional)',
+                },
+              ],
+            },
+            valueCodeableConcept: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '56758595-1',
+                  display: 'Value entered on the Is it being used appropriately? (optional)',
+                },
+              ],
+              text: 'The tree provides a shade',
+            },
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '45647484',
+                  display: 'Is it in good condition? (optional)',
+                },
+              ],
+            },
+            valueCodeableConcept: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '45647484-1',
+                  display: 'Value entered on the Is it in good condition? (optional)',
+                },
+              ],
+              text: 'All leaves are intact....',
+            },
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '34536373',
+                  display: 'Is it there code',
+                },
+              ],
+            },
+            valueCodeableConcept: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '34536373-1',
+                  display: 'Value entered on the It is there code',
+                },
+              ],
+              text: 'It is green and straight',
+            },
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '23435363',
+                  display: 'Attractive Item code',
+                },
+              ],
+            },
+            valueBoolean: true,
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '1231415',
+                  display: 'Product Image code',
+                },
+              ],
+            },
+            valueReference: {
+              reference: 'Binary/cdf20d3a-4cdc-479f-bd89-b6d4ba614fa3',
+            },
+          },
+        ],
+      },
+      search: {
+        mode: 'match',
+      },
+    },
+    {
+      fullUrl:
+        'https://unicef-mg-eusm-preview.smartregister.org/fhir/Group/19571c2b-c0e7-4abb-90da-a6a9a3d38a24',
+      resource: {
+        resourceType: 'Group',
+        id: '19571c2b-c0e7-4abb-90da-a6a9a3d38a24',
+        meta: {
+          versionId: '1',
+          lastUpdated: '2024-03-27T15:10:25.788+00:00',
+          source: '#9730c4d2c34ea089',
+        },
+        identifier: [
+          {
+            use: 'official',
+            value: '3868696',
+          },
+        ],
+        active: true,
+        type: 'substance',
+        code: {
+          coding: [
+            {
+              system: 'http://snomed.info/sct',
+              code: '386452003',
+              display: 'Supply management',
+            },
+          ],
+        },
+        name: 'Lumpy nuts',
+        characteristic: [
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '67869606',
+                  display: 'Accountability period (in months)',
+                },
+              ],
+            },
+            valueQuantity: {
+              value: 6,
+            },
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '56758595',
+                  display: 'Is it being used appropriately? (optional)',
+                },
+              ],
+            },
+            valueCodeableConcept: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '56758595-1',
+                  display: 'Value entered on the Is it being used appropriately? (optional)',
+                },
+              ],
+              text: '.',
+            },
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '45647484',
+                  display: 'Is it in good condition? (optional)',
+                },
+              ],
+            },
+            valueCodeableConcept: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '45647484-1',
+                  display: 'Value entered on the Is it in good condition? (optional)',
+                },
+              ],
+              text: '.',
+            },
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '34536373',
+                  display: 'Is it there code',
+                },
+              ],
+            },
+            valueCodeableConcept: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '34536373-1',
+                  display: 'Value entered on the It is there code',
+                },
+              ],
+              text: '.',
+            },
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '23435363',
+                  display: 'Attractive Item code',
+                },
+              ],
+            },
+            valueBoolean: true,
+          },
+        ],
+      },
+      search: {
+        mode: 'match',
+      },
+    },
+    {
+      fullUrl:
+        'https://unicef-mg-eusm-preview.smartregister.org/fhir/Group/c8ccbac8-ef33-4c3a-b209-ab9047e7bb13',
+      resource: {
+        resourceType: 'Group',
+        id: 'c8ccbac8-ef33-4c3a-b209-ab9047e7bb13',
+        meta: {
+          versionId: '1',
+          lastUpdated: '2024-03-27T15:12:12.796+00:00',
+          source: '#b7a6880d7abb2e21',
+        },
+        identifier: [
+          {
+            use: 'official',
+            value: '677889',
+          },
+        ],
+        active: true,
+        type: 'medication',
+        code: {
+          coding: [
+            {
+              system: 'http://snomed.info/sct',
+              code: '386452003',
+              display: 'Supply management',
+            },
+          ],
+        },
+        name: 'Happy Feet',
+        characteristic: [
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '67869606',
+                  display: 'Accountability period (in months)',
+                },
+              ],
+            },
+            valueQuantity: {
+              value: 24,
+            },
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '56758595',
+                  display: 'Is it being used appropriately? (optional)',
+                },
+              ],
+            },
+            valueCodeableConcept: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '56758595-1',
+                  display: 'Value entered on the Is it being used appropriately? (optional)',
+                },
+              ],
+              text: '.',
+            },
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '45647484',
+                  display: 'Is it in good condition? (optional)',
+                },
+              ],
+            },
+            valueCodeableConcept: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '45647484-1',
+                  display: 'Value entered on the Is it in good condition? (optional)',
+                },
+              ],
+              text: '.',
+            },
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '34536373',
+                  display: 'Is it there code',
+                },
+              ],
+            },
+            valueCodeableConcept: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '34536373-1',
+                  display: 'Value entered on the It is there code',
+                },
+              ],
+              text: '.',
+            },
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '23435363',
+                  display: 'Attractive Item code',
+                },
+              ],
+            },
+            valueBoolean: true,
+          },
+        ],
+      },
+      search: {
+        mode: 'match',
+      },
+    },
+    {
+      fullUrl:
+        'https://unicef-mg-eusm-preview.smartregister.org/fhir/Group/03a19f4e-712e-4436-868b-f6814f2f601b',
+      resource: {
+        resourceType: 'Group',
+        id: '03a19f4e-712e-4436-868b-f6814f2f601b',
+        meta: {
+          versionId: '2',
+          lastUpdated: '2024-04-02T07:25:37.804+00:00',
+          source: '#5ef74a9b63ccaf71',
+        },
+        identifier: [
+          {
+            use: 'official',
+            value: '56dtdhdh',
+          },
+        ],
+        active: true,
+        type: 'medication',
+        code: {
+          coding: [
+            {
+              system: 'http://snomed.info/sct',
+              code: '386452003',
+              display: 'Supply management',
+            },
+          ],
+        },
+        name: 'Lilly Flowers',
+        characteristic: [
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '67869606',
+                  display: 'Accountability period (in months)',
+                },
+              ],
+            },
+            valueQuantity: {
+              value: 6,
+            },
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '56758595',
+                  display: 'Is it being used appropriately? (optional)',
+                },
+              ],
+            },
+            valueCodeableConcept: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '56758595-1',
+                  display: 'Value entered on the Is it being used appropriately? (optional)',
+                },
+              ],
+              text: 'Test',
+            },
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '45647484',
+                  display: 'Is it in good condition? (optional)',
+                },
+              ],
+            },
+            valueCodeableConcept: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '45647484-1',
+                  display: 'Value entered on the Is it in good condition? (optional)',
+                },
+              ],
+              text: 'Test',
+            },
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '34536373',
+                  display: 'Is it there code',
+                },
+              ],
+            },
+            valueCodeableConcept: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '34536373-1',
+                  display: 'Value entered on the It is there code',
+                },
+              ],
+              text: 'Test',
+            },
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '23435363',
+                  display: 'Attractive Item code',
+                },
+              ],
+            },
+            valueBoolean: false,
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '1231415',
+                  display: 'Product Image code',
+                },
+              ],
+            },
+            valueReference: {
+              reference: 'Binary/f9b34d49-dc7f-4665-9332-34481d2c3e27',
+            },
+          },
+        ],
+      },
+      search: {
+        mode: 'match',
+      },
+    },
+    {
+      fullUrl:
+        'https://unicef-mg-eusm-preview.smartregister.org/fhir/Group/77d1a095-7bb1-400b-8018-39833a3328c4',
+      resource: {
+        resourceType: 'Group',
+        id: '77d1a095-7bb1-400b-8018-39833a3328c4',
+        meta: {
+          versionId: '3',
+          lastUpdated: '2024-04-02T08:23:12.026+00:00',
+          source: '#f504e8a8c4ee5c90',
+        },
+        identifier: [
+          {
+            use: 'official',
+            value: '1111',
+          },
+        ],
+        active: true,
+        type: 'device',
+        code: {
+          coding: [
+            {
+              system: 'http://snomed.info/sct',
+              code: '386452003',
+              display: 'Supply management',
+            },
+          ],
+        },
+        name: 'Smartphone TEST',
+        characteristic: [
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '67869606',
+                  display: 'Accountability period (in months)',
+                },
+              ],
+            },
+            valueQuantity: {
+              value: 37,
+            },
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '34536373',
+                  display: 'Is it there code',
+                },
+              ],
+            },
+            valueCodeableConcept: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '34536373-1',
+                  display: 'Value entered on the It is there code',
+                },
+              ],
+              text: 'TEST',
+            },
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '23435363',
+                  display: 'Attractive Item code',
+                },
+              ],
+            },
+            valueBoolean: false,
+          },
+          {
+            code: {
+              coding: [
+                {
+                  system: 'http://smartregister.org/codes',
+                  code: '1231415',
+                  display: 'Product Image code',
+                },
+              ],
+            },
+            valueReference: {
+              reference: 'Binary/d291217a-f3df-4515-9d44-5f8b48b62482',
+            },
+          },
+        ],
+      },
+      search: {
+        mode: 'match',
+      },
+    },
+  ],
+};
+
+export const unicefSectionValueSet = {
+  resourceType: 'ValueSet',
+  id: 'eusm-unicef-sections',
+  meta: {
+    extension: [
+      {
+        url: 'http://hapifhir.io/fhir/StructureDefinition/valueset-expansion-message',
+        valueString:
+          'ValueSet was expanded using an expansion that was pre-calculated at 2024-04-03T09:41:34.832+00:00 (00:33:04 ago)',
+      },
+    ],
+    versionId: '3',
+  },
+  url: 'http://smartregister.org/ValueSet/eusm-unicef-sections',
+  status: 'active',
+  compose: {
+    include: [
+      {
+        system: 'http://smartregister.org/CodeSystem/eusm-unicef-sections',
+        concept: [
+          {
+            code: 'health',
+            display: 'Health',
+          },
+          {
+            code: 'wash',
+            display: 'WASH',
+          },
+        ],
+      },
+    ],
+  },
+  expansion: {
+    identifier: '0f8081e7-3e92-47a5-808c-ee2fc28db72b',
+    timestamp: '2024-04-03T10:14:39+00:00',
+    total: 0,
+    offset: 0,
+    parameter: [
+      {
+        name: 'offset',
+        valueInteger: 0,
+      },
+      {
+        name: 'count',
+        valueInteger: 1000,
+      },
+    ],
+  },
+};
+
+export const unicefDonorsValueSet = {
+  resourceType: 'ValueSet',
+  id: 'eusm-donors',
+  meta: {
+    extension: [
+      {
+        url: 'http://hapifhir.io/fhir/StructureDefinition/valueset-expansion-message',
+        valueString:
+          'ValueSet was expanded using an expansion that was pre-calculated at 2024-04-03T09:49:53.280+00:00 (00:26:07 ago)',
+      },
+    ],
+    versionId: '3',
+  },
+  url: 'http://smartregister.org/ValueSet/eusm-donors',
+  status: 'active',
+  compose: {
+    include: [
+      {
+        system: 'http://smartregister.org/CodeSystem/eusm-donors',
+        concept: [
+          {
+            code: 'adb',
+            display: 'ADB',
+          },
+          {
+            code: 'natcom belgium',
+            display: 'NatCom Belgium',
+          },
+          {
+            code: 'bmgf',
+            display: 'BMGF',
+          },
+        ],
+      },
+    ],
+  },
+  expansion: {
+    identifier: 'adbcad78-0ad0-4555-a7dc-cc252ff96bda',
+    timestamp: '2024-04-03T10:16:01+00:00',
+    total: 0,
+    offset: 0,
+    parameter: [
+      {
+        name: 'offset',
+        valueInteger: 0,
+      },
+      {
+        name: 'count',
+        valueInteger: 1000,
+      },
+    ],
+  },
+};
+
+export const createdInventoryGroup1 = {
+  resourceType: 'Group',
+  id: '67bb848e-f049-41f4-9c75-3b726664db67',
+  active: true,
+  actual: false,
+  type: 'substance',
+  identifier: [
+    {
+      use: 'secondary',
+      type: {
+        coding: [{ system: 'http://smartregister.org/codes', code: 'PONUM', display: 'PO Number' }],
+        text: 'PO Number',
+      },
+      value: '578643',
+    },
+    {
+      use: 'official',
+      type: {
+        coding: [
+          { system: 'http://smartregister.org/codes', code: 'SERNUM', display: 'Serial Number' },
+        ],
+        text: 'Serial Number',
+      },
+      value: 'yk254',
+    },
+  ],
+  member: [
+    {
+      entity: { reference: 'Group/19571c2b-c0e7-4abb-90da-a6a9a3d38a24' },
+      period: { start: '2024-03-25T08:24:51.149Z', end: '2024-03-26T08:24:53.645Z' },
+      inactive: false,
+    },
+  ],
+  characteristic: [
+    {
+      code: {
+        coding: [
+          { system: 'http://smartregister.org/codes', code: '98734231', display: 'Unicef Section' },
+        ],
+      },
+      valueCodeableConcept: {
+        coding: [
+          {
+            code: 'health',
+            display: 'Health',
+            system: 'http://smartregister.org/CodeSystem/eusm-unicef-sections',
+          },
+        ],
+        text: 'Health',
+      },
+    },
+    {
+      code: {
+        coding: [{ system: 'http://smartregister.org/codes', code: '45981276', display: 'Donor' }],
+      },
+      valueCodeableConcept: {
+        coding: [
+          {
+            code: 'adb',
+            display: 'ADB',
+            system: 'http://smartregister.org/CodeSystem/eusm-donors',
+          },
+        ],
+        text: 'ADB',
+      },
+    },
+    {
+      code: {
+        coding: [
+          { system: 'http://smartregister.org/codes', code: '33467722', display: 'Quantity ' },
+        ],
+      },
+      valueQuantity: { value: '20' },
+    },
+  ],
+  code: {
+    coding: [
+      { system: 'http://smartregister.org/codes', code: '78991122', display: 'Supply Inventory' },
+    ],
+  },
 };
diff --git a/packages/fhir-group-management/src/components/LocationInventory/tests/form.test.tsx b/packages/fhir-group-management/src/components/LocationInventory/tests/form.test.tsx
index 0533b0be7..aac2c255a 100644
--- a/packages/fhir-group-management/src/components/LocationInventory/tests/form.test.tsx
+++ b/packages/fhir-group-management/src/components/LocationInventory/tests/form.test.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import React from 'react';
 import { QueryClient, QueryClientProvider } from 'react-query';
 import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';
@@ -14,8 +15,25 @@ import {
   formValues,
   locationResourcePayload,
   locationInventoryList,
-  locationServicePointList,
+  allInventoryList,
+  productsList,
+  unicefDonorsValueSet,
+  unicefSectionValueSet,
+  createdInventoryGroup1,
 } from './fixtures';
+import {
+  donor,
+  groupResourceType,
+  listResourceType,
+  product,
+  unicefDonorValueSetId,
+  unicefSection,
+  unicefSectionValueSetId,
+} from '../../../constants';
+import { valueSetResourceType } from '@opensrp/react-utils';
+
+import dayjs from 'dayjs';
+import { fillSearchableSelect } from '../../CommodityAddEdit/Default/tests/test-utils';
 
 jest.mock('@opensrp/notifications', () => ({
   __esModule: true,
@@ -53,6 +71,7 @@ const props = {
   inventoryResourceObj: undefined,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   servicePointObj: servicePointDatum as any,
+  commodityListId: 'products-resource-id',
 };
 
 beforeAll(() => {
@@ -108,35 +127,49 @@ test('form validation works', async () => {
   const errorNodes = [...document.querySelectorAll('.ant-form-item-explain-error')];
   const errorMsgs = errorNodes.map((node) => node.textContent);
 
-  expect(errorMsgs).toEqual(['Required', 'Required', 'Required', 'Required']);
+  expect(errorMsgs).toEqual([
+    'Delivery date is required',
+    'Accountability end date is required',
+    'UNICEF section is required',
+    'PO number is required',
+  ]);
 });
 
-it('creates new product as expected', async () => {
-  props.initialValues = formValues;
-
-  nock(props.fhirBaseURL)
-    .put(`/Group/${mockResourceId}`)
-    .reply(201, locationResourcePayload)
+test('creates new inventory as expected', async () => {
+  const thisProps = {
+    ...props,
+    initialValues: {
+      // TODO - hack -> Could not yet find a way to reliably mock dates when simulating datepicker
+      deliveryDate: dayjs('2024-03-25T08:24:51.149Z'),
+      accountabilityEndDate: dayjs('2024-03-26T08:24:53.645Z'),
+    },
+  };
+  const preFetchScope = nock(props.fhirBaseURL)
+    .get(`/${groupResourceType}/_search`)
+    .query({
+      _getpagesoffset: 0,
+      _count: 20,
+      code: 'http://snomed.info/sct|386452003',
+      '_has:List:item:_id': props.commodityListId,
+    })
+    .reply(200, productsList)
+    .get(`/${valueSetResourceType}/${unicefSectionValueSetId}/$expand`)
+    .reply(200, unicefSectionValueSet)
+    .get(`/${valueSetResourceType}/${unicefDonorValueSetId}/$expand`)
+    .reply(200, unicefDonorsValueSet)
     .persist();
 
-  nock(props.fhirBaseURL)
-    .put(`/List/${mockResourceId}`)
+  const postCreationalScope = nock(props.fhirBaseURL)
+    .put(`/${groupResourceType}/${mockResourceId}`, createdInventoryGroup1)
+    .reply(201, createdInventoryGroup1)
+    .put(`/${listResourceType}/${mockResourceId}`, locationInventoryList)
     .reply(201, locationInventoryList)
-    .persist();
-
-  nock(props.fhirBaseURL)
     .get(`/List/${listResourceId}`)
     .reply(404, { message: 'Not found' })
-    .persist();
-
-  nock(props.fhirBaseURL)
-    .put(`/List/${listResourceId}`)
-    .reply(201, locationServicePointList)
-    .persist();
-
-  nock(props.fhirBaseURL)
-    .put(`/List/${listResourceId}`)
-    .reply(201, locationServicePointList)
+    .put(`/List/${listResourceId}`, { ...allInventoryList, entry: [] })
+    .reply(201, { ...allInventoryList, entry: [] })
+    .put(`/List/${listResourceId}`, allInventoryList)
+    .reply(201, allInventoryList)
     .persist();
 
   const successNoticeMock = jest
@@ -147,17 +180,73 @@ it('creates new product as expected', async () => {
     .spyOn(notifications, 'sendErrorNotification')
     .mockImplementation(() => undefined);
 
-  render(<AppWrapper {...props}></AppWrapper>);
+  render(<AppWrapper {...thisProps}></AppWrapper>);
+
+  await waitFor(() => {
+    expect(preFetchScope.isDone()).toBeTruthy();
+  });
+
+  // simulate value selection for product
+  const productSelectComponent = document.querySelector(`input#${product}`)!;
+  fireEvent.mouseDown(productSelectComponent);
+
+  const optionTexts = [
+    ...document.querySelectorAll(
+      `#${product}_list+div.rc-virtual-list .ant-select-item-option-content`
+    ),
+  ].map((option) => {
+    return option.textContent;
+  });
+
+  expect(optionTexts).toEqual([
+    'Yellow sunshine',
+    'Fig tree',
+    'Lumpy nuts',
+    'Happy Feet',
+    'Lilly Flowers',
+    'Smartphone TEST',
+  ]);
+  fireEvent.click(document.querySelector(`[title="${'Lumpy nuts'}"]`)!);
+
+  const quantity = screen.getByLabelText('Quantity');
+  userEvent.type(quantity, '20');
+
+  const serialNumber = screen.getByLabelText('Serial number');
+  userEvent.type(serialNumber, 'yk254');
+
+  const unicefSectionSelectionCriteria = {
+    selectId: unicefSection,
+    fullOptionText: 'Health',
+    searchOptionText: 'heal',
+    beforeFilterOptions: ['Health', 'WASH'],
+    afterFilterOptions: ['Health'],
+  };
+  fillSearchableSelect(unicefSectionSelectionCriteria);
+
+  const unicefDonorSelectionCriteria = {
+    selectId: donor,
+    fullOptionText: 'ADB',
+    searchOptionText: 'ad',
+    beforeFilterOptions: ['ADB', 'NatCom Belgium', 'BMGF'],
+    afterFilterOptions: ['ADB'],
+  };
+  fillSearchableSelect(unicefDonorSelectionCriteria);
+
+  const poNumber = screen.getByLabelText('PO number');
+  userEvent.type(poNumber, '578643');
 
   fireEvent.click(screen.getByRole('button', { name: /Save/i }));
 
   await waitFor(() => {
+    expect(postCreationalScope.isDone()).toBeTruthy();
     expect(errorNoticeMock).not.toHaveBeenCalled();
     expect(successNoticeMock.mock.calls).toEqual([['Location inventory created successfully']]);
   });
+
+  expect(nock.isDone()).toBeTruthy();
 });
 
-it('edits product as expected', async () => {
+test('edits inventory as expected', async () => {
   props.initialValues = formValues;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   props.inventoryId = mockResourceId as any;
diff --git a/packages/fhir-group-management/src/components/LocationInventory/utils.tsx b/packages/fhir-group-management/src/components/LocationInventory/utils.tsx
index 67d800730..4280f134e 100644
--- a/packages/fhir-group-management/src/components/LocationInventory/utils.tsx
+++ b/packages/fhir-group-management/src/components/LocationInventory/utils.tsx
@@ -542,7 +542,7 @@ export function createLocationInventoryList(
         },
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         date: stringDate as any,
-        item: { reference: `Group/${InventoryResourceId}` },
+        item: { reference: `${groupResourceType}/${InventoryResourceId}` },
       },
     ],
   };
@@ -608,32 +608,34 @@ export const getInventoryInitialValues = (inventory: IGroup): GroupFormFields =>
  * factory for validation rules for GroupForm component
  *
  * @param t - the translator function
+ * @param isAttractiveProduct - tells us if serial number should be required
  */
-export const validationRulesFactory = (t: TFunction) => {
-  return {
+export const validationRulesFactory = (t: TFunction, isAttractiveProduct: boolean) => {
+  const rules = {
     [product]: [
       { type: 'string', message: t('Must be a valid string') },
-      { required: true, message: t('Required') },
+      { required: true, message: t('Product is required') },
     ] as Rule[],
     [unicefSection]: [
       { type: 'string', message: t('Must be a valid string') },
-      { required: true, message: t('Required') },
+      { required: true, message: t('UNICEF section is required') },
     ] as Rule[],
     [deliveryDate]: [
       { type: 'date', message: t('Must be a valid date') },
-      { required: true, message: t('Required') },
+      { required: true, message: t('Delivery date is required') },
     ] as Rule[],
     [accountabilityEndDate]: [
       { type: 'date', message: t('Must be a valid date') },
-      { required: true, message: t('Required') },
-    ] as Rule[],
-    [serialNumber]: [
-      { type: 'string', message: t('Must be a valid string') },
-      { required: true, message: t('Required') },
+      { required: true, message: t('Accountability end date is required') },
     ] as Rule[],
+    [serialNumber]: [{ type: 'string', message: t('Must be a valid string') }] as Rule[],
     [PONumber]: [
       { type: 'string', message: t('Must be a valid string') },
-      { required: true, message: t('Required') },
+      { required: true, message: t('PO number is required') },
     ] as Rule[],
   };
+  if (isAttractiveProduct) {
+    rules[serialNumber].push({ required: true, message: t('Serial number is required') });
+  }
+  return rules;
 };