diff --git a/components/message-actions.tsx b/components/message-actions.tsx
index 31cc482..10807b3 100644
--- a/components/message-actions.tsx
+++ b/components/message-actions.tsx
@@ -52,6 +52,7 @@ export function PureMessageActions({
           {setMode && (
             <Action
               className="-left-10 absolute top-0 opacity-0 transition-opacity group-hover/message:opacity-100"
+              data-testid="message-edit-button"
               onClick={() => setMode("edit")}
               tooltip="Edit"
             >
diff --git a/components/multimodal-input.tsx b/components/multimodal-input.tsx
index a951834..c95527e 100644
--- a/components/multimodal-input.tsx
+++ b/components/multimodal-input.tsx
@@ -333,6 +333,7 @@ function PureMultimodalInput({
               className="size-8 rounded-full bg-primary text-primary-foreground transition-colors duration-200 hover:bg-primary/90 disabled:bg-muted disabled:text-muted-foreground"
               disabled={!input.trim() || uploadQueue.length > 0}
               status={status}
+	      data-testid="send-button"
             >
               <ArrowUpIcon size={14} />
             </PromptInputSubmit>
diff --git a/components/preview-attachment.tsx b/components/preview-attachment.tsx
index a2d6b07..ade1807 100644
--- a/components/preview-attachment.tsx
+++ b/components/preview-attachment.tsx
@@ -35,7 +35,10 @@ export const PreviewAttachment = ({
       )}
 
       {isUploading && (
-        <div className="absolute inset-0 flex items-center justify-center bg-black/50">
+        <div
+	  className="absolute inset-0 flex items-center justify-center bg-black/50"
+	  data-testid="input-attachment-loader"
+	>
           <Loader size={16} />
         </div>
       )}