diff --git a/src/components/Editor/CustomExtensions/Embeds/EmbedComponent.jsx b/src/components/Editor/CustomExtensions/Embeds/EmbedComponent.jsx
index e463d663..f9f1b2f6 100644
--- a/src/components/Editor/CustomExtensions/Embeds/EmbedComponent.jsx
+++ b/src/components/Editor/CustomExtensions/Embeds/EmbedComponent.jsx
@@ -39,6 +39,7 @@ const EmbedComponent = ({
   return (
     <NodeViewWrapper
       className={`neeto-editor__video-wrapper neeto-editor__video--${align}`}
+      data-cy="neeto-editor-video-wrapper"
     >
       <Resizable
         lockAspectRatio
diff --git a/src/components/Editor/CustomExtensions/Image/ExtensionConfig.js b/src/components/Editor/CustomExtensions/Image/ExtensionConfig.js
index 9133d75f..5af4cba9 100644
--- a/src/components/Editor/CustomExtensions/Image/ExtensionConfig.js
+++ b/src/components/Editor/CustomExtensions/Image/ExtensionConfig.js
@@ -39,7 +39,7 @@ export default Node.create({
 
   content: "inline*",
 
-  draggable: true,
+  draggable: false,
 
   isolating: true,
 
@@ -181,14 +181,13 @@ export default Node.create({
                   const url = await upload(image, DIRECT_UPLOAD_ENDPOINT);
                   url &&
                     view.state.doc.descendants((node, pos) => {
-                      if (node.attrs.id === id) {
-                        const transaction = view.state.tr.setNodeMarkup(
-                          pos,
-                          null,
-                          { src: url }
-                        );
-                        view.dispatch(transaction);
-                      }
+                      if (!(node.attrs.id === id)) return;
+                      const transaction = view.state.tr.setNodeMarkup(
+                        pos,
+                        null,
+                        { src: url }
+                      );
+                      view.dispatch(transaction);
                     });
                 } catch {
                   view.dispatch(view.state.tr.delete(pos, pos + 1));
diff --git a/src/components/Editor/CustomExtensions/Image/Menu.jsx b/src/components/Editor/CustomExtensions/Image/Menu.jsx
index 87f632aa..b7ed5cb3 100644
--- a/src/components/Editor/CustomExtensions/Image/Menu.jsx
+++ b/src/components/Editor/CustomExtensions/Image/Menu.jsx
@@ -25,6 +25,7 @@ const Menu = ({ align, editor, updateAttributes, deleteNode }) => {
     >
       {menuOptions.map(({ Icon, optionName, alignPos }) => (
         <Button
+          data-cy={`neeto-editor-image-menu-${optionName}`}
           icon={Icon}
           key={optionName}
           style={alignPos === align ? "secondary" : "text"}
diff --git a/src/utils/ActiveStorageUpload.js b/src/utils/ActiveStorageUpload.js
index ceddc04f..3e1e9e45 100644
--- a/src/utils/ActiveStorageUpload.js
+++ b/src/utils/ActiveStorageUpload.js
@@ -31,7 +31,7 @@ class ActiveStorageUpload extends BasePlugin {
 
   uploadFile = async file => {
     const handleProgress = xhr => {
-      if (xhr.lengthComputable) {
+      if (xhr.event.lengthComputable) {
         this.uppy.emit("upload-progress", file, {
           uploader: this,
           bytesUploaded: xhr.loaded,