diff --git a/pdm.lock b/pdm.lock
index 5e301002bb..fa396f63db 100644
--- a/pdm.lock
+++ b/pdm.lock
@@ -5,7 +5,7 @@
 groups = ["default", "dev"]
 strategy = ["cross_platform", "inherit_metadata"]
 lock_version = "4.5.0"
-content_hash = "sha256:f093a6434225351cd3b851fbe94559513d7548aa66fd2db6ea3976673c6e5830"
+content_hash = "sha256:dffcc5e57d10348c34bee7b2599f6f069357d6b2f783dbcb9314a82727d5724d"
 
 [[metadata.targets]]
 requires_python = "==3.12.*"
@@ -104,7 +104,7 @@ files = [
 
 [[package]]
 name = "azure-core"
-version = "1.31.0"
+version = "1.32.0"
 requires_python = ">=3.8"
 summary = "Microsoft Azure Core Library for Python"
 groups = ["default"]
@@ -114,8 +114,8 @@ dependencies = [
     "typing-extensions>=4.6.0",
 ]
 files = [
-    {file = "azure_core-1.31.0-py3-none-any.whl", hash = "sha256:22954de3777e0250029360ef31d80448ef1be13b80a459bff80ba7073379e2cd"},
-    {file = "azure_core-1.31.0.tar.gz", hash = "sha256:656a0dd61e1869b1506b7c6a3b31d62f15984b1a573d6326f6aa2f3e4123284b"},
+    {file = "azure_core-1.32.0-py3-none-any.whl", hash = "sha256:eac191a0efb23bfa83fddf321b27b122b4ec847befa3091fa736a5c32c50d7b4"},
+    {file = "azure_core-1.32.0.tar.gz", hash = "sha256:22b3c35d6b2dae14990f6c1be2912bf23ffe50b220e708a28ab1bb92b1c730e5"},
 ]
 
 [[package]]
@@ -1178,7 +1178,7 @@ files = [
 
 [[package]]
 name = "django-rest-extensions"
-version = "0.2.0"
+version = "1.0.0"
 summary = "create normal api for all your models"
 groups = ["default"]
 dependencies = [
@@ -1186,8 +1186,8 @@ dependencies = [
     "djangorestframework",
 ]
 files = [
-    {file = "django-rest-extensions-0.2.0.tar.gz", hash = "sha256:184df06f1a09d5ce4689d9bff8ea9b80922b998a8b381549db59731523bd9de1"},
-    {file = "django_rest_extensions-0.2.0-py3-none-any.whl", hash = "sha256:56fe9e82c5bc8be71998a7da86610efc786343b7989763a986d93b14c0ace53b"},
+    {file = "django_rest_extensions-1.0.0-py3-none-any.whl", hash = "sha256:f46e7102b5969dc1ee12e8be0162c8e807076b678245d98bbeb5fb94e117b1ee"},
+    {file = "django_rest_extensions-1.0.0.tar.gz", hash = "sha256:3c0b6b2e2448cdf916ff7581c1fd002a70faf50703be4088c94d502d02b4628f"},
 ]
 
 [[package]]
@@ -1491,7 +1491,7 @@ files = [
 
 [[package]]
 name = "drf-spectacular-sidecar"
-version = "2024.7.1"
+version = "2024.11.1"
 requires_python = ">=3.6"
 summary = "Serve self-contained distribution builds of Swagger UI and Redoc with Django"
 groups = ["default"]
@@ -1499,8 +1499,8 @@ dependencies = [
     "Django>=2.2",
 ]
 files = [
-    {file = "drf_spectacular_sidecar-2024.7.1-py3-none-any.whl", hash = "sha256:5dc8b38ad153e90b328152674c7959bf114bf86360a617a5a4516e135cb832bc"},
-    {file = "drf_spectacular_sidecar-2024.7.1.tar.gz", hash = "sha256:beb992d6ece806a2d422ad626983e2472c0a5550de9647a7ed6764716a5abdfe"},
+    {file = "drf_spectacular_sidecar-2024.11.1-py3-none-any.whl", hash = "sha256:e2efd49c5bd1a607fd5d120d9da58d78e587852db8220b8880282a849296ff83"},
+    {file = "drf_spectacular_sidecar-2024.11.1.tar.gz", hash = "sha256:fcfccc72cbdbe41e93f8416fa0c712d14126b8d1629e65c09c07c8edea24aad0"},
 ]
 
 [[package]]
@@ -2548,16 +2548,6 @@ files = [
     {file = "pathspec-0.12.1.tar.gz", hash = "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712"},
 ]
 
-[[package]]
-name = "pdfkit"
-version = "1.0.0"
-summary = "Wkhtmltopdf python wrapper to convert html to pdf using the webkit rendering engine and qt"
-groups = ["default"]
-files = [
-    {file = "pdfkit-1.0.0-py3-none-any.whl", hash = "sha256:a7a4ca0d978e44fa8310c4909f087052430a6e8e0b1dd7ceef657f139789f96f"},
-    {file = "pdfkit-1.0.0.tar.gz", hash = "sha256:992f821e1e18fc8a0e701ecae24b51a2d598296a180caee0a24c0af181da02a9"},
-]
-
 [[package]]
 name = "pexpect"
 version = "4.9.0"
@@ -2574,12 +2564,12 @@ files = [
 
 [[package]]
 name = "phonenumbers"
-version = "8.13.48"
+version = "8.13.49"
 summary = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers."
 groups = ["default"]
 files = [
-    {file = "phonenumbers-8.13.48-py2.py3-none-any.whl", hash = "sha256:5c51939acefa390eb74119750afb10a85d3c628dc83fd62c52d6f532fcf5d205"},
-    {file = "phonenumbers-8.13.48.tar.gz", hash = "sha256:62d8df9b0f3c3c41571c6b396f044ddd999d61631534001b8be7fdf7ba1b18f3"},
+    {file = "phonenumbers-8.13.49-py2.py3-none-any.whl", hash = "sha256:e17140955ab3d8f9580727372ea64c5ada5327932d6021ef6fd203c3db8c8139"},
+    {file = "phonenumbers-8.13.49.tar.gz", hash = "sha256:e608ccb61f0bd42e6db1d2c421f7c22186b88f494870bf40aa31d1a2718ab0ae"},
 ]
 
 [[package]]
@@ -2862,21 +2852,6 @@ files = [
     {file = "pyjwt-2.9.0.tar.gz", hash = "sha256:7e1e5b56cc735432a7369cbfa0efe50fa113ebecdc04ae6922deba8b84582d0c"},
 ]
 
-[[package]]
-name = "pypdf2"
-version = "3.0.1"
-requires_python = ">=3.6"
-summary = "A pure-python PDF library capable of splitting, merging, cropping, and transforming PDF files"
-groups = ["default"]
-dependencies = [
-    "dataclasses; python_version < \"3.7\"",
-    "typing-extensions>=3.10.0.0; python_version < \"3.10\"",
-]
-files = [
-    {file = "PyPDF2-3.0.1.tar.gz", hash = "sha256:a74408f69ba6271f71b9352ef4ed03dc53a31aa404d29b5d31f53bfecfee1440"},
-    {file = "pypdf2-3.0.1-py3-none-any.whl", hash = "sha256:d16e4205cfee272fbdc0568b68d82be796540b1537508cef59388f839c191928"},
-]
-
 [[package]]
 name = "pyphen"
 version = "0.17.0"
@@ -3286,25 +3261,25 @@ files = [
 
 [[package]]
 name = "rpds-py"
-version = "0.20.0"
+version = "0.20.1"
 requires_python = ">=3.8"
 summary = "Python bindings to Rust's persistent data structures (rpds)"
 groups = ["default"]
 files = [
-    {file = "rpds_py-0.20.0-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:a84ab91cbe7aab97f7446652d0ed37d35b68a465aeef8fc41932a9d7eee2c1a6"},
-    {file = "rpds_py-0.20.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:56e27147a5a4c2c21633ff8475d185734c0e4befd1c989b5b95a5d0db699b21b"},
-    {file = "rpds_py-0.20.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2580b0c34583b85efec8c5c5ec9edf2dfe817330cc882ee972ae650e7b5ef739"},
-    {file = "rpds_py-0.20.0-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:b80d4a7900cf6b66bb9cee5c352b2d708e29e5a37fe9bf784fa97fc11504bf6c"},
-    {file = "rpds_py-0.20.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:50eccbf054e62a7b2209b28dc7a22d6254860209d6753e6b78cfaeb0075d7bee"},
-    {file = "rpds_py-0.20.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:49a8063ea4296b3a7e81a5dfb8f7b2d73f0b1c20c2af401fb0cdf22e14711a96"},
-    {file = "rpds_py-0.20.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ea438162a9fcbee3ecf36c23e6c68237479f89f962f82dae83dc15feeceb37e4"},
-    {file = "rpds_py-0.20.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:18d7585c463087bddcfa74c2ba267339f14f2515158ac4db30b1f9cbdb62c8ef"},
-    {file = "rpds_py-0.20.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:d4c7d1a051eeb39f5c9547e82ea27cbcc28338482242e3e0b7768033cb083821"},
-    {file = "rpds_py-0.20.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:e4df1e3b3bec320790f699890d41c59d250f6beda159ea3c44c3f5bac1976940"},
-    {file = "rpds_py-0.20.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:2cf126d33a91ee6eedc7f3197b53e87a2acdac63602c0f03a02dd69e4b138174"},
-    {file = "rpds_py-0.20.0-cp312-none-win32.whl", hash = "sha256:8bc7690f7caee50b04a79bf017a8d020c1f48c2a1077ffe172abec59870f1139"},
-    {file = "rpds_py-0.20.0-cp312-none-win_amd64.whl", hash = "sha256:0e13e6952ef264c40587d510ad676a988df19adea20444c2b295e536457bc585"},
-    {file = "rpds_py-0.20.0.tar.gz", hash = "sha256:d72a210824facfdaf8768cf2d7ca25a042c30320b3020de2fa04640920d4e121"},
+    {file = "rpds_py-0.20.1-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:36785be22066966a27348444b40389f8444671630063edfb1a2eb04318721e17"},
+    {file = "rpds_py-0.20.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:142c0a5124d9bd0e2976089484af5c74f47bd3298f2ed651ef54ea728d2ea42c"},
+    {file = "rpds_py-0.20.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dbddc10776ca7ebf2a299c41a4dde8ea0d8e3547bfd731cb87af2e8f5bf8962d"},
+    {file = "rpds_py-0.20.1-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:15a842bb369e00295392e7ce192de9dcbf136954614124a667f9f9f17d6a216f"},
+    {file = "rpds_py-0.20.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:be5ef2f1fc586a7372bfc355986226484e06d1dc4f9402539872c8bb99e34b01"},
+    {file = "rpds_py-0.20.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbcf360c9e3399b056a238523146ea77eeb2a596ce263b8814c900263e46031a"},
+    {file = "rpds_py-0.20.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ecd27a66740ffd621d20b9a2f2b5ee4129a56e27bfb9458a3bcc2e45794c96cb"},
+    {file = "rpds_py-0.20.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:d0b937b2a1988f184a3e9e577adaa8aede21ec0b38320d6009e02bd026db04fa"},
+    {file = "rpds_py-0.20.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:6889469bfdc1eddf489729b471303739bf04555bb151fe8875931f8564309afc"},
+    {file = "rpds_py-0.20.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:19b73643c802f4eaf13d97f7855d0fb527fbc92ab7013c4ad0e13a6ae0ed23bd"},
+    {file = "rpds_py-0.20.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:3c6afcf2338e7f374e8edc765c79fbcb4061d02b15dd5f8f314a4af2bdc7feb5"},
+    {file = "rpds_py-0.20.1-cp312-none-win32.whl", hash = "sha256:dc73505153798c6f74854aba69cc75953888cf9866465196889c7cdd351e720c"},
+    {file = "rpds_py-0.20.1-cp312-none-win_amd64.whl", hash = "sha256:8bbe951244a838a51289ee53a6bae3a07f26d4e179b96fc7ddd3301caf0518eb"},
+    {file = "rpds_py-0.20.1.tar.gz", hash = "sha256:e1791c4aabd117653530dccd24108fa03cc6baf21f58b950d0a73c3b3b29a350"},
 ]
 
 [[package]]
@@ -3845,13 +3820,13 @@ files = [
 
 [[package]]
 name = "types-setuptools"
-version = "75.2.0.20241025"
+version = "75.3.0.20241105"
 requires_python = ">=3.8"
 summary = "Typing stubs for setuptools"
 groups = ["dev"]
 files = [
-    {file = "types-setuptools-75.2.0.20241025.tar.gz", hash = "sha256:2949913a518d5285ce00a3b7d88961c80a6e72ffb8f3da0a3f5650ea533bd45e"},
-    {file = "types_setuptools-75.2.0.20241025-py3-none-any.whl", hash = "sha256:6721ac0f1a620321e2ccd87a9a747c4a383dc381f78d894ce37f2455b45fcf1c"},
+    {file = "types-setuptools-75.3.0.20241105.tar.gz", hash = "sha256:080883032fb26dfb91c748f69e4efbb202aeeb3f9e95e68bf7352b7ab215069f"},
+    {file = "types_setuptools-75.3.0.20241105-py3-none-any.whl", hash = "sha256:c5a98b3308fea29d26228978bd83f6ea262d2fd4d967e34e8e49d04708bb3022"},
 ]
 
 [[package]]
@@ -3886,33 +3861,6 @@ files = [
     {file = "tzdata-2024.2.tar.gz", hash = "sha256:7d85cc416e9382e69095b7bdf4afd9e3880418a2413feec7069d533d6b4e31cc"},
 ]
 
-[[package]]
-name = "unicef-power-query"
-version = "0.4"
-summary = "Provides Basic UNICEF User model and integration with Azure"
-groups = ["default"]
-dependencies = [
-    "PyPDF2",
-    "celery",
-    "django",
-    "django-admin-extra-buttons",
-    "django-adminactions",
-    "django-adminfilters",
-    "django-concurrency",
-    "django-import-export",
-    "django-smart-admin",
-    "kombu",
-    "natural-keys",
-    "pdfkit",
-    "redis",
-    "sentry-sdk",
-    "tablib",
-]
-files = [
-    {file = "unicef-power-query-0.4.tar.gz", hash = "sha256:e844e44460cc457a254299d7cf2da9ddfdfb2db13468e6d5f1893bb5d91637b1"},
-    {file = "unicef_power_query-0.4-py2.py3-none-any.whl", hash = "sha256:cef72e0658b434f04821e5b7ad665597a813d05f288e9c8a9791ba475110d037"},
-]
-
 [[package]]
 name = "unittest-xml-reporting"
 version = "3.2.0"
diff --git a/pyproject.toml b/pyproject.toml
index 0b8d329e98..477ef2b60a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -225,7 +225,6 @@ dependencies = [
     "sorl-thumbnail==12.9",
     "swapper<2.0.0,>=1.3.0",
     "tblib<2.0.0,>=1.7.0",
-    "unicef-power-query<1.0,>=0.4",
     "update<1.0.0,>=0.0.1",
     "urllib3<2.0.0,>=1.26.9",
     "xlrd<2.0,>=1.2",
diff --git a/src/frontend/src/components/grievances/PaymentGrievance/PaymentGrievanceDetails/PaymentGrievanceDetails.tsx b/src/frontend/src/components/grievances/PaymentGrievance/PaymentGrievanceDetails/PaymentGrievanceDetails.tsx
index 8d8985fa26..63191cde72 100644
--- a/src/frontend/src/components/grievances/PaymentGrievance/PaymentGrievanceDetails/PaymentGrievanceDetails.tsx
+++ b/src/frontend/src/components/grievances/PaymentGrievance/PaymentGrievanceDetails/PaymentGrievanceDetails.tsx
@@ -76,6 +76,7 @@ export function PaymentGrievanceDetails({
           {canApprovePaymentVerification &&
           ticket.status === GRIEVANCE_TICKET_STATES.FOR_APPROVAL ? (
             <Button
+              data-cy="grievance-approve"
               onClick={() =>
                 confirm({
                   title: t('Approve'),
diff --git a/src/frontend/src/components/grievances/PaymentGrievance/PaymentGrievanceDetails/__snapshots__/PaymentGrievanceDetails.test.tsx.snap b/src/frontend/src/components/grievances/PaymentGrievance/PaymentGrievanceDetails/__snapshots__/PaymentGrievanceDetails.test.tsx.snap
index 0f03620823..6dd0d1161e 100644
--- a/src/frontend/src/components/grievances/PaymentGrievance/PaymentGrievanceDetails/__snapshots__/PaymentGrievanceDetails.test.tsx.snap
+++ b/src/frontend/src/components/grievances/PaymentGrievance/PaymentGrievanceDetails/__snapshots__/PaymentGrievanceDetails.test.tsx.snap
@@ -18,6 +18,7 @@ exports[`components/grievances/PaymentGrievanceDetails should render with data 1
         </h6>
         <button
           class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorPrimary css-dl1jos-MuiButtonBase-root-MuiButton-root"
+          data-cy="grievance-approve"
           tabindex="0"
           type="button"
         >
diff --git a/src/frontend/src/components/grievances/PaymentGrievance/VerifyPaymentGrievance/VerifyPaymentGrievance.tsx b/src/frontend/src/components/grievances/PaymentGrievance/VerifyPaymentGrievance/VerifyPaymentGrievance.tsx
index 43abe1469e..fef63ad983 100644
--- a/src/frontend/src/components/grievances/PaymentGrievance/VerifyPaymentGrievance/VerifyPaymentGrievance.tsx
+++ b/src/frontend/src/components/grievances/PaymentGrievance/VerifyPaymentGrievance/VerifyPaymentGrievance.tsx
@@ -74,6 +74,7 @@ export function VerifyPaymentGrievance({
             <Button
               color="primary"
               variant="contained"
+              data-cy="grievance-verify"
               onClick={() => setVerifyManualDialogOpen(true)}
             >
               {t('Verify')}
diff --git a/src/frontend/src/components/grievances/PaymentGrievance/VerifyPaymentGrievance/__snapshots__/VerifyPaymentGrievance.test.tsx.snap b/src/frontend/src/components/grievances/PaymentGrievance/VerifyPaymentGrievance/__snapshots__/VerifyPaymentGrievance.test.tsx.snap
index bb661611ae..11232ecae3 100644
--- a/src/frontend/src/components/grievances/PaymentGrievance/VerifyPaymentGrievance/__snapshots__/VerifyPaymentGrievance.test.tsx.snap
+++ b/src/frontend/src/components/grievances/PaymentGrievance/VerifyPaymentGrievance/__snapshots__/VerifyPaymentGrievance.test.tsx.snap
@@ -10,6 +10,7 @@ exports[`components/grievances/VerifyPaymentGrievance should render with data 1`
     >
       <button
         class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorPrimary css-dl1jos-MuiButtonBase-root-MuiButton-root"
+        data-cy="grievance-verify"
         tabindex="0"
         type="button"
       >
diff --git a/src/frontend/src/components/payments/CreateVerificationPlan.tsx b/src/frontend/src/components/payments/CreateVerificationPlan.tsx
index 4357ca6e3c..ec7768e6eb 100644
--- a/src/frontend/src/components/payments/CreateVerificationPlan.tsx
+++ b/src/frontend/src/components/payments/CreateVerificationPlan.tsx
@@ -297,8 +297,8 @@ export const CreateVerificationPlan = ({
                       variant="fullWidth"
                       aria-label="full width tabs example"
                     >
-                      <Tab label={t('FULL LIST')} />
-                      <Tab label={t('RANDOM SAMPLING')} />
+                      <Tab data-cy="tab-full-list" label={t('FULL LIST')} />
+                      <Tab data-cy="tab-random-sampling" label={t('RANDOM SAMPLING')} />
                     </StyledTabs>
                   </TabsContainer>
                   <TabPanel value={selectedTab} index={0}>
@@ -340,10 +340,11 @@ export const CreateVerificationPlan = ({
                           name="verificationChannel"
                           label={t('Verification Channel')}
                           style={{ flexDirection: 'row' }}
+                          data-cy="checkbox-verification-channel"
                           choices={[
-                            { value: 'RAPIDPRO', name: 'RAPIDPRO' },
-                            { value: 'XLSX', name: 'XLSX' },
-                            { value: 'MANUAL', name: 'MANUAL' },
+                            { value: 'RAPIDPRO', name: 'RAPIDPRO', dataCy: 'radio-rapidpro' },
+                            { value: 'XLSX', name: 'XLSX', dataCy: 'radio-xlsx' },
+                            { value: 'MANUAL', name: 'MANUAL', dataCy: 'radio-manual' },
                           ]}
                           component={FormikRadioGroup}
                           alignItems="center"
@@ -480,9 +481,9 @@ export const CreateVerificationPlan = ({
                         style={{ flexDirection: 'row' }}
                         alignItems="center"
                         choices={[
-                          { value: 'RAPIDPRO', name: 'RAPIDPRO' },
-                          { value: 'XLSX', name: 'XLSX' },
-                          { value: 'MANUAL', name: 'MANUAL' },
+                            { value: 'RAPIDPRO', name: 'RAPIDPRO', dataCy: 'radio-rapidpro' },
+                            { value: 'XLSX', name: 'XLSX', dataCy: 'radio-xlsx' },
+                            { value: 'MANUAL', name: 'MANUAL', dataCy: 'radio-manual' },
                         ]}
                         component={FormikRadioGroup}
                       />
@@ -508,7 +509,7 @@ export const CreateVerificationPlan = ({
               </DialogContent>
               <DialogFooter>
                 <DialogActions>
-                  <Button onClick={() => setOpen(false)}>CANCEL</Button>
+                  <Button data-cy="button-cancel" onClick={() => setOpen(false)}>CANCEL</Button>
                   <LoadingButton
                     loading={loading}
                     type="submit"
diff --git a/src/frontend/src/components/payments/EditVerificationPlan.tsx b/src/frontend/src/components/payments/EditVerificationPlan.tsx
index 90242d3ec5..2407b36b86 100644
--- a/src/frontend/src/components/payments/EditVerificationPlan.tsx
+++ b/src/frontend/src/components/payments/EditVerificationPlan.tsx
@@ -309,8 +309,8 @@ export const EditVerificationPlan = ({
                       variant="fullWidth"
                       aria-label="full width tabs example"
                     >
-                      <Tab label={t('FULL LIST')} />
-                      <Tab label={t('RANDOM SAMPLING')} />
+                      <Tab  data-cy="tab-full-list" label={t('FULL LIST')} />
+                      <Tab data-cy="tab-random-sampling" label={t('RANDOM SAMPLING')} />
                     </StyledTabs>
                   </TabsContainer>
                   <TabPanel value={selectedTab} index={0}>
@@ -351,9 +351,9 @@ export const EditVerificationPlan = ({
                           label={t('Verification Channel')}
                           style={{ flexDirection: 'row', alignItems: 'center' }}
                           choices={[
-                            { value: 'RAPIDPRO', name: 'RAPIDPRO' },
-                            { value: 'XLSX', name: 'XLSX' },
-                            { value: 'MANUAL', name: 'MANUAL' },
+                            { value: 'RAPIDPRO', name: 'RAPIDPRO', dataCy: 'radio-rapidpro' },
+                            { value: 'XLSX', name: 'XLSX', dataCy: 'radio-xlsx' },
+                            { value: 'MANUAL', name: 'MANUAL', dataCy: 'radio-manual' },
                           ]}
                           component={FormikRadioGroup}
                           alignItems="center"
@@ -500,9 +500,9 @@ export const EditVerificationPlan = ({
                         }}
                         alignItems="center"
                         choices={[
-                          { value: 'RAPIDPRO', name: 'RAPIDPRO' },
-                          { value: 'XLSX', name: 'XLSX' },
-                          { value: 'MANUAL', name: 'MANUAL' },
+                            { value: 'RAPIDPRO', name: 'RAPIDPRO', dataCy: 'radio-rapidpro' },
+                            { value: 'XLSX', name: 'XLSX', dataCy: 'radio-xlsx' },
+                            { value: 'MANUAL', name: 'MANUAL', dataCy: 'radio-manual' },
                         ]}
                         component={FormikRadioGroup}
                       />
diff --git a/src/frontend/src/components/payments/VerificationPlanActions.tsx b/src/frontend/src/components/payments/VerificationPlanActions.tsx
index e25f1dc6f6..d7099f4ce7 100644
--- a/src/frontend/src/components/payments/VerificationPlanActions.tsx
+++ b/src/frontend/src/components/payments/VerificationPlanActions.tsx
@@ -138,6 +138,7 @@ export function VerificationPlanActions({
                       color="primary"
                       variant="outlined"
                       startIcon={<GetApp />}
+                      data-cy="export-xlsx"
                       onClick={async () => {
                         try {
                           await mutateExport({
@@ -171,6 +172,7 @@ export function VerificationPlanActions({
                       <Button
                         color="primary"
                         variant="outlined"
+                        data-cy="download-xlsx"
                         startIcon={<GetApp />}
                       >
                         {t('Download Xlsx')}
@@ -180,7 +182,7 @@ export function VerificationPlanActions({
                 )}
 
                 {canImport && (
-                  <Box p={2}>
+                  <Box p={2} data-cy="import-xlsx">
                     <ImportXlsx
                       paymentVerificationPlanId={verificationPlan.id}
                       cashOrPaymentPlanId={planNode.id}
@@ -204,6 +206,7 @@ export function VerificationPlanActions({
                       loading={loadingInvalid}
                       color="primary"
                       variant="outlined"
+                      data-cy="button-mark-as-invalid"
                       onClick={async () => {
                         try {
                           await mutateInvalid({
diff --git a/src/frontend/src/components/payments/VerificationPlanDetails.tsx b/src/frontend/src/components/payments/VerificationPlanDetails.tsx
index 8afbaeb0ba..5ac83b6808 100644
--- a/src/frontend/src/components/payments/VerificationPlanDetails.tsx
+++ b/src/frontend/src/components/payments/VerificationPlanDetails.tsx
@@ -49,7 +49,7 @@ export function VerificationPlanDetails({
     <Container>
       <Box display="flex" alignItems="center" justifyContent="space-between">
         <Title>
-          <Typography variant="h6">
+          <Typography data-cy={`verification-plan-${verificationPlan.unicefId}`} variant="h6">
             {t('Verification Plan')} #{verificationPlan.unicefId}
             <AdminButton adminUrl={verificationPlan.adminUrl} sx={{ ml: 2 }} />
           </Typography>
diff --git a/src/frontend/src/components/payments/VerifyManual.tsx b/src/frontend/src/components/payments/VerifyManual.tsx
index 6c1d7bf195..b49995a40c 100644
--- a/src/frontend/src/components/payments/VerifyManual.tsx
+++ b/src/frontend/src/components/payments/VerifyManual.tsx
@@ -100,8 +100,8 @@ export function VerifyManual({
                       label="Status"
                       style={{ flexDirection: 'row' }}
                       choices={[
-                        { value: 'RECEIVED', name: t('Received') },
-                        { value: 'NOT_RECEIVED', name: t('Not Received') },
+                        { value: 'RECEIVED', name: t('Received'), dataCy: 'choice-received' },
+                        { value: 'NOT_RECEIVED', name: t('Not Received'), dataCy: 'choice-not-received' },
                       ]}
                       component={FormikRadioGroup}
                     />
diff --git a/src/frontend/src/shared/Formik/FormikRadioGroup/FormikRadioGroup.tsx b/src/frontend/src/shared/Formik/FormikRadioGroup/FormikRadioGroup.tsx
index 531a8fcd16..9dde5c06fe 100644
--- a/src/frontend/src/shared/Formik/FormikRadioGroup/FormikRadioGroup.tsx
+++ b/src/frontend/src/shared/Formik/FormikRadioGroup/FormikRadioGroup.tsx
@@ -48,6 +48,7 @@ export function FormikRadioGroup({
             value: string;
             optionLabel?: string | ReactElement;
             name: string;
+            dataCy?: string;
           }) => (
             <Box p={2} mb={2} key={each.value}>
               <Box display="flex" alignItems={alignItems}>
@@ -55,6 +56,7 @@ export function FormikRadioGroup({
                   color="primary"
                   value={each.value}
                   checked={field.value === each.value}
+                  data-cy={each?.dataCy}
                 />
                 {withGreyBox ? (
                   <GreyBox p={2}>
diff --git a/src/hct_mis_api/api/admin.py b/src/hct_mis_api/api/admin.py
index fc888c1109..c81aa47d3a 100644
--- a/src/hct_mis_api/api/admin.py
+++ b/src/hct_mis_api/api/admin.py
@@ -5,7 +5,6 @@
 from django.contrib.admin.models import LogEntry
 from django.contrib.admin.templatetags.admin_urls import admin_urlname
 from django.core.exceptions import ValidationError
-from django.core.mail import send_mail
 from django.db.models import QuerySet
 from django.db.transaction import atomic
 from django.forms import Form
@@ -134,11 +133,10 @@ def _get_email_context(self, request: HttpRequest, obj: Any) -> Dict[str, Any]:
 
     def _send_token_email(self, request: HttpRequest, obj: Any, template: str) -> None:
         try:
-            send_mail(
-                f"HOPE API Token {obj} infos",
-                template.format(**self._get_email_context(request, obj)),
-                None,
-                recipient_list=[obj.user.email],
+            user = obj.user
+            user.email_user(
+                subject=f"HOPE API Token {obj} infos",
+                text_body=template.format(**self._get_email_context(request, obj)),
             )
             self.message_user(request, f"Email sent to {obj.user.email}", messages.SUCCESS)
         except OSError:
diff --git a/src/hct_mis_api/api/endpoints/serializers.py b/src/hct_mis_api/api/endpoints/serializers.py
index 163262a532..3de291815d 100644
--- a/src/hct_mis_api/api/endpoints/serializers.py
+++ b/src/hct_mis_api/api/endpoints/serializers.py
@@ -14,4 +14,14 @@ class RejectPolicy(models.TextChoices):
 class CountrySerializer(serializers.ModelSerializer):
     class Meta:
         model = Country
-        fields = ("name", "short_name", "iso_code2", "iso_code3", "iso_num")
+        fields = (
+            "id",
+            "name",
+            "short_name",
+            "iso_code2",
+            "iso_code3",
+            "iso_num",
+            "valid_from",
+            "valid_until",
+            "updated_at",
+        )
diff --git a/src/hct_mis_api/apps/household/migrations/0188_migration.py b/src/hct_mis_api/apps/household/migrations/0188_migration.py
new file mode 100644
index 0000000000..d0028206ad
--- /dev/null
+++ b/src/hct_mis_api/apps/household/migrations/0188_migration.py
@@ -0,0 +1,52 @@
+# Generated by Django 3.2.25 on 2024-11-05 17:49
+from django.contrib.postgres.operations import AddIndexConcurrently
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    atomic = False
+
+    dependencies = [
+        ('household', '0187_migration'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='bankaccountinfo',
+            name='is_migration_handled',
+        ),
+        migrations.SeparateDatabaseAndState(
+            state_operations=[
+                migrations.AlterField(
+                    model_name='bankaccountinfo',
+                    name='bank_account_number',
+                    field=models.CharField(db_index=True, max_length=64),
+                ),
+            ],
+            database_operations=[
+                AddIndexConcurrently(
+                    model_name="bankaccountinfo",
+                    index=models.Index(
+                        fields=["bank_account_number"], name="bank_account_number_idx"
+                    )
+                ),
+            ]
+        ),
+        migrations.SeparateDatabaseAndState(
+            state_operations=[
+                migrations.AlterField(
+                    model_name='bankaccountinfo',
+                    name='debit_card_number',
+                    field=models.CharField(blank=True, db_index=True, default='', max_length=255),
+                ),
+            ],
+            database_operations=[
+                AddIndexConcurrently(
+                    model_name="bankaccountinfo",
+                    index=models.Index(
+                        fields=["debit_card_number"], name="debit_card_number_idx"
+                    )
+                ),
+            ]
+        )
+    ]
diff --git a/src/hct_mis_api/apps/household/models.py b/src/hct_mis_api/apps/household/models.py
index 4fb4d04b8e..0e1f0feee7 100644
--- a/src/hct_mis_api/apps/household/models.py
+++ b/src/hct_mis_api/apps/household/models.py
@@ -1316,11 +1316,10 @@ class BankAccountInfo(SoftDeletableRepresentationMergeStatusModelWithDate, TimeS
         on_delete=models.CASCADE,
     )
     bank_name = models.CharField(max_length=255)
-    bank_account_number = models.CharField(max_length=64)
-    debit_card_number = models.CharField(max_length=255, blank=True, default="")
+    bank_account_number = models.CharField(max_length=64, db_index=True)
+    debit_card_number = models.CharField(max_length=255, blank=True, default="", db_index=True)
     bank_branch_name = models.CharField(max_length=255, blank=True, default="")
     account_holder_name = models.CharField(max_length=255, blank=True, default="")
-    is_migration_handled = models.BooleanField(default=False)
     copied_from = models.ForeignKey(
         "self",
         null=True,
diff --git a/src/hct_mis_api/apps/payment/notifications.py b/src/hct_mis_api/apps/payment/notifications.py
index c98d3e2fe4..f4aaec5742 100644
--- a/src/hct_mis_api/apps/payment/notifications.py
+++ b/src/hct_mis_api/apps/payment/notifications.py
@@ -1,5 +1,5 @@
 import logging
-from typing import Any, Dict, List
+from typing import Any, Dict
 
 from django.conf import settings
 from django.db.models import Q, QuerySet
@@ -37,18 +37,22 @@ class PaymentNotification:
         ACTION_SEND_FOR_APPROVAL: {
             "action_name": "sent for approval",
             "subject": "Payment pending for Approval",
+            "recipient_title": "Approver",
         },
         ACTION_APPROVE: {
             "action_name": "approved",
             "subject": "Payment pending for Authorization",
+            "recipient_title": "Authorizer",
         },
         ACTION_AUTHORIZE: {
             "action_name": "authorized",
             "subject": "Payment pending for Release",
+            "recipient_title": "Reviewer",
         },
         ACTION_REVIEW: {
             "action_name": "released",
             "subject": "Payment is Released",
+            "recipient_title": "Reviewer",
         },
     }
 
@@ -61,8 +65,9 @@ def __init__(self, payment_plan: PaymentPlan, action: str, action_user: User, ac
         self.payment_plan_creation_date = self.payment_plan.created_at
         self.email_subject = self.ACTION_PREPARE_EMAIL_BODIES_MAP[self.action]["subject"]
         self.action_name = self.ACTION_PREPARE_EMAIL_BODIES_MAP[self.action]["action_name"]
+        self.recipient_title = self.ACTION_PREPARE_EMAIL_BODIES_MAP[self.action]["recipient_title"]
         self.user_recipients = self._prepare_user_recipients()
-        self.emails = self._prepare_emails()
+        self.email = self._prepare_email()
         self.enable_email_notification = self.payment_plan.business_area.enable_email_notification
 
     def _prepare_user_recipients(self) -> QuerySet[User]:
@@ -93,22 +98,23 @@ def _prepare_user_recipients(self) -> QuerySet[User]:
             if permission in DEFAULT_PERMISSIONS_LIST_FOR_IS_UNICEF_PARTNER
             else Q()
         )
-        users = User.objects.filter(
-            (Q(user_roles__in=user_roles) & program_access_q) | Q(partner_role_q & program_access_q) | unicef_q
-        ).distinct()
+        users = (
+            User.objects.filter(
+                (Q(user_roles__in=user_roles) & program_access_q) | Q(partner_role_q & program_access_q) | unicef_q
+            )
+            .exclude(id=self.action_user.id)
+            .distinct()
+        )
         if settings.ENV == "prod":
             users = users.exclude(is_superuser=True)
         return users
 
-    def _prepare_emails(self) -> List[MailjetClient]:
-        return [self._prepare_email(user) for user in self.user_recipients.exclude(id=self.action_user.id)]
-
-    def _prepare_email(self, user_recipient: User) -> MailjetClient:
-        body_variables = self._prepare_body_variables(user_recipient)
+    def _prepare_email(self) -> MailjetClient:
+        body_variables = self._prepare_body_variables()
         email = MailjetClient(
             mailjet_template_id=config.MAILJET_TEMPLATE_PAYMENT_PLAN_NOTIFICATION,
             subject=self.email_subject,
-            recipients=[user_recipient.email],
+            recipients=[user_recipient.email for user_recipient in self.user_recipients],
             ccs=[self.action_user.email],
             variables=body_variables,
         )
@@ -117,16 +123,15 @@ def _prepare_email(self, user_recipient: User) -> MailjetClient:
     def send_email_notification(self) -> None:
         if config.SEND_PAYMENT_PLANS_NOTIFICATION and self.enable_email_notification:
             try:
-                for email in self.emails:
-                    email.send_email()
+                self.email.send_email()
             except Exception as e:  # pragma: no cover
                 logger.exception(e)
 
-    def _prepare_body_variables(self, user_recipient: User) -> Dict[str, Any]:
+    def _prepare_body_variables(self) -> Dict[str, Any]:
         protocol = "https" if settings.SOCIAL_AUTH_REDIRECT_IS_HTTPS else "http"
         variables = {
-            "first_name": user_recipient.first_name,
-            "last_name": user_recipient.last_name,
+            "first_name": "Payment Plan",
+            "last_name": self.recipient_title,
             "action_name": self.action_name,
             "payment_plan_url": (
                 f"{protocol}://{settings.FRONTEND_HOST}/{self.payment_plan.business_area.slug}/programs/"
diff --git a/src/hct_mis_api/apps/steficon/forms.py b/src/hct_mis_api/apps/steficon/forms.py
index 122b3a3a75..55031aeaf2 100644
--- a/src/hct_mis_api/apps/steficon/forms.py
+++ b/src/hct_mis_api/apps/steficon/forms.py
@@ -10,12 +10,13 @@
 from django.forms import HiddenInput, Media, Textarea
 from django.utils.translation import gettext_lazy as _
 
-from power_query.widget import PythonFormatterEditor
-
 from hct_mis_api.apps.steficon.config import config
 from hct_mis_api.apps.steficon.interpreters import Interpreter, mapping
 from hct_mis_api.apps.steficon.models import Rule, RuleCommit
-from hct_mis_api.apps.steficon.widget import ContentTypeChoiceField
+from hct_mis_api.apps.steficon.widget import (
+    ContentTypeChoiceField,
+    PythonFormatterEditor,
+)
 
 if TYPE_CHECKING:
     from django.db.models.fields import _ChoicesCallable
diff --git a/src/hct_mis_api/apps/steficon/static/admin/power_query/code.css b/src/hct_mis_api/apps/steficon/static/admin/steficon/code.css
similarity index 100%
rename from src/hct_mis_api/apps/steficon/static/admin/power_query/code.css
rename to src/hct_mis_api/apps/steficon/static/admin/steficon/code.css
diff --git a/src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/abcdef.css b/src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/abcdef.css
similarity index 100%
rename from src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/abcdef.css
rename to src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/abcdef.css
diff --git a/src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/active-line.js b/src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/active-line.js
similarity index 100%
rename from src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/active-line.js
rename to src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/active-line.js
diff --git a/src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/codemirror.css b/src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/codemirror.css
similarity index 100%
rename from src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/codemirror.css
rename to src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/codemirror.css
diff --git a/src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/codemirror.js b/src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/codemirror.js
similarity index 100%
rename from src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/codemirror.js
rename to src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/codemirror.js
diff --git a/src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/django.js b/src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/django.js
similarity index 100%
rename from src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/django.js
rename to src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/django.js
diff --git a/src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/foldcode.js b/src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/foldcode.js
similarity index 100%
rename from src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/foldcode.js
rename to src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/foldcode.js
diff --git a/src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/foldgutter.css b/src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/foldgutter.css
similarity index 100%
rename from src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/foldgutter.css
rename to src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/foldgutter.css
diff --git a/src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/foldgutter.js b/src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/foldgutter.js
similarity index 100%
rename from src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/foldgutter.js
rename to src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/foldgutter.js
diff --git a/src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/fullscreen.css b/src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/fullscreen.css
similarity index 100%
rename from src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/fullscreen.css
rename to src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/fullscreen.css
diff --git a/src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/fullscreen.js b/src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/fullscreen.js
similarity index 100%
rename from src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/fullscreen.js
rename to src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/fullscreen.js
diff --git a/src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/indent-fold.js b/src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/indent-fold.js
similarity index 100%
rename from src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/indent-fold.js
rename to src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/indent-fold.js
diff --git a/src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/matchbrackets.js b/src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/matchbrackets.js
similarity index 100%
rename from src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/matchbrackets.js
rename to src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/matchbrackets.js
diff --git a/src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/midnight.css b/src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/midnight.css
similarity index 100%
rename from src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/midnight.css
rename to src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/midnight.css
diff --git a/src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/overlay.js b/src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/overlay.js
similarity index 100%
rename from src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/overlay.js
rename to src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/overlay.js
diff --git a/src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/python.js b/src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/python.js
similarity index 100%
rename from src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/python.js
rename to src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/python.js
diff --git a/src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/xml.js b/src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/xml.js
similarity index 100%
rename from src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/xml.js
rename to src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/xml.js
diff --git a/src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/yaml.js b/src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/yaml.js
similarity index 100%
rename from src/hct_mis_api/apps/steficon/static/admin/power_query/codemirror/yaml.js
rename to src/hct_mis_api/apps/steficon/static/admin/steficon/codemirror/yaml.js
diff --git a/src/hct_mis_api/apps/steficon/static/admin/power_query/colorful.css b/src/hct_mis_api/apps/steficon/static/admin/steficon/colorful.css
similarity index 100%
rename from src/hct_mis_api/apps/steficon/static/admin/power_query/colorful.css
rename to src/hct_mis_api/apps/steficon/static/admin/steficon/colorful.css
diff --git a/src/hct_mis_api/apps/steficon/static/admin/power_query/diff.css b/src/hct_mis_api/apps/steficon/static/admin/steficon/diff.css
similarity index 100%
rename from src/hct_mis_api/apps/steficon/static/admin/power_query/diff.css
rename to src/hct_mis_api/apps/steficon/static/admin/steficon/diff.css
diff --git a/src/hct_mis_api/apps/steficon/static/admin/power_query/editor.png b/src/hct_mis_api/apps/steficon/static/admin/steficon/editor.png
similarity index 100%
rename from src/hct_mis_api/apps/steficon/static/admin/power_query/editor.png
rename to src/hct_mis_api/apps/steficon/static/admin/steficon/editor.png
diff --git a/src/hct_mis_api/apps/utils/mailjet.py b/src/hct_mis_api/apps/utils/mailjet.py
index 78ce602381..5801253479 100644
--- a/src/hct_mis_api/apps/utils/mailjet.py
+++ b/src/hct_mis_api/apps/utils/mailjet.py
@@ -52,7 +52,6 @@ def send_email(self) -> bool:
 
         email_body = self._get_email_body()
         attachments = {"Attachments": self.attachments} if self.attachments else {}
-
         data = {
             "Messages": [
                 {
diff --git a/src/hct_mis_api/contrib/aurora/admin.py b/src/hct_mis_api/contrib/aurora/admin.py
index 885ceb3016..e9c9bfe462 100644
--- a/src/hct_mis_api/contrib/aurora/admin.py
+++ b/src/hct_mis_api/contrib/aurora/admin.py
@@ -6,7 +6,7 @@
 from django.contrib import admin, messages
 from django.contrib.admin.views.main import ChangeList
 from django.core.signing import BadSignature, Signer
-from django.db.models import QuerySet
+from django.db.models import JSONField, QuerySet
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import render
 from django.template.response import TemplateResponse
@@ -24,6 +24,7 @@
 from adminfilters.json import JsonFieldFilter
 from adminfilters.numbers import NumberFilter
 from adminfilters.querystring import QueryStringFilter
+from jsoneditor.forms import JSONEditor
 from requests.auth import HTTPBasicAuth
 from smart_admin.decorators import smart_register
 
@@ -101,6 +102,9 @@ class RegistrationAdmin(ExtraButtonsMixin, admin.ModelAdmin):
     readonly_fields = ("name", "project", "slug", "extra", "metadata")
     list_filter = ("rdi_policy", "project")
     raw_id_fields = ("steficon_rule",)
+    formfield_overrides = {
+        JSONField: {"widget": JSONEditor},
+    }
 
 
 class BaseRDIForm(forms.Form):
@@ -168,23 +172,21 @@ class AmendRDIForm(BaseRDIForm):
     field_order = ["rdi", "registration", "filters"]
 
 
-class RecordMixinAdmin(ExtraButtonsMixin, admin.ModelAdmin):
+@admin.register(Record)
+class RecordDatahubAdmin(HOPEModelAdminBase):
     list_display = ("id", "registration", "timestamp", "source_id", "status", "ignored")
     readonly_fields = (
         "id",
         "registration",
         "timestamp",
         "source_id",
-        # "registration_data_import",
         "status",
         "error_message",
     )
-    # list_editable = ("ignored",)
     exclude = ("data",)
     date_hierarchy = "timestamp"
     list_filter = (
         DepotManager,
-        # ("registration_data_import", AutoCompleteFilter),
         ("status", StatusFilter),
         ("source_id", NumberFilter),
         ("id", NumberFilter),
@@ -192,7 +194,6 @@ class RecordMixinAdmin(ExtraButtonsMixin, admin.ModelAdmin):
         QueryStringFilter,
     )
     change_form_template = "registration_datahub/admin/record/change_form.html"
-    # change_list_template = "registration_datahub/admin/record/change_list.html"
 
     actions = [mass_update, "extract", "async_extract", "create_rdi", "create_sr_lanka_rdi", "count_queryset"]
 
@@ -226,7 +227,7 @@ def fetch_aurora(self, request: HttpRequest) -> HttpResponse:
         return render(request, "admin/aurora/record/fetch.html", ctx)
 
     def has_add_permission(self, request: HttpRequest) -> bool:
-        return False
+        return is_root(request)
 
     def has_delete_permission(self, request: HttpRequest, obj: Optional[Any] = None) -> bool:
         return is_root(request)
@@ -382,11 +383,6 @@ def fetch(self, request: HttpRequest) -> TemplateResponse:
         return response
 
 
-@admin.register(Record)
-class RecordDatahubAdmin(RecordMixinAdmin, HOPEModelAdminBase):
-    pass
-
-
 class RemeberDataForm(forms.Form):
     SYNC_COOKIE = "fetch"
     remember = forms.BooleanField(label="Remember me", required=False)
diff --git a/src/hct_mis_api/contrib/aurora/services/generic_registration_service.py b/src/hct_mis_api/contrib/aurora/services/generic_registration_service.py
index d414cda68f..ce6953cb2e 100644
--- a/src/hct_mis_api/contrib/aurora/services/generic_registration_service.py
+++ b/src/hct_mis_api/contrib/aurora/services/generic_registration_service.py
@@ -345,7 +345,6 @@ def create_household_for_rdi_household(self, record: Any, registration_data_impo
         }
 
         mapping = mergedicts(default_mapping, self.registration.mapping, [])
-
         household = self.create_household_data(record, registration_data_import, mapping)
         individuals, head, pr_collector, sec_collector = self.create_individuals(
             record,
diff --git a/tests/selenium/filters/test_filters.py b/tests/selenium/filters/test_filters.py
index f6f5c92ec6..ba4a488c09 100644
--- a/tests/selenium/filters/test_filters.py
+++ b/tests/selenium/filters/test_filters.py
@@ -546,3 +546,11 @@ def test_grievance_tickets_filters_of_households_and_individuals(
         pageGrievanceTickets.getNavGrievance().click()
         assert "Grievance Tickets" in pageGrievanceTickets.getGrievanceTitle().text
         pageGrievanceTickets.getButtonNewTicket().click()
+
+    @pytest.mark.skip("ToDo")
+    def test_payment_verification_details_filters(
+        self,
+        pageGrievanceTickets: GrievanceTickets,
+        filters: Filters,
+    ) -> None:
+        pageGrievanceTickets.getNavPaymentVerification().click()
diff --git a/tests/selenium/helpers/helper.py b/tests/selenium/helpers/helper.py
index 5f7e5d40ed..c1ffe8d2b7 100644
--- a/tests/selenium/helpers/helper.py
+++ b/tests/selenium/helpers/helper.py
@@ -4,6 +4,7 @@
 from typing import Literal, Union
 
 from selenium.common import NoSuchElementException
+from selenium.common.exceptions import TimeoutException
 from selenium.webdriver import Chrome, Keys
 from selenium.webdriver.common.action_chains import ActionChains
 from selenium.webdriver.common.by import By
@@ -42,8 +43,6 @@ def get_elements(self, locator: str, element_type: str = By.CSS_SELECTOR, attemp
             raise Exception("No elements found")
 
     def wait_for(self, locator: str, element_type: str = By.CSS_SELECTOR, timeout: int = DEFAULT_TIMEOUT) -> WebElement:
-        from selenium.common.exceptions import TimeoutException
-
         try:
             return self._wait(timeout).until(EC.visibility_of_element_located((element_type, locator)))
         except TimeoutException:
@@ -63,7 +62,14 @@ def wait_for_text_disappear(
     def wait_for_text(
         self, text: str, locator: str, element_type: str = By.CSS_SELECTOR, timeout: int = DEFAULT_TIMEOUT
     ) -> Union[Literal[False, True], bool]:
-        return self._wait(timeout).until(EC.text_to_be_present_in_element((element_type, locator), text))
+        try:
+            return self._wait(timeout).until(EC.text_to_be_present_in_element((element_type, locator), text))
+        except TimeoutException:
+            pass
+        raise NoSuchElementException(
+            f"Element: {text} not found in {locator}. Displayed text:"
+            f" {self.driver.find_element(element_type, locator).text}"
+        )
 
     def wait_for_new_url(self, old_url: str, retry: int = 5) -> str:
         for _ in range(retry):
@@ -171,6 +177,16 @@ def screenshot(
         sleep(delay_sec)
         self.driver.get_screenshot_as_file(os.path.join(f"{file_path}", f"{file_name}.{file_type}"))
 
+    def scroll(self, scroll_by: int = 600, wait_after_start_scrolling: int = 2, execute: int = 1) -> None:
+        for _ in range(execute):
+            self.driver.execute_script(  # type: ignore
+                f"""
+                container = document.querySelector("div[data-cy='main-content']")
+                container.scrollBy(0,{scroll_by})
+                """
+            )
+            sleep(wait_after_start_scrolling)
+
     def get_value_of_attributes(self, attribute: str = "data-cy") -> None:
         sleep(1)
         ids = self.driver.find_elements(By.XPATH, f"//*[@{attribute}]")
diff --git a/tests/selenium/page_object/base_components.py b/tests/selenium/page_object/base_components.py
index c3611190af..9c893f482a 100644
--- a/tests/selenium/page_object/base_components.py
+++ b/tests/selenium/page_object/base_components.py
@@ -2,6 +2,7 @@
 
 from selenium.webdriver.remote.webelement import WebElement
 
+from hct_mis_api.apps.core.utils import encode_id_base64
 from tests.selenium.helpers.helper import Common
 
 
@@ -56,6 +57,13 @@ class BaseComponents(Common):
     # Text
     globalProgramFilterText = "All Programmes"
 
+    def navigate_to_page(self, business_area_slug: str, program_id: str) -> None:
+        self.driver.get(self.get_page_url(business_area_slug, program_id))
+
+    def get_page_url(self, business_area_slug: str, program_id: str) -> str:
+        encoded_program_id = encode_id_base64(program_id, "Program")
+        return f"{self.driver.live_server.url}/{business_area_slug}/programs/{encoded_program_id}"
+
     def getMainContent(self) -> WebElement:
         return self.wait_for(self.mainContent)
 
@@ -190,6 +198,7 @@ def getBreadcrumbsChevronIcon(self) -> WebElement:
         return self.wait_for(self.breadcrumbsChevronIcon)
 
     def getArrowBack(self) -> WebElement:
+        self.scroll(scroll_by=-600)
         return self.wait_for(self.arrowBack)
 
     def getNavProgramLog(self) -> WebElement:
diff --git a/tests/selenium/page_object/grievance/details_grievance_page.py b/tests/selenium/page_object/grievance/details_grievance_page.py
index 26b65e81dd..04e9466b6e 100644
--- a/tests/selenium/page_object/grievance/details_grievance_page.py
+++ b/tests/selenium/page_object/grievance/details_grievance_page.py
@@ -153,6 +153,10 @@ class GrievanceDetailsPage(BaseComponents):
     logRow = 'div[data-cy="log-row"]'
     paymentRecord = 'span[data-cy="payment-record"]'
     labelGender = 'div[data-cy="label-GENDER"]'
+    grievanceVerify = '[data-cy="grievance-verify"]'
+    inputNewReceivedAmount = '[data-cy="input-newReceivedAmount"]'
+    buttonSubmit = 'button[data-cy="button-submit"]'
+    grievanceApprove = '[data-cy="grievance-approve"]'
 
     # Texts
     textTitle = "Ticket ID: "
@@ -676,6 +680,18 @@ def getButtonRotateImage(self) -> WebElement:
     def getLinkShowPhoto(self) -> WebElement:
         return self.wait_for(self.linkShowPhoto)
 
+    def getGrievanceVerify(self) -> WebElement:
+        return self.wait_for(self.grievanceVerify)
+
+    def getInputNewReceivedAmount(self) -> WebElement:
+        return self.wait_for(self.inputNewReceivedAmount)
+
+    def getButtonSubmit(self) -> WebElement:
+        return self.wait_for(self.buttonSubmit)
+
+    def getGrievanceApprove(self) -> WebElement:
+        return self.wait_for(self.grievanceApprove)
+
     def getLabelStatus(self) -> WebElement:
         return self.wait_for(self.labelStatus)
 
diff --git a/tests/selenium/page_object/payment_module/payment_module.py b/tests/selenium/page_object/payment_module/payment_module.py
index c2dfad805e..fd9f65f916 100644
--- a/tests/selenium/page_object/payment_module/payment_module.py
+++ b/tests/selenium/page_object/payment_module/payment_module.py
@@ -147,9 +147,11 @@ def getTablePagination(self) -> WebElement:
         return self.wait_for(self.tablePagination)
 
     def getRows(self) -> [WebElement]:
+        self.wait_for(self.rows)
         return self.get_elements(self.rows)
 
     def getRow(self, number: int) -> WebElement:
+        self.wait_for(self.rows)
         try:
             sleep(0.5)
             return self.get_elements(self.rows)[number]
diff --git a/tests/selenium/page_object/payment_verification/payment_record.py b/tests/selenium/page_object/payment_verification/payment_record.py
index b85c2500ad..ad22520bc9 100644
--- a/tests/selenium/page_object/payment_verification/payment_record.py
+++ b/tests/selenium/page_object/payment_verification/payment_record.py
@@ -29,6 +29,7 @@ class PaymentRecord(BaseComponents):
     labelFsp = 'div[data-cy="label-FSP"]'
     buttonSubmit = 'button[data-cy="button-submit"]'
     inputReceivedamount = 'input[data-cy="input-receivedAmount"]'
+    choiceNotReceived = '[data-cy="choice-not-received"]'
 
     def getInputReceivedamount(self) -> WebElement:
         return self.wait_for(self.inputReceivedamount)
@@ -52,9 +53,16 @@ def getButtonEdPlan(self) -> WebElement:
     def getLabelStatus(self) -> [WebElement]:
         return self.get_elements(self.labelStatus)
 
+    def getStatus(self) -> [WebElement]:
+        self.wait_for(self.statusContainer)
+        return self.get_elements(self.statusContainer)
+
     def getStatusContainer(self) -> WebElement:
         return self.wait_for(self.statusContainer)
 
+    def waitForStatusContainer(self, status: str) -> []:
+        return self.wait_for_text(status, self.statusContainer)
+
     def getLabelHousehold(self) -> WebElement:
         return self.wait_for(self.labelHousehold)
 
@@ -111,3 +119,6 @@ def getLabelFsp(self) -> WebElement:
 
     def getButtonSubmit(self) -> WebElement:
         return self.wait_for(self.buttonSubmit)
+
+    def getChoiceNotReceived(self) -> WebElement:
+        return self.wait_for(self.choiceNotReceived)
diff --git a/tests/selenium/page_object/payment_verification/payment_verification.py b/tests/selenium/page_object/payment_verification/payment_verification.py
index dd1b88e2fe..499d30999c 100644
--- a/tests/selenium/page_object/payment_verification/payment_verification.py
+++ b/tests/selenium/page_object/payment_verification/payment_verification.py
@@ -26,6 +26,23 @@ class PaymentVerification(BaseComponents):
     cashPlanTableRow = 'tr[data-cy="cash-plan-table-row"]'
     statusContainer = 'div[data-cy="status-container"]'
     tablePagination = 'div[data-cy="table-pagination"]'
+    buttonNewPlan = 'button[data-cy="button-new-plan"]'
+    tabFullList = 'button[data-cy="tab-full-list"]'
+    tabRandomSampling = 'button[data-cy="tab-random-sampling"]'
+    selectExcludedadminareasfull = 'div[data-cy="select-excludedAdminAreasFull"]'
+    checkboxVerificationChannel = 'div[data-cy="checkbox-verification-channel"]'
+    sliderConfidenceInterval = 'span[data-cy="slider-confidence-interval"]'
+    sliderMarginOfError = 'span[data-cy="slider-margin-of-error"]'
+    inputAdmincheckbox = 'span[data-cy="input-adminCheckbox"]'
+    inputAgecheckbox = 'span[data-cy="input-ageCheckbox"]'
+    inputSexcheckbox = 'span[data-cy="input-sexCheckbox"]'
+    dialogActionsContainer = 'div[data-cy="dialog-actions-container"]'
+    buttonCancel = 'button[data-cy="button-cancel"]'
+    buttonSubmit = 'button[data-cy="button-submit"]'
+    radioRapidpro = 'span[data-cy="radio-rapidpro"]'
+    radioXlsx = 'span[data-cy="radio-xlsx"]'
+    radioManual = 'span[data-cy="radio-manual"]'
+    radioVerificationChannel = 'span[data-cy="radio-{}"]'
 
     def getPageHeaderContainer(self) -> WebElement:
         return self.wait_for(self.pageHeaderContainer)
@@ -89,3 +106,54 @@ def getStatusContainer(self) -> WebElement:
 
     def getTablePagination(self) -> WebElement:
         return self.wait_for(self.tablePagination)
+
+    def getButtonNewPlan(self) -> WebElement:
+        return self.wait_for(self.buttonNewPlan)
+
+    def getTabFullList(self) -> WebElement:
+        return self.wait_for(self.tabFullList)
+
+    def getTabRandomSampling(self) -> WebElement:
+        return self.wait_for(self.tabRandomSampling)
+
+    def getSelectExcludedadminareasfull(self) -> WebElement:
+        return self.wait_for(self.selectExcludedadminareasfull)
+
+    def getCheckboxVerificationChannel(self) -> WebElement:
+        return self.wait_for(self.checkboxVerificationChannel)
+
+    def getRadioRapidpro(self) -> WebElement:
+        return self.wait_for(self.radioRapidpro)
+
+    def getRadioXlsx(self) -> WebElement:
+        return self.wait_for(self.radioXlsx)
+
+    def getRadioManual(self) -> WebElement:
+        return self.wait_for(self.radioManual)
+
+    def getRadioVerificationChannel(self, name: str) -> WebElement:
+        return self.wait_for(self.radioVerificationChannel.format(name))
+
+    def getSliderConfidenceInterval(self) -> WebElement:
+        return self.wait_for(self.sliderConfidenceInterval)
+
+    def getSliderMarginOfError(self) -> WebElement:
+        return self.wait_for(self.sliderMarginOfError)
+
+    def getInputAdmincheckbox(self) -> WebElement:
+        return self.wait_for(self.inputAdmincheckbox)
+
+    def getInputAgecheckbox(self) -> WebElement:
+        return self.wait_for(self.inputAgecheckbox)
+
+    def getInputSexcheckbox(self) -> WebElement:
+        return self.wait_for(self.inputSexcheckbox)
+
+    def getDialogActionsContainer(self) -> WebElement:
+        return self.wait_for(self.dialogActionsContainer)
+
+    def getButtonCancel(self) -> WebElement:
+        return self.wait_for(self.buttonCancel)
+
+    def getButtonSubmit(self) -> WebElement:
+        return self.wait_for(self.buttonSubmit)
diff --git a/tests/selenium/page_object/payment_verification/payment_verification_details.py b/tests/selenium/page_object/payment_verification/payment_verification_details.py
index a0afa25be2..c43508e264 100644
--- a/tests/selenium/page_object/payment_verification/payment_verification_details.py
+++ b/tests/selenium/page_object/payment_verification/payment_verification_details.py
@@ -29,7 +29,14 @@ class PaymentVerificationDetails(BaseComponents):
     labelizedFieldContainerSummaryNumberOfPlans = 'div[data-cy="labelized-field-container-summary-number-of-plans"]'
     labelNumberOfVerificationPlans = 'div[data-cy="label-Number of Verification Plans"]'
     buttonDeletePlan = 'button[data-cy="button-delete-plan"]'
+    verificationPlan = 'h6[data-cy="verification-plan-{}"]'
+    verificationPlanPrefix = 'h6[data-cy^="verification-plan"]'
     buttonActivatePlan = 'button[data-cy="button-activate-plan"]'
+    exportXlsx = 'button[data-cy="export-xlsx"]'
+    downloadXlsx = 'button[data-cy="download-xlsx"]'
+    buttonMarkAsInvalid = '[data-cy="button-mark-as-invalid"]'
+    importXlsx = 'div[data-cy="import-xlsx"]'
+    buttonImportEntitlement = 'button[data-cy="button-import-entitlement"]'
     verificationPlanStatus = 'div[data-cy="verification-plan-status"]'
     labelSampling = 'div[data-cy="label-SAMPLING"]'
     labelResponded = 'div[data-cy="label-RESPONDED"]'
@@ -44,6 +51,7 @@ class PaymentVerificationDetails(BaseComponents):
     buttonSubmit = 'button[data-cy="button-submit"]'
     buttonFinish = 'button[data-cy="button-ed-plan"]'
     rows = 'tr[role="checkbox"]'
+    buttonDiscard = 'button[data-cy="button-discard-plan"]'
 
     def getPageHeaderContainer(self) -> WebElement:
         return self.wait_for(self.pageHeaderContainer)
@@ -117,9 +125,36 @@ def getLabelNumberOfVerificationPlans(self) -> WebElement:
     def getButtonDeletePlan(self) -> WebElement:
         return self.wait_for(self.buttonDeletePlan)
 
+    def deleteVerificationPlanByNumber(self, number: int) -> None:
+        self.get_elements(self.buttonDeletePlan)[number].click()
+
+    def getVerificationPlanName(self, name: str) -> WebElement:
+        return self.wait_for(self.verificationPlan.format(name))
+
+    def getVerificationPlanPrefix(self) -> [WebElement]:
+        return self.get_elements(self.verificationPlanPrefix)
+
     def getButtonActivatePlan(self) -> WebElement:
         return self.wait_for(self.buttonActivatePlan)
 
+    def getExportXlsx(self) -> WebElement:
+        return self.wait_for(self.exportXlsx, timeout=120)
+
+    def getDownloadXlsx(self) -> WebElement:
+        return self.wait_for(self.downloadXlsx)
+
+    def getButtonMarkAsInvalid(self) -> WebElement:
+        return self.wait_for(self.buttonMarkAsInvalid)
+
+    def getButtonDiscard(self) -> WebElement:
+        return self.wait_for(self.buttonDiscard)
+
+    def getImportXlsx(self) -> WebElement:
+        return self.wait_for(self.importXlsx)
+
+    def getButtonImportEntitlement(self) -> WebElement:
+        return self.wait_for(self.buttonImportEntitlement)
+
     def getVerificationPlanStatus(self) -> WebElement:
         return self.wait_for(self.verificationPlanStatus)
 
diff --git a/tests/selenium/payment_module/test_payment_plans.py b/tests/selenium/payment_module/test_payment_plans.py
index e85c752552..252c9b0915 100644
--- a/tests/selenium/payment_module/test_payment_plans.py
+++ b/tests/selenium/payment_module/test_payment_plans.py
@@ -185,8 +185,52 @@ def create_payment_plan_lock_social_worker(social_worker_program: Program) -> Pa
 
 
 @pytest.fixture
-def create_payment_plan_open() -> PaymentPlan:
-    yield PaymentPlanFactory(status=PaymentPlan.Status.OPEN)
+def create_payment_plan_open(social_worker_program: Program) -> PaymentPlan:
+    program_cycle = ProgramCycleFactory(
+        program=social_worker_program,
+        title="Cycle for PaymentPlan",
+        status=ProgramCycle.ACTIVE,
+        start_date=datetime.now() + relativedelta(days=10),
+        end_date=datetime.now() + relativedelta(days=15),
+    )
+
+    payment_plan = PaymentPlanFactory(
+        status=PaymentPlan.Status.PREPARING,
+        is_follow_up=False,
+        program=social_worker_program,
+        program_cycle=program_cycle,
+        business_area=social_worker_program.business_area,
+        dispersion_start_date=datetime.now().date(),
+    )
+    hoh1 = IndividualFactory(household=None)
+    household_1 = HouseholdFactory(
+        id="3d7087be-e8f8-478d-9ca2-4ca6d5e96f51", unicef_id="HH-17-0000.3340", head_of_household=hoh1, size=2
+    )
+    IndividualFactory(
+        household=household_1,
+        program=social_worker_program,
+        sex="MALE",
+        birth_date=factory.Faker("date_of_birth", tzinfo=utc, minimum_age=11, maximum_age=16),
+    )
+    PaymentFactory(parent=payment_plan, household=household_1, excluded=False, currency="PLN")
+
+    payment_plan.update_population_count_fields()
+    payment_plan.update_money_fields()
+
+    payment_plan.status_open()
+    payment_plan.save(update_fields=("status",))
+
+    PaymentPlanFactory(
+        status=PaymentPlan.Status.LOCKED,
+        program=social_worker_program,
+        program_cycle=program_cycle,
+        business_area=social_worker_program.business_area,
+        dispersion_start_date=datetime.now().date(),
+        is_follow_up=True,
+        source_payment_plan=payment_plan,
+    )
+
+    yield payment_plan
 
 
 def payment_plan_create(program: Program, status: str = PaymentPlan.Status.LOCKED) -> PaymentPlan:
@@ -614,7 +658,6 @@ def test_payment_plan_save_exclude(
 
         assert "6" in pagePaymentModuleDetails.getLabelTargetedIndividuals().text
 
-    @pytest.mark.skip("Fix problem with fixtures")
     def test_payment_plan_delete(
         self,
         create_payment_plan_open: PaymentPlan,
@@ -625,12 +668,19 @@ def test_payment_plan_delete(
         pagePaymentModule.selectGlobalProgramFilter("Test Program")
         pagePaymentModule.getNavPaymentModule().click()
         pagePaymentModule.getNavPaymentPlans().click()
-        payment_plan = pagePaymentModule.getRow(0).text
-        pagePaymentModule.getRow(0).click()
+        pagePaymentModule.getRows()
+        for i in range(len(pagePaymentModule.getRows())):
+            if "OPEN" in pagePaymentModule.getRow(i).text:
+                payment_plan = pagePaymentModule.getRow(i).text
+                pagePaymentModule.getRow(i).click()
+                break
+        else:
+            raise AssertionError("No payment plan has Open status")
         pagePaymentModuleDetails.getDeleteButton().click()
         pagePaymentModuleDetails.getButtonSubmit().click()
         pagePaymentModule.getRow(0)
         assert payment_plan not in pagePaymentModule.getRow(0).text
+        assert "LOCKED" in pagePaymentModule.getRow(0).text
 
     def test_payment_plan_creation_error(
         self,
diff --git a/tests/selenium/payment_verification/test_payment_verification.py b/tests/selenium/payment_verification/test_payment_verification.py
index 086c14fbf1..f905899342 100644
--- a/tests/selenium/payment_verification/test_payment_verification.py
+++ b/tests/selenium/payment_verification/test_payment_verification.py
@@ -1,9 +1,13 @@
+import os
 from datetime import datetime
+from decimal import Decimal
 from time import sleep
 
+import openpyxl
 import pytest
 from dateutil.relativedelta import relativedelta
 from selenium.webdriver.common.by import By
+from sorl.thumbnail.conf import settings
 
 from hct_mis_api.apps.account.models import User
 from hct_mis_api.apps.core.fixtures import DataCollectingTypeFactory
@@ -12,21 +16,28 @@
 from hct_mis_api.apps.household.fixtures import create_household
 from hct_mis_api.apps.payment.fixtures import (
     CashPlanFactory,
+    PaymentFactory,
+    PaymentPlanFactory,
     PaymentRecordFactory,
     PaymentVerificationFactory,
     PaymentVerificationPlanFactory,
+    PaymentVerificationSummaryFactory,
 )
-from hct_mis_api.apps.payment.models import GenericPayment
+from hct_mis_api.apps.payment.models import GenericPayment, PaymentPlan
 from hct_mis_api.apps.payment.models import PaymentRecord as PR
 from hct_mis_api.apps.payment.models import PaymentVerification as PV
 from hct_mis_api.apps.payment.models import PaymentVerificationPlan
 from hct_mis_api.apps.program.fixtures import ProgramFactory
-from hct_mis_api.apps.program.models import Program
+from hct_mis_api.apps.program.models import Program, ProgramCycle
 from hct_mis_api.apps.registration_data.fixtures import RegistrationDataImportFactory
 from hct_mis_api.apps.targeting.fixtures import (
     TargetingCriteriaFactory,
     TargetPopulationFactory,
 )
+from tests.selenium.page_object.grievance.details_grievance_page import (
+    GrievanceDetailsPage,
+)
+from tests.selenium.page_object.grievance.grievance_tickets import GrievanceTickets
 from tests.selenium.page_object.payment_verification.payment_record import PaymentRecord
 from tests.selenium.page_object.payment_verification.payment_verification import (
     PaymentVerification,
@@ -34,6 +45,7 @@
 from tests.selenium.page_object.payment_verification.payment_verification_details import (
     PaymentVerificationDetails,
 )
+from tests.selenium.payment_module.test_payment_plans import find_file
 
 pytestmark = pytest.mark.django_db(transaction=True)
 
@@ -59,8 +71,129 @@ def get_program_with_dct_type_and_name(
     return program
 
 
+def create_program(name: str = "Test Program", dct_type: str = DataCollectingType.Type.STANDARD) -> Program:
+    BusinessArea.objects.filter(slug="afghanistan").update(is_payment_plan_applicable=True)
+    dct = DataCollectingTypeFactory(type=dct_type)
+    yield ProgramFactory(
+        name=name,
+        programme_code="1234",
+        start_date=datetime.now() - relativedelta(months=1),
+        end_date=datetime.now() + relativedelta(months=1),
+        data_collecting_type=dct,
+        status=Program.ACTIVE,
+        cycle__title="First cycle for Test Program",
+        cycle__status=ProgramCycle.DRAFT,
+        cycle__start_date=datetime.now() - relativedelta(days=5),
+        cycle__end_date=datetime.now() + relativedelta(days=5),
+    )
+
+
+@pytest.fixture
+def social_worker_program() -> Program:
+    yield create_program(dct_type=DataCollectingType.Type.SOCIAL)
+
+
+@pytest.fixture
+def payment_verification_3() -> None:
+    payment_verification_multiple_verification_plans(3)
+
+
+def payment_verification_multiple_verification_plans(number_verification_plans: int) -> None:
+    registration_data_import = RegistrationDataImportFactory(
+        imported_by=User.objects.first(), business_area=BusinessArea.objects.first()
+    )
+    program = Program.objects.filter(name="Active Program").first()
+    households = list()
+    for _ in range(number_verification_plans):
+        household, _ = create_household(
+            {
+                "registration_data_import": registration_data_import,
+                "admin_area": Area.objects.order_by("?").first(),
+                "program": program,
+            },
+            {"registration_data_import": registration_data_import},
+        )
+        households.append(household)
+
+    payment_plan = PaymentPlanFactory(
+        program=program,
+        status=PaymentPlan.Status.FINISHED,
+        business_area=BusinessArea.objects.filter(slug="afghanistan").first(),
+    )
+    payments = list()
+    for hh in households:
+        payments.append(
+            PaymentFactory(
+                parent=payment_plan,
+                business_area=BusinessArea.objects.first(),
+                household=hh,
+                head_of_household=household.head_of_household,
+                entitlement_quantity=Decimal("21.36"),
+                delivered_quantity=Decimal("21.36"),
+                currency="PLN",
+                status=GenericPayment.STATUS_DISTRIBUTION_SUCCESS,
+            )
+        )
+
+    PaymentVerificationSummaryFactory(payment_plan_obj=payment_plan)
+
+    for payment in payments:
+        payment_verification_plan = PaymentVerificationPlanFactory(
+            payment_plan_obj=payment_plan,
+            verification_channel=PaymentVerificationPlan.VERIFICATION_CHANNEL_MANUAL,
+        )
+
+        PaymentVerificationFactory(
+            payment_obj=payment,
+            payment_verification_plan=payment_verification_plan,
+            status=PV.STATUS_PENDING,
+        )
+
+
+@pytest.fixture
+def empty_payment_verification(social_worker_program: Program) -> None:
+    registration_data_import = RegistrationDataImportFactory(
+        imported_by=User.objects.first(), business_area=BusinessArea.objects.first()
+    )
+    program = Program.objects.filter(name="Active Program").first()
+    household, individuals = create_household(
+        {
+            "registration_data_import": registration_data_import,
+            "admin_area": Area.objects.order_by("?").first(),
+            "program": program,
+        },
+        {"registration_data_import": registration_data_import},
+    )
+
+    payment_plan = PaymentPlanFactory(
+        program=program,
+        status=PaymentPlan.Status.FINISHED,
+        business_area=BusinessArea.objects.filter(slug="afghanistan").first(),
+    )
+    PaymentFactory(
+        parent=payment_plan,
+        business_area=BusinessArea.objects.first(),
+        household=household,
+        head_of_household=household.head_of_household,
+        entitlement_quantity=Decimal("21.36"),
+        delivered_quantity=Decimal("21.36"),
+        currency="PLN",
+        status=GenericPayment.STATUS_DISTRIBUTION_SUCCESS,
+    )
+    PaymentVerificationSummaryFactory(payment_plan_obj=payment_plan)
+
+
 @pytest.fixture
 def add_payment_verification() -> PV:
+    yield payment_verification_creator()
+
+
+@pytest.fixture
+def add_payment_verification_xlsx() -> PV:
+    yield payment_verification_creator(channel=PaymentVerificationPlan.VERIFICATION_CHANNEL_XLSX)
+
+
+def payment_verification_creator(channel: str = PaymentVerificationPlan.VERIFICATION_CHANNEL_MANUAL) -> PV:
     registration_data_import = RegistrationDataImportFactory(
         imported_by=User.objects.first(), business_area=BusinessArea.objects.first()
     )
@@ -101,7 +234,7 @@ def add_payment_verification() -> PV:
     )
     payment_verification_plan = PaymentVerificationPlanFactory(
         payment_plan_obj=cash_plan,
-        verification_channel=PaymentVerificationPlan.VERIFICATION_CHANNEL_MANUAL,
+        verification_channel=channel,
     )
 
     pv_summary = cash_plan.get_payment_verification_summary
@@ -116,6 +249,15 @@ def add_payment_verification() -> PV:
     return pv
 
 
+@pytest.fixture
+def clear_downloaded_files() -> None:
+    for file in os.listdir(settings.DOWNLOAD_DIRECTORY):
+        os.remove(os.path.join(settings.DOWNLOAD_DIRECTORY, file))
+    yield
+    for file in os.listdir(settings.DOWNLOAD_DIRECTORY):
+        os.remove(os.path.join(settings.DOWNLOAD_DIRECTORY, file))
+
+
 @pytest.mark.usefixtures("login")
 class TestSmokePaymentVerification:
     def test_smoke_payment_verification(
@@ -279,12 +421,468 @@ def test_happy_path_payment_verification(
 
 @pytest.mark.usefixtures("login")
 class TestPaymentVerification:
-    @pytest.mark.skip("ToDo: Old and same value - maybe parametrization with values")
-    def test_payment_verification_create_grievance_ticket_same_value(
-        self, active_program: Program, add_payment_verification: PV, pagePaymentVerification: PaymentVerification
+    @pytest.mark.parametrize(
+        "channel",
+        [
+            "manual",
+            "rapidpro",
+            "xlsx",
+        ],
+    )
+    def test_payment_verification_create_verification_plan_full_list(
+        self,
+        channel: str,
+        active_program: Program,
+        empty_payment_verification: None,
+        pagePaymentVerification: PaymentVerification,
+        pagePaymentVerificationDetails: PaymentVerificationDetails,
+    ) -> None:
+        pagePaymentVerification.selectGlobalProgramFilter("Active Program")
+        pagePaymentVerification.getNavPaymentVerification().click()
+        pagePaymentVerification.getCashPlanTableRow().click()
+        pagePaymentVerification.getButtonNewPlan().click()
+        pagePaymentVerification.getRadioVerificationChannel(channel).click()
+        pagePaymentVerification.getButtonSubmit().click()
+        assert "PENDING" in pagePaymentVerificationDetails.getVerificationPlansSummaryStatus().text
+        assert "PENDING" in pagePaymentVerificationDetails.getVerificationPlanStatus().text
+        assert channel.upper() in pagePaymentVerificationDetails.getLabelVerificationChannel().text
+        assert "Full list" in pagePaymentVerificationDetails.getLabelSampling().text
+
+    def test_payment_verification_create_verification_plan_random_sampling_manual(
+        self,
+        active_program: Program,
+        empty_payment_verification: None,
+        pagePaymentVerification: PaymentVerification,
+        pagePaymentVerificationDetails: PaymentVerificationDetails,
+    ) -> None:
+        pagePaymentVerification.selectGlobalProgramFilter("Active Program")
+        pagePaymentVerification.getNavPaymentVerification().click()
+        pagePaymentVerification.getCashPlanTableRow().click()
+        pagePaymentVerification.getButtonNewPlan().click()
+        pagePaymentVerification.getTabRandomSampling().click()
+        pagePaymentVerification.getInputAdmincheckbox().click()
+        pagePaymentVerification.getInputAgecheckbox().click()
+        pagePaymentVerification.getInputSexcheckbox().click()
+        pagePaymentVerification.getButtonSubmit().click()
+        assert "PENDING" in pagePaymentVerificationDetails.getVerificationPlansSummaryStatus().text
+        assert "PENDING" in pagePaymentVerificationDetails.getVerificationPlanStatus().text
+        assert "MANUAL" in pagePaymentVerificationDetails.getLabelVerificationChannel().text
+        assert "Random sampling" in pagePaymentVerificationDetails.getLabelSampling().text
+        assert "0" in pagePaymentVerificationDetails.getLabelSampleSize().text
+        assert "1" in pagePaymentVerificationDetails.getLabelNumberOfVerificationPlans().text
+
+    def test_payment_verification_records(
+        self,
+        active_program: Program,
+        payment_verification_3: None,
+        pagePaymentVerification: PaymentVerification,
+        pagePaymentVerificationDetails: PaymentVerificationDetails,
+        pagePaymentRecord: PaymentRecord,
+    ) -> None:
+        pagePaymentVerification.selectGlobalProgramFilter("Active Program")
+        pagePaymentVerification.getNavPaymentVerification().click()
+        pagePaymentVerification.getCashPlanTableRow().click()
+        assert "3" in pagePaymentVerificationDetails.getLabelPaymentRecords().text
+        pagePaymentVerificationDetails.getButtonActivatePlan().click()
+        pagePaymentVerificationDetails.getButtonSubmit().click()
+
+        pagePaymentVerificationDetails.driver.execute_script(
+            """
+            container = document.querySelector("div[data-cy='main-content']")
+            container.scrollBy(0,600)
+            """
+        )
+        sleep(2)
+        pagePaymentVerificationDetails.driver.execute_script(
+            """
+            container = document.querySelector("div[data-cy='main-content']")
+            container.scrollBy(0,600)
+            """
+        )
+        sleep(2)
+        pagePaymentVerification.screenshot("0", file_path="./")
+        from tests.selenium.tools.tag_name_finder import printing
+
+        printing("Mapping", pagePaymentVerification.driver)
+        printing("Methods", pagePaymentVerification.driver)
+        printing("Assert", pagePaymentVerification.driver)
+
+    def test_payment_verification_delete(
+        self,
+        active_program: Program,
+        payment_verification_3: None,
+        pagePaymentVerification: PaymentVerification,
+        pagePaymentVerificationDetails: PaymentVerificationDetails,
+        pagePaymentRecord: PaymentRecord,
+    ) -> None:
+        pagePaymentVerification.selectGlobalProgramFilter("Active Program")
+        pagePaymentVerification.getNavPaymentVerification().click()
+        pagePaymentVerification.getCashPlanTableRow().click()
+        pagePaymentVerificationDetails.getButtonDeletePlan()
+        before_list_of_verification_plans = [i.text for i in pagePaymentVerificationDetails.getVerificationPlanPrefix()]
+        pagePaymentVerificationDetails.deleteVerificationPlanByNumber(1)
+        pagePaymentVerificationDetails.getButtonSubmit().click()
+        for _ in range(50):
+            if 2 == len(pagePaymentVerificationDetails.getVerificationPlanPrefix()):
+                break
+        else:
+            raise AssertionError("Verification Plan was not deleted")
+        assert before_list_of_verification_plans[1] not in pagePaymentVerificationDetails.getVerificationPlanPrefix()
+
+    def test_payment_verification_edit(
+        self,
+        active_program: Program,
+        payment_verification_3: None,
+        pagePaymentVerification: PaymentVerification,
+        pagePaymentVerificationDetails: PaymentVerificationDetails,
+        pagePaymentRecord: PaymentRecord,
+    ) -> None:
+        pagePaymentVerification.selectGlobalProgramFilter("Active Program")
+        pagePaymentVerification.getNavPaymentVerification().click()
+        pagePaymentVerification.getCashPlanTableRow().click()
+        pagePaymentVerificationDetails.getButtonEditPlan().click()
+        pagePaymentVerification.getTabFullList().click()
+        if "MANUAL" in pagePaymentVerificationDetails.getLabelVerificationChannel().text:
+            pagePaymentVerification.getRadioVerificationChannel("xlsx").click()
+            channel = "XLSX"
+        else:
+            pagePaymentVerification.getRadioVerificationChannel("manual").click()
+            channel = "MANUAL"
+
+        pagePaymentVerification.getButtonSubmit().click()
+        assert "PENDING" in pagePaymentVerificationDetails.getVerificationPlansSummaryStatus().text
+        assert "PENDING" in pagePaymentVerificationDetails.getVerificationPlanStatus().text
+        for _ in range(50):
+            if channel in pagePaymentVerificationDetails.getLabelVerificationChannel().text:
+                break
+        else:
+            assert channel in pagePaymentVerificationDetails.getLabelVerificationChannel().text
+        assert "Full list" in pagePaymentVerificationDetails.getLabelSampling().text
+
+    def test_payment_verification_successful_received(
+        self,
+        active_program: Program,
+        add_payment_verification: PV,
+        pagePaymentVerification: PaymentVerification,
+        pagePaymentVerificationDetails: PaymentVerificationDetails,
+        pagePaymentRecord: PaymentRecord,
+    ) -> None:
+        pagePaymentVerification.selectGlobalProgramFilter("Active Program")
+        pagePaymentVerification.getNavPaymentVerification().click()
+        pagePaymentVerification.getCashPlanTableRow().click()
+        pagePaymentVerificationDetails.getButtonActivatePlan().click()
+        pagePaymentVerificationDetails.getButtonSubmit().click()
+
+        assert 1 == len(pagePaymentVerificationDetails.getRows())
+        pagePaymentVerificationDetails.scroll(execute=2)
+        pagePaymentVerificationDetails.getRows()[0].find_element(By.TAG_NAME, "a").click()
+        quantity = pagePaymentRecord.getLabelDeliveredQuantity().text
+        pagePaymentRecord.getButtonEdPlan().click()
+        pagePaymentRecord.getInputReceivedamount().send_keys(quantity)
+        pagePaymentRecord.getButtonSubmit().click()
+        pagePaymentRecord.getArrowBack().click()
+
+        assert pagePaymentRecord.waitForStatusContainer("RECEIVED")
+        assert "RECEIVED" == pagePaymentRecord.getStatusContainer().text
+
+    def test_payment_verification_successful_not_received(
+        self,
+        active_program: Program,
+        add_payment_verification: PV,
+        pagePaymentVerification: PaymentVerification,
+        pagePaymentVerificationDetails: PaymentVerificationDetails,
+        pagePaymentRecord: PaymentRecord,
+    ) -> None:
+        pagePaymentVerification.selectGlobalProgramFilter("Active Program")
+        pagePaymentVerification.getNavPaymentVerification().click()
+        pagePaymentVerification.getCashPlanTableRow().click()
+        pagePaymentVerificationDetails.getButtonActivatePlan().click()
+        pagePaymentVerificationDetails.getButtonSubmit().click()
+
+        assert 1 == len(pagePaymentVerificationDetails.getRows())
+        pagePaymentVerificationDetails.scroll(execute=2)
+        pagePaymentVerificationDetails.getRows()[0].find_element(By.TAG_NAME, "a").click()
+        pagePaymentRecord.getButtonEdPlan().click()
+        pagePaymentRecord.getChoiceNotReceived().click()
+        pagePaymentRecord.getButtonSubmit().click()
+        pagePaymentRecord.getArrowBack().click()
+
+        assert pagePaymentRecord.waitForStatusContainer("NOT RECEIVED")
+
+    def test_payment_verification_partially_successful_received_and_grievance_ticket(
+        self,
+        active_program: Program,
+        add_payment_verification: PV,
+        pagePaymentVerification: PaymentVerification,
+        pagePaymentVerificationDetails: PaymentVerificationDetails,
+        pagePaymentRecord: PaymentRecord,
+        pageGrievanceTickets: GrievanceTickets,
+        pageGrievanceDetailsPage: GrievanceDetailsPage,
+    ) -> None:
+        pagePaymentVerification.selectGlobalProgramFilter("Active Program")
+
+        pagePaymentVerification.getNavPaymentVerification().click()
+        pagePaymentVerification.getCashPlanTableRow().click()
+        pagePaymentVerificationDetails.getButtonActivatePlan().click()
+        pagePaymentVerificationDetails.getButtonSubmit().click()
+
+        assert 1 == len(pagePaymentVerificationDetails.getRows())
+        pagePaymentVerificationDetails.scroll(execute=2)
+        pagePaymentVerificationDetails.getRows()[0].find_element(By.TAG_NAME, "a").click()
+        quantity = float(pagePaymentRecord.getLabelDeliveredQuantity().text) - 1
+        pagePaymentRecord.getButtonEdPlan().click()
+        pagePaymentRecord.getInputReceivedamount().send_keys(str(quantity))
+        pagePaymentRecord.getButtonSubmit().click()
+        pagePaymentRecord.getArrowBack().click()
+
+        assert pagePaymentRecord.waitForStatusContainer("RECEIVED WITH ISSUES")
+
+        pagePaymentVerificationDetails.getButtonFinish().click()
+        pagePaymentVerificationDetails.getButtonSubmit().click()
+
+        pageGrievanceTickets.getNavGrievance().click()
+        pageGrievanceTickets.getTabSystemGenerated().click()
+        assert 1 == len(pageGrievanceTickets.getTicketListRow())
+        pageGrievanceTickets.getTicketListRow()[0].click()
+        pageGrievanceDetailsPage.getButtonAssignToMe().click()
+        pageGrievanceDetailsPage.getButtonSetInProgress().click()
+
+        pageGrievanceDetailsPage.getGrievanceVerify().click()
+        pageGrievanceDetailsPage.getInputNewReceivedAmount().send_keys(str(quantity + 1))
+        pageGrievanceDetailsPage.getButtonSubmit().click()
+
+        pageGrievanceDetailsPage.getButtonSendForApproval().click()
+        pageGrievanceDetailsPage.getGrievanceApprove().click()
+        pageGrievanceDetailsPage.getButtonConfirm().click()
+
+        pageGrievanceDetailsPage.getButtonCloseTicket().click()
+        pageGrievanceDetailsPage.getButtonConfirm().click()
+
+        pagePaymentVerification.getNavPaymentVerification().click()
+        pagePaymentVerification.getCashPlanTableRow().click()
+
+        assert pagePaymentRecord.waitForStatusContainer("RECEIVED")
+        assert "RECEIVED" == pagePaymentRecord.getStatusContainer().text
+
+        pageGrievanceTickets.scroll(execute=2)
+        pageGrievanceTickets.screenshot("0", file_path="./")
+
+    def test_payment_verification_by_payment_related_complaint(
+        self,
+        active_program: Program,
+        add_payment_verification: PV,
+        pagePaymentVerification: PaymentVerification,
+        pagePaymentVerificationDetails: PaymentVerificationDetails,
+        pagePaymentRecord: PaymentRecord,
+    ) -> None:
+        pagePaymentVerification.selectGlobalProgramFilter("Active Program")
+
+    def test_payment_verification_xlsx_successful(
+        self,
+        clear_downloaded_files: None,
+        active_program: Program,
+        add_payment_verification_xlsx: PV,
+        pagePaymentVerification: PaymentVerification,
+        pagePaymentVerificationDetails: PaymentVerificationDetails,
+        pagePaymentRecord: PaymentRecord,
+    ) -> None:
+        pagePaymentVerification.selectGlobalProgramFilter("Active Program")
+
+        pagePaymentVerification.getNavPaymentVerification().click()
+        pagePaymentVerification.getCashPlanTableRow().click()
+        pagePaymentVerificationDetails.getButtonActivatePlan().click()
+        pagePaymentVerificationDetails.getButtonSubmit().click()
+
+        pagePaymentVerificationDetails.getExportXlsx().click()
+
+        # ToDo: Workaround: Bug 220111
+        sleep(2)
+        pagePaymentVerificationDetails.driver.refresh()
+
+        pagePaymentVerificationDetails.getDownloadXlsx().click()
+
+        xlsx_file = find_file(".xlsx", number_of_ties=10)
+        wb1 = openpyxl.load_workbook(os.path.join(settings.DOWNLOAD_DIRECTORY, xlsx_file))
+        ws1 = wb1.active
+        for cell in ws1["N:N"]:
+            if cell.row >= 2:
+                ws1.cell(row=cell.row, column=3, value="YES")
+                ws1.cell(row=cell.row, column=16, value=ws1.cell(row=cell.row, column=15).value)
+
+        wb1.save(os.path.join(settings.DOWNLOAD_DIRECTORY, xlsx_file))
+        pagePaymentVerificationDetails.getImportXlsx().click()
+
+        pagePaymentVerificationDetails.upload_file(
+            os.path.abspath(os.path.join(settings.DOWNLOAD_DIRECTORY, xlsx_file)), timeout=120
+        )
+
+        pagePaymentVerificationDetails.getButtonImportEntitlement().click()
+
+        assert pagePaymentRecord.waitForStatusContainer("RECEIVED")
+        assert "RECEIVED" == pagePaymentRecord.getStatusContainer().text
+
+    def test_payment_verification_xlsx_partially_successful(
+        self,
+        clear_downloaded_files: None,
+        active_program: Program,
+        add_payment_verification_xlsx: PV,
+        pagePaymentVerification: PaymentVerification,
+        pagePaymentVerificationDetails: PaymentVerificationDetails,
+        pagePaymentRecord: PaymentRecord,
+    ) -> None:
+        pagePaymentVerification.selectGlobalProgramFilter("Active Program")
+
+        pagePaymentVerification.getNavPaymentVerification().click()
+        pagePaymentVerification.getCashPlanTableRow().click()
+        pagePaymentVerificationDetails.getButtonActivatePlan().click()
+        pagePaymentVerificationDetails.getButtonSubmit().click()
+
+        assert 1 == len(pagePaymentVerificationDetails.getRows())
+        pagePaymentVerificationDetails.scroll(execute=2)
+        pagePaymentVerificationDetails.getRows()[0].find_element(By.TAG_NAME, "a").click()
+        quantity = pagePaymentRecord.getLabelDeliveredQuantity().text
+        pagePaymentRecord.getArrowBack().click()
+
+        pagePaymentVerificationDetails.getExportXlsx().click()
+
+        # ToDo: Workaround: Bug 220111
+        sleep(2)
+        pagePaymentVerificationDetails.driver.refresh()
+
+        pagePaymentVerificationDetails.getDownloadXlsx().click()
+
+        xlsx_file = find_file(".xlsx", number_of_ties=10)
+        wb1 = openpyxl.load_workbook(os.path.join(settings.DOWNLOAD_DIRECTORY, xlsx_file))
+        ws1 = wb1.active
+        for cell in ws1["N:N"]:
+            if cell.row >= 2:
+                ws1.cell(row=cell.row, column=3, value="YES")
+                ws1.cell(row=cell.row, column=16, value=float(quantity) - 1.0)
+
+        wb1.save(os.path.join(settings.DOWNLOAD_DIRECTORY, xlsx_file))
+        pagePaymentVerificationDetails.getImportXlsx().click()
+
+        pagePaymentVerificationDetails.upload_file(
+            os.path.abspath(os.path.join(settings.DOWNLOAD_DIRECTORY, xlsx_file)), timeout=120
+        )
+
+        pagePaymentVerificationDetails.getButtonImportEntitlement().click()
+
+        assert pagePaymentRecord.waitForStatusContainer("RECEIVED WITH ISSUES")
+
+    def test_payment_verification_xlsx_not_received(
+        self,
+        clear_downloaded_files: None,
+        active_program: Program,
+        add_payment_verification_xlsx: PV,
+        pagePaymentVerification: PaymentVerification,
+        pagePaymentVerificationDetails: PaymentVerificationDetails,
+        pagePaymentRecord: PaymentRecord,
+    ) -> None:
+        pagePaymentVerification.selectGlobalProgramFilter("Active Program")
+
+        pagePaymentVerification.getNavPaymentVerification().click()
+        pagePaymentVerification.getCashPlanTableRow().click()
+        pagePaymentVerificationDetails.getButtonActivatePlan().click()
+        pagePaymentVerificationDetails.getButtonSubmit().click()
+
+        pagePaymentVerificationDetails.getExportXlsx().click()
+
+        # ToDo: Workaround: Bug 220111
+        sleep(2)
+        pagePaymentVerificationDetails.driver.refresh()
+
+        pagePaymentVerificationDetails.getDownloadXlsx().click()
+
+        xlsx_file = find_file(".xlsx", number_of_ties=10)
+        wb1 = openpyxl.load_workbook(os.path.join(settings.DOWNLOAD_DIRECTORY, xlsx_file))
+        ws1 = wb1.active
+        for cell in ws1["N:N"]:
+            if cell.row >= 2:
+                ws1.cell(row=cell.row, column=3, value="NO")
+                ws1.cell(row=cell.row, column=16, value=0)
+
+        wb1.save(os.path.join(settings.DOWNLOAD_DIRECTORY, xlsx_file))
+        pagePaymentVerificationDetails.getImportXlsx().click()
+
+        pagePaymentVerificationDetails.upload_file(
+            os.path.abspath(os.path.join(settings.DOWNLOAD_DIRECTORY, xlsx_file)), timeout=120
+        )
+
+        pagePaymentVerificationDetails.getButtonImportEntitlement().click()
+
+        assert pagePaymentRecord.waitForStatusContainer("NOT RECEIVED")
+
+    def test_payment_verification_discard(
+        self,
+        clear_downloaded_files: None,
+        active_program: Program,
+        add_payment_verification_xlsx: PV,
+        pagePaymentVerification: PaymentVerification,
+        pagePaymentVerificationDetails: PaymentVerificationDetails,
+        pagePaymentRecord: PaymentRecord,
+    ) -> None:
+        pagePaymentVerification.selectGlobalProgramFilter("Active Program")
+
+        pagePaymentVerification.getNavPaymentVerification().click()
+        pagePaymentVerification.getCashPlanTableRow().click()
+        pagePaymentVerificationDetails.getButtonActivatePlan().click()
+        pagePaymentVerificationDetails.getButtonSubmit().click()
+        pagePaymentVerificationDetails.getButtonDiscard().click()
+        pagePaymentVerificationDetails.getButtonSubmit().click()
+
+        pagePaymentVerificationDetails.getButtonActivatePlan().click()
+        pagePaymentVerificationDetails.getButtonSubmit().click()
+
+        # ToDo: Workaround: Bug 220111
+        sleep(2)
+        pagePaymentVerificationDetails.driver.refresh()
+
+        pagePaymentVerificationDetails.getExportXlsx().click()
+
+        # ToDo: Workaround: Bug 220111
+        sleep(2)
+        pagePaymentVerificationDetails.driver.refresh()
+
+        pagePaymentVerificationDetails.getDownloadXlsx().click()
+
+        pagePaymentVerificationDetails.getButtonDiscard().click()
+        pagePaymentVerificationDetails.getButtonSubmit().click()
+
+        pagePaymentVerificationDetails.checkAlert("You cant discard if xlsx file was downloaded or imported")
+
+    def test_payment_verification_xlsx_invalid(
+        self,
+        clear_downloaded_files: None,
+        active_program: Program,
+        add_payment_verification_xlsx: PV,
+        pagePaymentVerification: PaymentVerification,
+        pagePaymentVerificationDetails: PaymentVerificationDetails,
+        pagePaymentRecord: PaymentRecord,
     ) -> None:
         pagePaymentVerification.selectGlobalProgramFilter("Active Program")
-        # Upon resolving the Payment Verification grievance ticket,
-        # the received value changes with the new verified value.
-        # If the received value is 0, it should stay 0 even when a new verified value is provided in the ticket.
-        # Check conversation with Jakub
+
+        pagePaymentVerification.getNavPaymentVerification().click()
+        pagePaymentVerification.getCashPlanTableRow().click()
+        pagePaymentVerificationDetails.getButtonActivatePlan().click()
+        pagePaymentVerificationDetails.getButtonSubmit().click()
+
+        pagePaymentVerificationDetails.getExportXlsx().click()
+
+        # ToDo: Workaround: Bug 220111
+        sleep(2)
+        pagePaymentVerificationDetails.driver.refresh()
+
+        pagePaymentVerificationDetails.getDownloadXlsx().click()
+
+        # ToDo: Workaround: Bug 220111
+        sleep(2)
+        pagePaymentVerificationDetails.driver.refresh()
+
+        pagePaymentVerificationDetails.getButtonMarkAsInvalid().click()
+
+        # ToDo: Workaround: Bug 220111
+        sleep(2)
+        pagePaymentVerificationDetails.driver.refresh()
+
+        assert "INVALID" in pagePaymentVerificationDetails.getVerificationPlanStatus().text
diff --git a/tests/unit/api/test_api_token.py b/tests/unit/api/test_api_token.py
new file mode 100644
index 0000000000..910f7a3989
--- /dev/null
+++ b/tests/unit/api/test_api_token.py
@@ -0,0 +1,73 @@
+import json
+from datetime import datetime
+from typing import Any
+from unittest.mock import patch
+
+from django.conf import settings
+from django.http import HttpRequest
+from django.test import TestCase, override_settings
+
+from constance.test import override_config
+
+from hct_mis_api.api.admin import TOKEN_INFO_EMAIL, APITokenAdmin
+from hct_mis_api.api.models import Grant
+from hct_mis_api.apps.account.fixtures import UserFactory
+from hct_mis_api.apps.core.fixtures import create_afghanistan
+from tests.unit.api.factories import APITokenFactory
+
+
+class TestApiToken(TestCase):
+    @classmethod
+    def setUpClass(cls) -> None:
+        super().setUpClass()
+        cls.afg = create_afghanistan()
+        cls.user = UserFactory(
+            email="testapitoken@email.com",
+        )
+        cls.token = APITokenFactory(
+            user=cls.user,
+            grants=[
+                Grant.API_READ_ONLY.name,
+                Grant.API_RDI_UPLOAD.name,
+                Grant.API_PROGRAM_CREATE.name,
+            ],
+            valid_to=datetime(2050, 1, 1),
+        )
+        cls.token.valid_for.set([cls.afg])
+
+    @patch("hct_mis_api.apps.utils.mailjet.requests.post")
+    @patch.object(APITokenAdmin, "message_user", return_value=None)
+    @patch.object(APITokenAdmin, "__init__", return_value=None)
+    @override_settings(EMAIL_SUBJECT_PREFIX="test")
+    @override_config(ENABLE_MAILJET=True)
+    def test_send_api_token(
+        self, mocked_requests_init: Any, mocked_requests_user: Any, mocked_requests_post: Any
+    ) -> None:
+        request = HttpRequest()
+
+        APITokenAdmin()._send_token_email(request, self.token, TOKEN_INFO_EMAIL)
+
+        mocked_requests_post.assert_called_once()
+
+        expected_data = json.dumps(
+            {
+                "Messages": [
+                    {
+                        "From": {"Email": settings.DEFAULT_EMAIL, "Name": settings.DEFAULT_EMAIL_DISPLAY},
+                        "Subject": f"[test] HOPE API Token {self.token} infos",
+                        "To": [
+                            {
+                                "Email": "testapitoken@email.com",
+                            },
+                        ],
+                        "Cc": [],
+                        "TextPart": f"\nDear {self.user.first_name},\n\nplease find below API token infos\n\nName: {self.token}\nKey: {self.token.key}\nGrants: {self.token.grants}\nExpires: {self.token.valid_to}\nBusiness Areas: {', '.join(self.token.valid_for.values_list('name', flat=True))}\n\nRegards\n\nThe HOPE Team\n",
+                    }
+                ]
+            }
+        )
+        mocked_requests_post.assert_called_with(
+            "https://api.mailjet.com/v3.1/send",
+            auth=(settings.MAILJET_API_KEY, settings.MAILJET_SECRET_KEY),
+            data=expected_data,
+        )
diff --git a/tests/unit/api/test_lookups.py b/tests/unit/api/test_lookups.py
index f42ceef126..0bc338f9e1 100644
--- a/tests/unit/api/test_lookups.py
+++ b/tests/unit/api/test_lookups.py
@@ -6,7 +6,7 @@
 
 from hct_mis_api.api.models import Grant
 from hct_mis_api.apps.geo.fixtures import AreaFactory, AreaTypeFactory, CountryFactory
-from hct_mis_api.apps.geo.models import Area, AreaType
+from hct_mis_api.apps.geo.models import Area, AreaType, Country
 from hct_mis_api.apps.program.models import Program
 from tests.unit.api.base import HOPEApiTestCase, token_grant_permission
 
@@ -53,6 +53,19 @@ def setUpTestData(cls) -> None:
         cls.country_afghanistan.save(update_fields=["valid_from", "valid_until"])
         cls.url = reverse("api:country-list")
 
+    def get_response(self, country: Country) -> dict:
+        return {
+            "id": str(country.id),
+            "name": country.name,
+            "short_name": country.short_name,
+            "iso_code2": country.iso_code2,
+            "iso_code3": country.iso_code3,
+            "iso_num": country.iso_num,
+            "updated_at": country.updated_at.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
+            "valid_from": country.valid_from.strftime("%Y-%m-%dT%H:%M:%SZ"),
+            "valid_until": country.valid_until.strftime("%Y-%m-%dT%H:%M:%SZ"),
+        }
+
     def test_get_countries(self) -> None:
         with token_grant_permission(self.token, Grant.API_READ_ONLY):
             response = self.client.get(self.url)
@@ -60,20 +73,8 @@ def test_get_countries(self) -> None:
         self.assertEqual(
             response.json()["results"],
             [
-                {
-                    "name": self.country_afghanistan.name,
-                    "short_name": self.country_afghanistan.short_name,
-                    "iso_code2": self.country_afghanistan.iso_code2,
-                    "iso_code3": self.country_afghanistan.iso_code3,
-                    "iso_num": self.country_afghanistan.iso_num,
-                },
-                {
-                    "name": self.country_poland.name,
-                    "short_name": self.country_poland.short_name,
-                    "iso_code2": self.country_poland.iso_code2,
-                    "iso_code3": self.country_poland.iso_code3,
-                    "iso_num": self.country_poland.iso_num,
-                },
+                self.get_response(self.country_afghanistan),
+                self.get_response(self.country_poland),
             ],
         )
         self.assertIn("count", response.json())
@@ -93,13 +94,7 @@ def test_get_countries_filter_valid_from_until(self) -> None:
             self.assertEqual(len(response.json()["results"]), len(expected_result), filter_data)
             for result in expected_result:
                 self.assertIn(
-                    {
-                        "name": result.name,
-                        "short_name": result.short_name,
-                        "iso_code2": result.iso_code2,
-                        "iso_code3": result.iso_code3,
-                        "iso_num": result.iso_num,
-                    },
+                    self.get_response(result),
                     response.json()["results"],
                     filter_data,
                 )
@@ -117,13 +112,7 @@ def test_get_countries_search(self) -> None:
             self.assertEqual(response.status_code, status.HTTP_200_OK, filter_data)
             self.assertEqual(len(response.json()["results"]), 1, filter_data)
             self.assertIn(
-                {
-                    "name": expected_result.name,
-                    "short_name": expected_result.short_name,
-                    "iso_code2": expected_result.iso_code2,
-                    "iso_code3": expected_result.iso_code3,
-                    "iso_num": expected_result.iso_num,
-                },
+                self.get_response(expected_result),
                 response.json()["results"],
                 filter_data,
             )
diff --git a/tests/unit/apps/payment/test_payment_notification.py b/tests/unit/apps/payment/test_payment_notification.py
index 3b78154964..5708be2c32 100644
--- a/tests/unit/apps/payment/test_payment_notification.py
+++ b/tests/unit/apps/payment/test_payment_notification.py
@@ -263,7 +263,7 @@ def test_send_email_notification(self, mock_send: Any) -> None:
         payment_notification.send_email_notification()
         self.assertEqual(
             mock_send.call_count,
-            3,
+            1,
         )
 
     @mock.patch("hct_mis_api.apps.payment.notifications.MailjetClient.send_email")
@@ -276,8 +276,7 @@ def test_send_email_notification_subject_test_env(self, mock_send: Any) -> None:
             self.user_action_user,
             f"{timezone.now():%-d %B %Y}",
         )
-        for mailjet_client in payment_notification.emails:
-            self.assertEqual(mailjet_client.subject, "[test] Payment pending for Approval")
+        self.assertEqual(payment_notification.email.subject, "[test] Payment pending for Approval")
 
     @mock.patch("hct_mis_api.apps.payment.notifications.MailjetClient.send_email")
     @override_config(SEND_PAYMENT_PLANS_NOTIFICATION=True)
@@ -289,8 +288,7 @@ def test_send_email_notification_subject_prod_env(self, mock_send: Any) -> None:
             self.user_action_user,
             f"{timezone.now():%-d %B %Y}",
         )
-        for mailjet_client in payment_notification.emails:
-            self.assertEqual(mailjet_client.subject, "Payment pending for Approval")
+        self.assertEqual(payment_notification.email.subject, "Payment pending for Approval")
 
     @mock.patch("hct_mis_api.apps.utils.mailjet.requests.post")
     @override_config(
@@ -305,14 +303,18 @@ def test_send_email_notification_catch_all_email(self, mock_post: Any) -> None:
             f"{timezone.now():%-d %B %Y}",
         )
         payment_notification.send_email_notification()
-        for mailjet_client in payment_notification.emails:
-            self.assertEqual(
-                mailjet_client.recipients,
-                ["catchallemail@email.com", "catchallemail2@email.com"],
-            )
+        self.assertEqual(len(payment_notification.email.recipients), 2)
+        self.assertIn(
+            "catchallemail@email.com",
+            payment_notification.email.recipients,
+        )
+        self.assertIn(
+            "catchallemail2@email.com",
+            payment_notification.email.recipients,
+        )
         self.assertEqual(
             mock_post.call_count,
-            3,
+            1,
         )
 
     @mock.patch("hct_mis_api.apps.utils.mailjet.requests.post")
@@ -327,18 +329,22 @@ def test_send_email_notification_without_catch_all_email(self, mock_post: Any) -
             f"{timezone.now():%-d %B %Y}",
         )
         payment_notification.send_email_notification()
-        for mailjet_client in payment_notification.emails:
-            self.assertIn(
-                mailjet_client.recipients[0],
-                [
-                    self.user_with_approval_permission_partner_unicef.email,
-                    self.user_with_approval_permission_partner_with_program_access.email,
-                    self.user_with_partner_action_permissions_and_program_access.email,
-                ],
-            )
+        self.assertEqual(len(payment_notification.email.recipients), 3)
+        self.assertIn(
+            self.user_with_approval_permission_partner_unicef.email,
+            payment_notification.email.recipients,
+        )
+        self.assertIn(
+            self.user_with_approval_permission_partner_with_program_access.email,
+            payment_notification.email.recipients,
+        )
+        self.assertIn(
+            self.user_with_partner_action_permissions_and_program_access.email,
+            payment_notification.email.recipients,
+        )
         self.assertEqual(
             mock_post.call_count,
-            3,
+            1,
         )
 
     @mock.patch("hct_mis_api.apps.utils.mailjet.requests.post")
@@ -356,16 +362,16 @@ def test_send_email_notification_exclude_superuser(self, mock_post: Any) -> None
             f"{timezone.now():%-d %B %Y}",
         )
         payment_notification.send_email_notification()
-        for mailjet_client in payment_notification.emails:
-            self.assertIn(
-                mailjet_client.recipients[0],
-                [
-                    self.user_with_approval_permission_partner_with_program_access.email,
-                    self.user_with_partner_action_permissions_and_program_access.email,
-                ],
-            )
-        self.assertNotIn(self.user_with_approval_permission_partner_unicef.email, payment_notification.emails)
+        self.assertEqual(len(payment_notification.email.recipients), 2)
+        self.assertIn(
+            self.user_with_approval_permission_partner_with_program_access.email,
+            payment_notification.email.recipients,
+        )
+        self.assertIn(
+            self.user_with_partner_action_permissions_and_program_access.email,
+            payment_notification.email.recipients,
+        )
         self.assertEqual(
             mock_post.call_count,
-            2,
+            1,
         )