diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts
index fa2280ec7c..cd8b7a87ae 100644
--- a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts
+++ b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts
@@ -15,7 +15,7 @@ test('Open and Save files - Open/Save structure with atom properties 1/2 - open'
 }) => {
   /**
    * Test case: EPMLSOPKET-1855(1)
-   * Description: Sctucrute with atom properties is opened and saved correctly
+   * Description: Structure with atom properties is opened and saved correctly
    */
   await waitForPageInit(page);
 
@@ -29,7 +29,7 @@ test('Open and Save files - Open/Save structure with atom properties 2/2 - save'
 }) => {
   /**
    * Test case: EPMLSOPKET-1855(2)
-   * Description: Sctucrute with atom properties is opened and saved correctly
+   * Description: Structure with atom properties is opened and saved correctly
    */
   await waitForPageInit(page);
 
@@ -54,7 +54,7 @@ test('Open and Save file - Open/Save V3000 file with atom and bond properties 1/
 }) => {
   /**
    * Test case: EPMLSOPKET-1857(1)
-   * Description: Strucrute with atom and bond properties is opened and saved correctly
+   * Description: Structure with atom and bond properties is opened and saved correctly
    */
   await waitForPageInit(page);
 
@@ -70,7 +70,7 @@ test('Open and Save file - Open/Save V3000 file with atom and bond properties 2/
   test.fail();
   /**
    * Test case: EPMLSOPKET-1857(2)
-   * Description: Strucrute with atom and bond properties is opened and saved correctly
+   * Description: Structure with atom and bond properties is opened and saved correctly
    */
   await waitForPageInit(page);
 
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/SMARTS-attributes/Query-specific-attributes/query-specific-attributes.spec.ts-snapshots/Checking-query-specific-attributes-in-SMARTS-f-6fe0f-operties-and-query-properties-then-cut-paste-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/SMARTS-attributes/Query-specific-attributes/query-specific-attributes.spec.ts-snapshots/Checking-query-specific-attributes-in-SMARTS-f-6fe0f-operties-and-query-properties-then-cut-paste-1-chromium-linux.png
index ce17ef11fa..afe64dc638 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/SMARTS-attributes/Query-specific-attributes/query-specific-attributes.spec.ts-snapshots/Checking-query-specific-attributes-in-SMARTS-f-6fe0f-operties-and-query-properties-then-cut-paste-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/SMARTS-attributes/Query-specific-attributes/query-specific-attributes.spec.ts-snapshots/Checking-query-specific-attributes-in-SMARTS-f-6fe0f-operties-and-query-properties-then-cut-paste-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/SMARTS-attributes/Query-specific-attributes/query-specific-attributes.spec.ts-snapshots/Checking-query-specific-attributes-in-SMARTS-f-f0e62-perties-and-query-properties-then-copy-paste-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/SMARTS-attributes/Query-specific-attributes/query-specific-attributes.spec.ts-snapshots/Checking-query-specific-attributes-in-SMARTS-f-f0e62-perties-and-query-properties-then-copy-paste-1-chromium-linux.png
index b3e46c8b89..1edb8f6d97 100644
Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/SMARTS-attributes/Query-specific-attributes/query-specific-attributes.spec.ts-snapshots/Checking-query-specific-attributes-in-SMARTS-f-f0e62-perties-and-query-properties-then-copy-paste-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/SMARTS-attributes/Query-specific-attributes/query-specific-attributes.spec.ts-snapshots/Checking-query-specific-attributes-in-SMARTS-f-f0e62-perties-and-query-properties-then-copy-paste-1-chromium-linux.png differ
diff --git a/ketcher-autotests/tests/test-data/Molfiles-V3000/monomers-and-chem.mol b/ketcher-autotests/tests/test-data/Molfiles-V3000/monomers-and-chem.mol
index ba5b630753..6cec638c84 100644
--- a/ketcher-autotests/tests/test-data/Molfiles-V3000/monomers-and-chem.mol
+++ b/ketcher-autotests/tests/test-data/Molfiles-V3000/monomers-and-chem.mol
@@ -15,7 +15,7 @@ M  V30 2 1 1 3
 M  V30 END BOND
 M  V30 END CTAB
 M  V30 BEGIN TEMPLATE
-M  V30 TEMPLATE 1 AA/A/A NATREPLACE=AA/A
+M  V30 TEMPLATE 1 AA/Ala/A NATREPLACE=AA/A
 M  V30 BEGIN CTAB
 M  V30 COUNTS 7 6 3 0 0
 M  V30 BEGIN ATOM
diff --git a/ketcher-autotests/tests/utils/files/readFile.ts b/ketcher-autotests/tests/utils/files/readFile.ts
index 9bcf845893..903ac4b074 100644
--- a/ketcher-autotests/tests/utils/files/readFile.ts
+++ b/ketcher-autotests/tests/utils/files/readFile.ts
@@ -10,6 +10,7 @@ import {
   delay,
   takeEditorScreenshot,
   clickOnTheCanvas,
+  waitForSpinnerFinishedWork,
 } from '@utils';
 
 import { MolfileFormat } from 'ketcher-core';
@@ -44,7 +45,7 @@ export async function openFileAndAddToCanvas(
 ) {
   await selectTopPanelButton(TopPanelButton.Open, page);
   await openFile(filename, page);
-  await waitForLoad(page, async () => {
+  await waitForSpinnerFinishedWork(page, async () => {
     await pressButton(page, 'Add to Canvas');
   });
 
diff --git a/packages/ketcher-polymer-editor-react/src/components/modal/save/__snapshots__/Save.test.tsx.snap b/packages/ketcher-polymer-editor-react/src/components/modal/save/__snapshots__/Save.test.tsx.snap
index 02e144b9e2..dab084c927 100644
--- a/packages/ketcher-polymer-editor-react/src/components/modal/save/__snapshots__/Save.test.tsx.snap
+++ b/packages/ketcher-polymer-editor-react/src/components/modal/save/__snapshots__/Save.test.tsx.snap
@@ -124,6 +124,7 @@ Object {
                       aria-hidden="true"
                       aria-invalid="false"
                       class="MuiSelect-nativeInput css-yf8vq0-MuiSelect-nativeInput"
+                      name=":r2:"
                       tabindex="-1"
                       value="ket"
                     />
diff --git a/packages/ketcher-react/src/script/ui/views/modal/components/document/Save/__snapshots__/Save.test.tsx.snap b/packages/ketcher-react/src/script/ui/views/modal/components/document/Save/__snapshots__/Save.test.tsx.snap
index b489eb67fe..b4af0fb157 100644
--- a/packages/ketcher-react/src/script/ui/views/modal/components/document/Save/__snapshots__/Save.test.tsx.snap
+++ b/packages/ketcher-react/src/script/ui/views/modal/components/document/Save/__snapshots__/Save.test.tsx.snap
@@ -88,6 +88,7 @@ Object {
                       aria-hidden="true"
                       aria-invalid="false"
                       class="MuiSelect-nativeInput css-yf8vq0-MuiSelect-nativeInput"
+                      name=":r1:"
                       tabindex="-1"
                       value="mol"
                     />
@@ -462,6 +463,7 @@ Object {
                     aria-hidden="true"
                     aria-invalid="false"
                     class="MuiSelect-nativeInput css-yf8vq0-MuiSelect-nativeInput"
+                    name=":r1:"
                     tabindex="-1"
                     value="mol"
                   />