diff --git a/client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx b/client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx
index a4b97cea9..e5e9ef221 100644
--- a/client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx
+++ b/client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx
@@ -99,6 +99,7 @@ export function BillDetailEditReturn({
                     <tr>
                       <td>
                         <Checkbox
+                          data-cy="billline-checkbox"
                           onChange={(e) => {
                             form.setFieldsValue({
                               billlines: form
@@ -127,7 +128,7 @@ export function BillDetailEditReturn({
                             name={[field.name, "selected"]}
                             valuePropName="checked"
                           >
-                            <Checkbox data-cy="billline-checkbox" />
+                            <Checkbox />
                           </Form.Item>
                         </td>
                         <td>
diff --git a/client/src/components/bills-list-table/bills-list-table.component.jsx b/client/src/components/bills-list-table/bills-list-table.component.jsx
index a109f4b1b..2c7602156 100644
--- a/client/src/components/bills-list-table/bills-list-table.component.jsx
+++ b/client/src/components/bills-list-table/bills-list-table.component.jsx
@@ -129,7 +129,12 @@ export function BillsListTableComponent({
       sortOrder:
         state.sortedInfo.columnKey === "is_credit_memo" &&
         state.sortedInfo.order,
-      render: (text, record) => <Checkbox checked={record.is_credit_memo} />,
+      render: (text, record) => (
+        <Checkbox
+          data-cy="credit-memo-checkbox"
+          checked={record.is_credit_memo}
+        />
+      ),
     },
     {
       title: t("bills.fields.exported"),
diff --git a/client/src/components/jobs-detail-pli/jobs-detail-pli.component.jsx b/client/src/components/jobs-detail-pli/jobs-detail-pli.component.jsx
index e992f6b72..3b7e7e48c 100644
--- a/client/src/components/jobs-detail-pli/jobs-detail-pli.component.jsx
+++ b/client/src/components/jobs-detail-pli/jobs-detail-pli.component.jsx
@@ -5,7 +5,6 @@ import BillDetailEditcontainer from "../bill-detail-edit/bill-detail-edit.contai
 import BillsListTable from "../bills-list-table/bills-list-table.component";
 import JobBillsTotal from "../job-bills-total/job-bills-total.component";
 import PartsOrderListTableComponent from "../parts-order-list-table/parts-order-list-table.component";
-import PartsOrderModal from "../parts-order-modal/parts-order-modal.container";
 
 export default function JobsDetailPliComponent({
   job,
@@ -15,7 +14,6 @@ export default function JobsDetailPliComponent({
 }) {
   return (
     <div>
-      <PartsOrderModal />
       {billsQuery.error ? (
         <AlertComponent message={billsQuery.error.message} type="error" />
       ) : null}
diff --git a/client/src/components/parts-order-modal/parts-order-modal.component.jsx b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
index 038d119f7..a2268dc1f 100644
--- a/client/src/components/parts-order-modal/parts-order-modal.component.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
@@ -256,7 +256,7 @@ export function PartsOrderModalComponent({
                           },
                         ]}
                       >
-                        <InputNumber id="order-quantity" />
+                        <InputNumber data-cy="order-quantity" />
                       </Form.Item>
                       <Form.Item
                         label={t("parts_orders.fields.act_price")}