#4382 – Fix unit and UI tests

epam · Jun 24, 2024 · a21cd24 · a21cd24
1 parent 8a16eb9
commit a21cd24
Show file tree

Hide file tree

Showing 169 changed files with 819 additions and 733 deletions.
diff --git a/...onnection--21240-ips-from-mol-file-for-15---R1-R2-R3-R4-R5-1-chromium-linux.png b/...onnection--21240-ips-from-mol-file-for-15---R1-R2-R3-R4-R5-1-chromium-linux.png
diff --git a/...onnection--6ffe0-ips-from-mol-file-for-05---R1-R3---R2-gap-1-chromium-linux.png b/...onnection--6ffe0-ips-from-mol-file-for-05---R1-R3---R2-gap-1-chromium-linux.png
diff --git a/...onnection--88211-oltips-from-mol-file-for-12---R1-R2-R3-R4-1-chromium-linux.png b/...onnection--88211-oltips-from-mol-file-for-12---R1-R2-R3-R4-1-chromium-linux.png
diff --git a/...onnection--b7e62-oltips-from-mol-file-for-13---R1-R3-R4-R5-1-chromium-linux.png b/...onnection--b7e62-oltips-from-mol-file-for-13---R1-R3-R4-R5-1-chromium-linux.png
diff --git a/...onnection--df44e-ips-from-mol-file-for-04---R1-R2---R3-gap-1-chromium-linux.png b/...onnection--df44e-ips-from-mol-file-for-04---R1-R2---R3-gap-1-chromium-linux.png
diff --git a/...onnection--ece11--tooltips-from-mol-file-for-08---R1-R2-R3-1-chromium-linux.png b/...onnection--ece11--tooltips-from-mol-file-for-08---R1-R2-R3-1-chromium-linux.png
diff --git a/....spec.ts-snapshots/Import-Saving-mol-Files-Import-DNA-file-1-chromium-linux.png b/....spec.ts-snapshots/Import-Saving-mol-Files-Import-DNA-file-1-chromium-linux.png
diff --git a/....spec.ts-snapshots/Import-Saving-mol-Files-Import-RNA-file-1-chromium-linux.png b/....spec.ts-snapshots/Import-Saving-mol-Files-Import-RNA-file-1-chromium-linux.png
diff --git a/...-mol-Files-Open-file-from-mol-V3000-and-Delete-25R-monomer-1-chromium-linux.png b/...-mol-Files-Open-file-from-mol-V3000-and-Delete-25R-monomer-1-chromium-linux.png
diff --git a/...ng-mol-Files-Open-file-from-mol-V3000-and-Delete-P-monomer-1-chromium-linux.png b/...ng-mol-Files-Open-file-from-mol-V3000-and-Delete-P-monomer-1-chromium-linux.png
diff --git a/...-mol-Files-Open-file-from-mol-V3000-and-Delete-baA-monomer-1-chromium-linux.png b/...-mol-Files-Open-file-from-mol-V3000-and-Delete-baA-monomer-1-chromium-linux.png
diff --git a/...eir-connec-0d859--tooltips-from-mol-file-for-08---R1-R2-R3-1-chromium-linux.png b/...eir-connec-0d859--tooltips-from-mol-file-for-08---R1-R2-R3-1-chromium-linux.png
diff --git a/...eir-connec-1d273-ips-from-mol-file-for-05---R1-R3---R2-gap-1-chromium-linux.png b/...eir-connec-1d273-ips-from-mol-file-for-05---R1-R3---R2-gap-1-chromium-linux.png
diff --git a/...eir-connec-2be38-ips-from-mol-file-for-03---R3---Side-only-1-chromium-linux.png b/...eir-connec-2be38-ips-from-mol-file-for-03---R3---Side-only-1-chromium-linux.png
diff --git a/...eir-connec-2d90e-oltips-from-mol-file-for-13---R1-R3-R4-R5-1-chromium-linux.png b/...eir-connec-2d90e-oltips-from-mol-file-for-13---R1-R3-R4-R5-1-chromium-linux.png
diff --git a/...eir-connec-3089d-ips-from-mol-file-for-06---R2-R3---R1-gap-1-chromium-linux.png b/...eir-connec-3089d-ips-from-mol-file-for-06---R2-R3---R1-gap-1-chromium-linux.png
diff --git a/...eir-connec-4c4e4--tooltips-from-mol-file-for-10---R2-R3-R4-1-chromium-linux.png b/...eir-connec-4c4e4--tooltips-from-mol-file-for-10---R2-R3-R4-1-chromium-linux.png
diff --git a/...eir-connec-50ef9-ips-from-mol-file-for-04---R1-R2---R3-gap-1-chromium-linux.png b/...eir-connec-50ef9-ips-from-mol-file-for-04---R1-R2---R3-gap-1-chromium-linux.png
diff --git a/...eir-connec-7b503-ips-from-mol-file-for-15---R1-R2-R3-R4-R5-1-chromium-linux.png b/...eir-connec-7b503-ips-from-mol-file-for-15---R1-R2-R3-R4-R5-1-chromium-linux.png
diff --git a/...eir-connec-857d9-oltips-from-mol-file-for-12---R1-R2-R3-R4-1-chromium-linux.png b/...eir-connec-857d9-oltips-from-mol-file-for-12---R1-R2-R3-R4-1-chromium-linux.png
diff --git a/...eir-connec-b1e1e-iew-tooltips-from-mol-file-for-07---R3-R4-1-chromium-linux.png b/...eir-connec-b1e1e-iew-tooltips-from-mol-file-for-07---R3-R4-1-chromium-linux.png
diff --git a/...eir-connec-cbb75--tooltips-from-mol-file-for-11---R3-R4-R5-1-chromium-linux.png b/...eir-connec-cbb75--tooltips-from-mol-file-for-11---R3-R4-R5-1-chromium-linux.png
diff --git a/...eir-connec-cbbb5-oltips-from-mol-file-for-14---R2-R3-R4-R5-1-chromium-linux.png b/...eir-connec-cbbb5-oltips-from-mol-file-for-14---R2-R3-R4-R5-1-chromium-linux.png
diff --git a/...eir-connec-e70ea-ps-from-mol-file-for-02---R2---Right-only-1-chromium-linux.png b/...eir-connec-e70ea-ps-from-mol-file-for-02---R2---Right-only-1-chromium-linux.png
diff --git a/...connection-17770-ps-from-mol-file-for-02---R2---Right-only-1-chromium-linux.png b/...connection-17770-ps-from-mol-file-for-02---R2---Right-only-1-chromium-linux.png
diff --git a/...connection-3228b-oltips-from-mol-file-for-12---R1-R2-R3-R4-1-chromium-linux.png b/...connection-3228b-oltips-from-mol-file-for-12---R1-R2-R3-R4-1-chromium-linux.png
diff --git a/...connection-44405-ips-from-mol-file-for-04---R1-R2---R3-gap-1-chromium-linux.png b/...connection-44405-ips-from-mol-file-for-04---R1-R2---R3-gap-1-chromium-linux.png
diff --git a/...connection-50f50--tooltips-from-mol-file-for-08---R1-R2-R3-1-chromium-linux.png b/...connection-50f50--tooltips-from-mol-file-for-08---R1-R2-R3-1-chromium-linux.png
diff --git a/...connection-73071-ips-from-mol-file-for-03---R3---Side-only-1-chromium-linux.png b/...connection-73071-ips-from-mol-file-for-03---R3---Side-only-1-chromium-linux.png
diff --git a/...connection-7c60d--tooltips-from-mol-file-for-10---R2-R3-R4-1-chromium-linux.png b/...connection-7c60d--tooltips-from-mol-file-for-10---R2-R3-R4-1-chromium-linux.png
diff --git a/...connection-8068c-ips-from-mol-file-for-05---R1-R3---R2-gap-1-chromium-linux.png b/...connection-8068c-ips-from-mol-file-for-05---R1-R3---R2-gap-1-chromium-linux.png
diff --git a/...connection-9a932-ips-from-mol-file-for-15---R1-R2-R3-R4-R5-1-chromium-linux.png b/...connection-9a932-ips-from-mol-file-for-15---R1-R2-R3-R4-R5-1-chromium-linux.png
diff --git a/...connection-c27fb-ips-from-mol-file-for-06---R2-R3---R1-gap-1-chromium-linux.png b/...connection-c27fb-ips-from-mol-file-for-06---R2-R3---R1-gap-1-chromium-linux.png
diff --git a/...connection-c4988-iew-tooltips-from-mol-file-for-07---R3-R4-1-chromium-linux.png b/...connection-c4988-iew-tooltips-from-mol-file-for-07---R3-R4-1-chromium-linux.png
diff --git a/...connection-f5c1a--tooltips-from-mol-file-for-11---R3-R4-R5-1-chromium-linux.png b/...connection-f5c1a--tooltips-from-mol-file-for-11---R3-R4-R5-1-chromium-linux.png
diff --git a/...connection-ffc8e-oltips-from-mol-file-for-14---R2-R3-R4-R5-1-chromium-linux.png b/...connection-ffc8e-oltips-from-mol-file-for-14---R2-R3-R4-R5-1-chromium-linux.png
diff --git a/...ction--a53db--and-CHEMs-then-switch-to-Micro-mode-and-back-1-chromium-linux.png b/...ction--a53db--and-CHEMs-then-switch-to-Micro-mode-and-back-1-chromium-linux.png
diff --git a/...ction--afd6d-ide-Library-and-switch-to-Micro-mode-and-back-1-chromium-linux.png b/...ction--afd6d-ide-Library-and-switch-to-Micro-mode-and-back-1-chromium-linux.png
diff --git a/...nomers-c3a4f-moved-from-favourites-when-clicking-star-sign-1-chromium-linux.png b/...nomers-c3a4f-moved-from-favourites-when-clicking-star-sign-1-chromium-linux.png
diff --git a/...romolecules-custom-presets-Add-new-preset-and-duplicate-it-1-chromium-linux.png b/...romolecules-custom-presets-Add-new-preset-and-duplicate-it-1-chromium-linux.png
diff --git a/...romolecules-custom-presets-Add-new-preset-and-duplicate-it-2-chromium-linux.png b/...romolecules-custom-presets-Add-new-preset-and-duplicate-it-2-chromium-linux.png
diff --git a/...sets-Add-new-preset-with-two-monomers-and-add-it-to-canvas-1-chromium-linux.png b/...sets-Add-new-preset-with-two-monomers-and-add-it-to-canvas-1-chromium-linux.png
diff --git a/...molecules-default-presets-Check-Guanine-in-default-presets-1-chromium-linux.png b/...molecules-default-presets-Check-Guanine-in-default-presets-1-chromium-linux.png
diff --git a/...-to-Favorites-Should-have-star-when-hover-over-RNA-presets-1-chromium-linux.png b/...-to-Favorites-Should-have-star-when-hover-over-RNA-presets-1-chromium-linux.png
diff --git a/...es-delete-RNA-presets-Should-not-delete-default-RNA-preset-1-chromium-linux.png b/...es-delete-RNA-presets-Should-not-delete-default-RNA-preset-1-chromium-linux.png
diff --git a/...ayout.spec.ts-snapshots/RNA-layout-Each-panel-is-collapsed-1-chromium-linux.png b/...ayout.spec.ts-snapshots/RNA-layout-Each-panel-is-collapsed-1-chromium-linux.png
diff --git a/...pec.ts-snapshots/RNA-layout-RNA-Builder-panel-is-collapsed-1-chromium-linux.png b/...pec.ts-snapshots/RNA-layout-RNA-Builder-panel-is-collapsed-1-chromium-linux.png
diff --git a/...snapshots/RNA-Library-Add-Custom-preset-to-Presets-section-1-chromium-linux.png b/...snapshots/RNA-Library-Add-Custom-preset-to-Presets-section-1-chromium-linux.png
diff --git a/...NA-Library-Add-Custom-preset-to-Presets-section-and-Delete-1-chromium-linux.png b/...NA-Library-Add-Custom-preset-to-Presets-section-and-Delete-1-chromium-linux.png
diff --git a/.../RNA-Library-Add-Custom-preset-to-Presets-section-and-Edit-1-chromium-linux.png b/.../RNA-Library-Add-Custom-preset-to-Presets-section-and-Edit-1-chromium-linux.png
diff --git a/...NA-Library-Add-Custom-preset-to-Presets-section-and-Rename-1-chromium-linux.png b/...NA-Library-Add-Custom-preset-to-Presets-section-and-Rename-1-chromium-linux.png
diff --git a/...om-preset-to-Presets-section-and-display-after-page-reload-1-chromium-linux.png b/...om-preset-to-Presets-section-and-display-after-page-reload-1-chromium-linux.png
diff --git a/...om-preset-to-Presets-section-and-display-after-page-reload-2-chromium-linux.png b/...om-preset-to-Presets-section-and-display-after-page-reload-2-chromium-linux.png
diff --git a/...d-Custom-preset-to-Presets-section-then-Duplicate-and-Edit-1-chromium-linux.png b/...d-Custom-preset-to-Presets-section-then-Duplicate-and-Edit-1-chromium-linux.png
diff --git a/...hots/RNA-Library-Add-same-Custom-preset-to-Presets-section-1-chromium-linux.png b/...hots/RNA-Library-Add-same-Custom-preset-to-Presets-section-1-chromium-linux.png
diff --git a/...A-Library-Add-to-presets-different-combinations-Sugar-Base-1-chromium-linux.png b/...A-Library-Add-to-presets-different-combinations-Sugar-Base-1-chromium-linux.png
diff --git a/...rary-Add-to-presets-different-combinations-Sugar-Phosphate-1-chromium-linux.png b/...rary-Add-to-presets-different-combinations-Sugar-Phosphate-1-chromium-linux.png
diff --git a/...d-Edit--86c54-ubsequently-clicking-Cancel-preset-not-saved-1-chromium-linux.png b/...d-Edit--86c54-ubsequently-clicking-Cancel-preset-not-saved-1-chromium-linux.png
diff --git a/...ry.spec.ts-snapshots/RNA-Library-CHEM-tab-check-at-Library-1-chromium-linux.png b/...ry.spec.ts-snapshots/RNA-Library-CHEM-tab-check-at-Library-1-chromium-linux.png
diff --git a/...ibrary.spec.ts-snapshots/RNA-Library-Check-Bases-component-1-chromium-linux.png b/...ibrary.spec.ts-snapshots/RNA-Library-Check-Bases-component-1-chromium-linux.png
diff --git a/...y.spec.ts-snapshots/RNA-Library-Check-Phosphates-component-1-chromium-linux.png b/...y.spec.ts-snapshots/RNA-Library-Check-Phosphates-component-1-chromium-linux.png
diff --git a/...rary.spec.ts-snapshots/RNA-Library-Check-Presets-component-1-chromium-linux.png b/...rary.spec.ts-snapshots/RNA-Library-Check-Presets-component-1-chromium-linux.png
diff --git a/...brary.spec.ts-snapshots/RNA-Library-Check-Sugars-component-1-chromium-linux.png b/...brary.spec.ts-snapshots/RNA-Library-Check-Sugars-component-1-chromium-linux.png
diff --git a/...brary-pa-69396-ains-which-concealing-content-on-the-canvas-2-chromium-linux.png b/...brary-pa-69396-ains-which-concealing-content-on-the-canvas-2-chromium-linux.png
diff --git a/...-Library-Check-that-can-delete-preset-from-Presets-section-1-chromium-linux.png b/...-Library-Check-that-can-delete-preset-from-Presets-section-1-chromium-linux.png
diff --git a/...esets-and-monomers-appear-back-after-cleaning-search-field-1-chromium-linux.png b/...esets-and-monomers-appear-back-after-cleaning-search-field-1-chromium-linux.png
diff --git a/...esets-and-monomers-appear-back-after-cleaning-search-field-2-chromium-linux.png b/...esets-and-monomers-appear-back-after-cleaning-search-field-2-chromium-linux.png
diff --git a/...esets-and-monomers-appear-back-after-cleaning-search-field-4-chromium-linux.png b/...esets-and-monomers-appear-back-after-cleaning-search-field-4-chromium-linux.png
diff --git a/...dow-disappears-when-a-cursor-moves-off-from-RNA-in-library-1-chromium-linux.png b/...dow-disappears-when-a-cursor-moves-off-from-RNA-in-library-1-chromium-linux.png
diff --git a/...dow-disappears-when-a-cursor-moves-off-from-RNA-in-library-2-chromium-linux.png b/...dow-disappears-when-a-cursor-moves-off-from-RNA-in-library-2-chromium-linux.png
diff --git a/...ch-between-Macro-and-Micro-mode-does-not-crash-application-1-chromium-linux.png b/...ch-between-Macro-and-Micro-mode-does-not-crash-application-1-chromium-linux.png
diff --git a/...ec.ts-snapshots/RNA-Library-Check-the-RNA-components-panel-1-chromium-linux.png b/...ec.ts-snapshots/RNA-Library-Check-the-RNA-components-panel-1-chromium-linux.png
diff --git a/...a-library.spec.ts-snapshots/RNA-Library-Expand-RNA-Builder-1-chromium-linux.png b/...a-library.spec.ts-snapshots/RNA-Library-Expand-RNA-Builder-1-chromium-linux.png
diff --git a/...hosphate-and-Base-in-Library-once-it-chosen-in-RNA-Builder-1-chromium-linux.png b/...hosphate-and-Base-in-Library-once-it-chosen-in-RNA-Builder-1-chromium-linux.png
diff --git a/...snapshots/RNA-Library-Move-Bases-on-canvas-to-new-position-1-chromium-linux.png b/...snapshots/RNA-Library-Move-Bases-on-canvas-to-new-position-1-chromium-linux.png
diff --git a/...hots/RNA-Library-Move-Phosphates-on-canvas-to-new-position-1-chromium-linux.png b/...hots/RNA-Library-Move-Phosphates-on-canvas-to-new-position-1-chromium-linux.png
diff --git a/...-can-op-5f315-d-RNA-structure-select-and-move-it-on-canvas-1-chromium-linux.png b/...-can-op-5f315-d-RNA-structure-select-and-move-it-on-canvas-1-chromium-linux.png
diff --git a/...-builde-77b62-as-no-R2-or-R3-it-is-disabled-in-RNA-Builder-1-chromium-linux.png b/...-builde-77b62-as-no-R2-or-R3-it-is-disabled-in-RNA-Builder-1-chromium-linux.png
diff --git a/...builde-be9b3-ed-monomers-switches-RNA-Builder-to-edit-mode-1-chromium-linux.png b/...builde-be9b3-ed-monomers-switches-RNA-Builder-to-edit-mode-1-chromium-linux.png
diff --git a/...-nucle-3234e-dify-sugar-and-phosphate-as-it-one-nucleotide-4-chromium-linux.png b/...-nucle-3234e-dify-sugar-and-phosphate-as-it-one-nucleotide-4-chromium-linux.png
diff --git a/...t-nucle-403dc-hosphate-nucleoside-should-become-nucleotide-4-chromium-linux.png b/...t-nucle-403dc-hosphate-nucleoside-should-become-nucleotide-4-chromium-linux.png
diff --git a/...edit-in-RNA-Builder-Select-one-nucleotide-and-modify-sugar-2-chromium-linux.png b/...edit-in-RNA-Builder-Select-one-nucleotide-and-modify-sugar-2-chromium-linux.png
diff --git a/...edit-in-RNA-Builder-Select-one-nucleotide-and-modify-sugar-3-chromium-linux.png b/...edit-in-RNA-Builder-Select-one-nucleotide-and-modify-sugar-3-chromium-linux.png
diff --git a/...edit-in-RNA-Builder-Select-one-nucleotide-and-modify-sugar-5-chromium-linux.png b/...edit-in-RNA-Builder-Select-one-nucleotide-and-modify-sugar-5-chromium-linux.png
diff --git a/...utotests/tests/test-data/Molfiles-V3000/Base-Templates/01 - (R1) - Left only-expected.mol b/...utotests/tests/test-data/Molfiles-V3000/Base-Templates/01 - (R1) - Left only-expected.mol
@@ -1,17 +1,17 @@
 
-  -INDIGO-03102420132D
+  -INDIGO-06242417562D
 
   0  0  0  0  0  0  0  0  0  0  0 V3000
 M  V30 BEGIN CTAB
 M  V30 COUNTS 1 0 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 (R1)_-_Left_only 11.9 -8.325 0.0 0 CLASS=RNA SEQID=1
+M  V30 1 (R1)_-_Left_only 11.9 -8.325 0.0 0 CLASS=BASE
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 END BOND
 M  V30 END CTAB
 M  V30 BEGIN TEMPLATE
-M  V30 TEMPLATE 1 RNA/(R1)_-_Left_only/(R1)_-_Left_only NATREPLACE=RNA/A
+M  V30 TEMPLATE 1 BASE/(R1)_-_Left_only/(R1)_-_Left_only NATREPLACE=BASE/A
 M  V30 BEGIN CTAB
 M  V30 COUNTS 23 23 2 0 0
 M  V30 BEGIN ATOM
@@ -71,7 +71,7 @@ M  V30 =LGRP
 M  V30 2 SUP 2 ATOMS=(22 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 20 21 2-
 M  V30 2 23) XBONDS=(1 19) BRKXYZ=(9 -0.093645 -0.491037 0.000000 0.000000 0.-
 M  V30 000000 0.000000 0.000000 0.000000 0.000000) LABEL=(R1)_-_Left_only CLA-
-M  V30 SS=RNA SAP=(3 17 19 Al) NATREPLACE=RNA/A
+M  V30 SS=BASE SAP=(3 17 19 Al) NATREPLACE=BASE/A
 M  V30 END SGROUP
 M  V30 END CTAB
 M  V30 END TEMPLATE

diff --git a/ketcher-autotests/tests/test-data/Molfiles-V3000/Base-Templates/01 - (R1) - Left only.mol b/ketcher-autotests/tests/test-data/Molfiles-V3000/Base-Templates/01 - (R1) - Left only.mol
@@ -1,17 +1,17 @@
 
-  -INDIGO-12292314202D
+  -INDIGO-06242417562D
 
   0  0  0  0  0  0  0  0  0  0  0 V3000
 M  V30 BEGIN CTAB
 M  V30 COUNTS 1 0 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 (R1)_-_Left_only 11.9 -8.325 0.0 0 CLASS=RNA
+M  V30 1 (R1)_-_Left_only 13.9 -9.175 0.0 0 CLASS=BASE
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 END BOND
 M  V30 END CTAB
 M  V30 BEGIN TEMPLATE
-M  V30 TEMPLATE 1 RNA/(R1)_-_Left_only/(R1)_-_Left_only NATREPLACE=RNA/A
+M  V30 TEMPLATE 1 BASE/(R1)_-_Left_only/(R1)_-_Left_only NATREPLACE=BASE/A
 M  V30 BEGIN CTAB
 M  V30 COUNTS 23 23 2 0 0
 M  V30 BEGIN ATOM
@@ -65,13 +65,13 @@ M  V30 22 1 21 22
 M  V30 23 2 21 23
 M  V30 END BOND
 M  V30 BEGIN SGROUP
-M  V30 1 SUP 1 ATOMS=(1 19) XBONDS=(1 19) BRKXYZ=(9 0.093642 0.491038 0.00000-
+M  V30 1 SUP 1 ATOMS=(1 19) XBONDS=(1 19) BRKXYZ=(9 0.093645 0.491037 0.00000-
 M  V30 0 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) LABEL=H CLASS-
 M  V30 =LGRP
 M  V30 2 SUP 2 ATOMS=(22 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 20 21 2-
-M  V30 2 23) XBONDS=(1 19) BRKXYZ=(9 -0.093642 -0.491038 0.000000 0.000000 0.-
+M  V30 2 23) XBONDS=(1 19) BRKXYZ=(9 -0.093645 -0.491037 0.000000 0.000000 0.-
 M  V30 000000 0.000000 0.000000 0.000000 0.000000) LABEL=(R1)_-_Left_only CLA-
-M  V30 SS=RNA SAP=(3 17 19 Al) NATREPLACE=RNA/A
+M  V30 SS=BASE SAP=(3 17 19 Al) NATREPLACE=BASE/A
 M  V30 END SGROUP
 M  V30 END CTAB
 M  V30 END TEMPLATE

diff --git a/...utotests/tests/test-data/Molfiles-V3000/Base-Templates/04 - (R1,R2) - R3 gap-expected.mol b/...utotests/tests/test-data/Molfiles-V3000/Base-Templates/04 - (R1,R2) - R3 gap-expected.mol
@@ -1,17 +1,17 @@
 
-  -INDIGO-03102420132D
+  -INDIGO-06242417562D
 
   0  0  0  0  0  0  0  0  0  0  0 V3000
 M  V30 BEGIN CTAB
 M  V30 COUNTS 1 0 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 (R1,R2)_-_R3_gap 11.9 -8.325 0.0 0 CLASS=RNA SEQID=1
+M  V30 1 (R1,R2)_-_R3_gap 11.9 -8.325 0.0 0 CLASS=BASE
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 END BOND
 M  V30 END CTAB
 M  V30 BEGIN TEMPLATE
-M  V30 TEMPLATE 1 RNA/(R1,R2)_-_R3_gap/(R1,R2)_-_R3_gap NATREPLACE=RNA/T
+M  V30 TEMPLATE 1 BASE/(R1,R2)_-_R3_gap/(R1,R2)_-_R3_gap NATREPLACE=BASE/T
 M  V30 BEGIN CTAB
 M  V30 COUNTS 23 23 3 0 0
 M  V30 BEGIN ATOM
@@ -74,7 +74,7 @@ M  V30 LGRP
 M  V30 3 SUP 3 ATOMS=(21 1 2 3 4 5 6 7 9 10 11 12 13 14 15 16 17 18 20 21 22 -
 M  V30 23) XBONDS=(2 8 19) BRKXYZ=(9 0.377935 -0.327147 0.000000 -0.093645 -0-
 M  V30 .491037 0.000000 0.000000 0.000000 0.000000) LABEL=(R1,R2)_-_R3_gap CL-
-M  V30 ASS=RNA SAP=(3 17 19 Al) SAP=(3 7 8 Br) NATREPLACE=RNA/T
+M  V30 ASS=BASE SAP=(3 17 19 Al) SAP=(3 7 8 Br) NATREPLACE=BASE/T
 M  V30 END SGROUP
 M  V30 END CTAB
 M  V30 END TEMPLATE

diff --git a/ketcher-autotests/tests/test-data/Molfiles-V3000/Base-Templates/04 - (R1,R2) - R3 gap.mol b/ketcher-autotests/tests/test-data/Molfiles-V3000/Base-Templates/04 - (R1,R2) - R3 gap.mol
@@ -1,17 +1,17 @@
 
-  -INDIGO-12292314202D
+  -INDIGO-06242417562D
 
   0  0  0  0  0  0  0  0  0  0  0 V3000
 M  V30 BEGIN CTAB
 M  V30 COUNTS 1 0 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 (R1,R2)_-_R3_gap 11.9 -8.325 0.0 0 CLASS=RNA
+M  V30 1 (R1,R2)_-_R3_gap 13.9 -9.175 0.0 0 CLASS=BASE
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 END BOND
 M  V30 END CTAB
 M  V30 BEGIN TEMPLATE
-M  V30 TEMPLATE 1 RNA/(R1,R2)_-_R3_gap/(R1,R2)_-_R3_gap NATREPLACE=RNA/T
+M  V30 TEMPLATE 1 BASE/(R1,R2)_-_R3_gap/(R1,R2)_-_R3_gap NATREPLACE=BASE/T
 M  V30 BEGIN CTAB
 M  V30 COUNTS 23 23 3 0 0
 M  V30 BEGIN ATOM
@@ -65,16 +65,16 @@ M  V30 22 1 21 22
 M  V30 23 2 21 23
 M  V30 END BOND
 M  V30 BEGIN SGROUP
-M  V30 1 SUP 1 ATOMS=(1 19) XBONDS=(1 19) BRKXYZ=(9 0.093642 0.491038 0.00000-
+M  V30 1 SUP 1 ATOMS=(1 19) XBONDS=(1 19) BRKXYZ=(9 0.093645 0.491037 0.00000-
 M  V30 0 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) LABEL=H CLASS-
 M  V30 =LGRP
-M  V30 2 SUP 2 ATOMS=(1 8) XBONDS=(1 8) BRKXYZ=(9 -0.377934 0.327148 0.000000-
+M  V30 2 SUP 2 ATOMS=(1 8) XBONDS=(1 8) BRKXYZ=(9 -0.377935 0.327147 0.000000-
 M  V30  0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) LABEL=H CLASS=-
 M  V30 LGRP
 M  V30 3 SUP 3 ATOMS=(21 1 2 3 4 5 6 7 9 10 11 12 13 14 15 16 17 18 20 21 22 -
-M  V30 23) XBONDS=(2 8 19) BRKXYZ=(9 0.377934 -0.327148 0.000000 -0.093642 -0-
-M  V30 .491038 0.000000 0.000000 0.000000 0.000000) LABEL=(R1,R2)_-_R3_gap CL-
-M  V30 ASS=RNA SAP=(3 17 19 Al) SAP=(3 7 8 Br) NATREPLACE=RNA/T
+M  V30 23) XBONDS=(2 8 19) BRKXYZ=(9 0.377935 -0.327147 0.000000 -0.093645 -0-
+M  V30 .491037 0.000000 0.000000 0.000000 0.000000) LABEL=(R1,R2)_-_R3_gap CL-
+M  V30 ASS=BASE SAP=(3 17 19 Al) SAP=(3 7 8 Br) NATREPLACE=BASE/T
 M  V30 END SGROUP
 M  V30 END CTAB
 M  V30 END TEMPLATE

diff --git a/...utotests/tests/test-data/Molfiles-V3000/Base-Templates/05 - (R1,R3) - R2 gap-expected.mol b/...utotests/tests/test-data/Molfiles-V3000/Base-Templates/05 - (R1,R3) - R2 gap-expected.mol
@@ -1,17 +1,17 @@
 
-  -INDIGO-03102420132D
+  -INDIGO-06242417592D
 
   0  0  0  0  0  0  0  0  0  0  0 V3000
 M  V30 BEGIN CTAB
 M  V30 COUNTS 1 0 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 (R1,R3)_-_R2_gap 11.9 -8.325 0.0 0 CLASS=RNA SEQID=1
+M  V30 1 (R1,R3)_-_R2_gap 11.9 -8.325 0.0 0 CLASS=BASE
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 END BOND
 M  V30 END CTAB
 M  V30 BEGIN TEMPLATE
-M  V30 TEMPLATE 1 RNA/(R1,R3)_-_R2_gap/(R1,R3)_-_R2_gap NATREPLACE=RNA/U
+M  V30 TEMPLATE 1 BASE/(R1,R3)_-_R2_gap/(R1,R3)_-_R2_gap NATREPLACE=BASE/U
 M  V30 BEGIN CTAB
 M  V30 COUNTS 23 23 3 0 0
 M  V30 BEGIN ATOM
@@ -74,7 +74,7 @@ M  V30 =LGRP
 M  V30 3 SUP 3 ATOMS=(21 1 2 3 4 5 6 7 8 10 11 12 13 14 15 16 17 18 20 21 22 -
 M  V30 23) XBONDS=(2 9 19) BRKXYZ=(9 0.094475 0.490838 0.000000 -0.093645 -0.-
 M  V30 491037 0.000000 0.000000 0.000000 0.000000) LABEL=(R1,R3)_-_R2_gap CLA-
-M  V30 SS=RNA SAP=(3 17 19 Al) SAP=(3 7 9 Br) NATREPLACE=RNA/U
+M  V30 SS=BASE SAP=(3 17 19 Al) SAP=(3 7 9 Br) NATREPLACE=BASE/U
 M  V30 END SGROUP
 M  V30 END CTAB
 M  V30 END TEMPLATE

diff --git a/ketcher-autotests/tests/test-data/Molfiles-V3000/Base-Templates/05 - (R1,R3) - R2 gap.mol b/ketcher-autotests/tests/test-data/Molfiles-V3000/Base-Templates/05 - (R1,R3) - R2 gap.mol
@@ -1,17 +1,17 @@
 
-  -INDIGO-12292314202D
+  -INDIGO-06242417592D
 
   0  0  0  0  0  0  0  0  0  0  0 V3000
 M  V30 BEGIN CTAB
 M  V30 COUNTS 1 0 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 (R1,R3)_-_R2_gap 11.9 -8.325 0.0 0 CLASS=RNA
+M  V30 1 (R1,R3)_-_R2_gap 13.9 -9.175 0.0 0 CLASS=BASE
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 END BOND
 M  V30 END CTAB
 M  V30 BEGIN TEMPLATE
-M  V30 TEMPLATE 1 RNA/(R1,R3)_-_R2_gap/(R1,R3)_-_R2_gap NATREPLACE=RNA/U
+M  V30 TEMPLATE 1 BASE/(R1,R3)_-_R2_gap/(R1,R3)_-_R2_gap NATREPLACE=BASE/U
 M  V30 BEGIN CTAB
 M  V30 COUNTS 23 23 3 0 0
 M  V30 BEGIN ATOM
@@ -65,16 +65,16 @@ M  V30 22 1 21 22
 M  V30 23 2 21 23
 M  V30 END BOND
 M  V30 BEGIN SGROUP
-M  V30 1 SUP 1 ATOMS=(1 19) XBONDS=(1 19) BRKXYZ=(9 0.093642 0.491038 0.00000-
+M  V30 1 SUP 1 ATOMS=(1 19) XBONDS=(1 19) BRKXYZ=(9 0.093645 0.491037 0.00000-
 M  V30 0 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) LABEL=H CLASS-
 M  V30 =LGRP
 M  V30 2 SUP 2 ATOMS=(1 9) XBONDS=(1 9) BRKXYZ=(9 -0.094475 -0.490838 0.00000-
 M  V30 0 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) LABEL=H CLASS-
 M  V30 =LGRP
 M  V30 3 SUP 3 ATOMS=(21 1 2 3 4 5 6 7 8 10 11 12 13 14 15 16 17 18 20 21 22 -
-M  V30 23) XBONDS=(2 9 19) BRKXYZ=(9 0.094475 0.490838 0.000000 -0.093642 -0.-
-M  V30 491038 0.000000 0.000000 0.000000 0.000000) LABEL=(R1,R3)_-_R2_gap CLA-
-M  V30 SS=RNA SAP=(3 17 19 Al) SAP=(3 7 9 Br) NATREPLACE=RNA/U
+M  V30 23) XBONDS=(2 9 19) BRKXYZ=(9 0.094475 0.490838 0.000000 -0.093645 -0.-
+M  V30 491037 0.000000 0.000000 0.000000 0.000000) LABEL=(R1,R3)_-_R2_gap CLA-
+M  V30 SS=BASE SAP=(3 17 19 Al) SAP=(3 7 9 Br) NATREPLACE=BASE/U
 M  V30 END SGROUP
 M  V30 END CTAB
 M  V30 END TEMPLATE

diff --git a/ketcher-autotests/tests/test-data/Molfiles-V3000/Base-Templates/08 - (R1,R2,R3)-expected.mol b/ketcher-autotests/tests/test-data/Molfiles-V3000/Base-Templates/08 - (R1,R2,R3)-expected.mol
@@ -1,17 +1,17 @@
 
-  -INDIGO-03102420132D
+  -INDIGO-06242418002D
 
   0  0  0  0  0  0  0  0  0  0  0 V3000
 M  V30 BEGIN CTAB
 M  V30 COUNTS 1 0 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 (R1,R2,R3) 11.9 -8.325 0.0 0 CLASS=RNA SEQID=1
+M  V30 1 (R1,R2,R3) 11.9 -8.325 0.0 0 CLASS=BASE
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 END BOND
 M  V30 END CTAB
 M  V30 BEGIN TEMPLATE
-M  V30 TEMPLATE 1 RNA/(R1,R2,R3)/(R1,R2,R3) NATREPLACE=RNA/C
+M  V30 TEMPLATE 1 BASE/(R1,R2,R3)/(R1,R2,R3) NATREPLACE=BASE/C
 M  V30 BEGIN CTAB
 M  V30 COUNTS 23 23 4 0 0
 M  V30 BEGIN ATOM
@@ -78,8 +78,8 @@ M  V30 4 SUP 4 ATOMS=(20 1 2 3 4 5 6 7 10 11 12 13 14 15 16 17 18 20 21 22 23-
 M  V30 ) XBONDS=(3 8 9 19) BRKXYZ=(9 0.377935 -0.327147 0.000000 0.094475 0.4-
 M  V30 90838 0.000000 0.000000 0.000000 0.000000) BRKXYZ=(9 -0.093645 -0.4910-
 M  V30 37 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) LAB-
-M  V30 EL=(R1,R2,R3) CLASS=RNA SAP=(3 17 19 Al) SAP=(3 7 8 Br) SAP=(3 7 9 Cx)-
-M  V30  NATREPLACE=RNA/C
+M  V30 EL=(R1,R2,R3) CLASS=BASE SAP=(3 17 19 Al) SAP=(3 7 8 Br) SAP=(3 7 9 Cx-
+M  V30 ) NATREPLACE=BASE/C
 M  V30 END SGROUP
 M  V30 END CTAB
 M  V30 END TEMPLATE

diff --git a/ketcher-autotests/tests/test-data/Molfiles-V3000/Base-Templates/08 - (R1,R2,R3).mol b/ketcher-autotests/tests/test-data/Molfiles-V3000/Base-Templates/08 - (R1,R2,R3).mol
@@ -1,17 +1,17 @@
 
-  -INDIGO-12292314202D
+  -INDIGO-06242418002D
 
   0  0  0  0  0  0  0  0  0  0  0 V3000
 M  V30 BEGIN CTAB
 M  V30 COUNTS 1 0 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 (R1,R2,R3) 11.9 -8.325 0.0 0 CLASS=RNA
+M  V30 1 (R1,R2,R3) 13.9 -9.175 0.0 0 CLASS=BASE
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 END BOND
 M  V30 END CTAB
 M  V30 BEGIN TEMPLATE
-M  V30 TEMPLATE 1 RNA/(R1,R2,R3)/(R1,R2,R3) NATREPLACE=RNA/C
+M  V30 TEMPLATE 1 BASE/(R1,R2,R3)/(R1,R2,R3) NATREPLACE=BASE/C
 M  V30 BEGIN CTAB
 M  V30 COUNTS 23 23 4 0 0
 M  V30 BEGIN ATOM
@@ -65,21 +65,21 @@ M  V30 22 1 21 22
 M  V30 23 2 21 23
 M  V30 END BOND
 M  V30 BEGIN SGROUP
-M  V30 1 SUP 1 ATOMS=(1 19) XBONDS=(1 19) BRKXYZ=(9 0.093642 0.491038 0.00000-
+M  V30 1 SUP 1 ATOMS=(1 19) XBONDS=(1 19) BRKXYZ=(9 0.093645 0.491037 0.00000-
 M  V30 0 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) LABEL=H CLASS-
 M  V30 =LGRP
-M  V30 2 SUP 2 ATOMS=(1 8) XBONDS=(1 8) BRKXYZ=(9 -0.377934 0.327148 0.000000-
+M  V30 2 SUP 2 ATOMS=(1 8) XBONDS=(1 8) BRKXYZ=(9 -0.377935 0.327147 0.000000-
 M  V30  0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) LABEL=H CLASS=-
 M  V30 LGRP
 M  V30 3 SUP 3 ATOMS=(1 9) XBONDS=(1 9) BRKXYZ=(9 -0.094475 -0.490838 0.00000-
 M  V30 0 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) LABEL=H CLASS-
 M  V30 =LGRP
 M  V30 4 SUP 4 ATOMS=(20 1 2 3 4 5 6 7 10 11 12 13 14 15 16 17 18 20 21 22 23-
-M  V30 ) XBONDS=(3 8 9 19) BRKXYZ=(9 0.377934 -0.327148 0.000000 0.094475 0.4-
-M  V30 90838 0.000000 0.000000 0.000000 0.000000) BRKXYZ=(9 -0.093642 -0.4910-
-M  V30 38 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) LAB-
-M  V30 EL=(R1,R2,R3) CLASS=RNA SAP=(3 17 19 Al) SAP=(3 7 8 Br) SAP=(3 7 9 Cx)-
-M  V30  NATREPLACE=RNA/C
+M  V30 ) XBONDS=(3 8 9 19) BRKXYZ=(9 0.377935 -0.327147 0.000000 0.094475 0.4-
+M  V30 90838 0.000000 0.000000 0.000000 0.000000) BRKXYZ=(9 -0.093645 -0.4910-
+M  V30 37 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) LAB-
+M  V30 EL=(R1,R2,R3) CLASS=BASE SAP=(3 17 19 Al) SAP=(3 7 8 Br) SAP=(3 7 9 Cx-
+M  V30 ) NATREPLACE=BASE/C
 M  V30 END SGROUP
 M  V30 END CTAB
 M  V30 END TEMPLATE

diff --git a/ketcher-autotests/tests/test-data/Molfiles-V3000/Base-Templates/09 - (R1,R3,R4)-expected.mol b/ketcher-autotests/tests/test-data/Molfiles-V3000/Base-Templates/09 - (R1,R3,R4)-expected.mol
@@ -1,17 +1,17 @@
 
-  -INDIGO-03102420132D
+  -INDIGO-06242418012D
 
   0  0  0  0  0  0  0  0  0  0  0 V3000
 M  V30 BEGIN CTAB
 M  V30 COUNTS 1 0 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 (R1,R3,R4) 11.9 -8.325 0.0 0 CLASS=RNA SEQID=1
+M  V30 1 (R1,R3,R4) 11.9 -8.325 0.0 0 CLASS=BASE
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 END BOND
 M  V30 END CTAB
 M  V30 BEGIN TEMPLATE
-M  V30 TEMPLATE 1 RNA/(R1,R3,R4)/(R1,R3,R4) NATREPLACE=RNA/G
+M  V30 TEMPLATE 1 BASE/(R1,R3,R4)/(R1,R3,R4) NATREPLACE=BASE/G
 M  V30 BEGIN CTAB
 M  V30 COUNTS 23 23 4 0 0
 M  V30 BEGIN ATOM
@@ -78,8 +78,8 @@ M  V30 4 SUP 4 ATOMS=(20 1 2 3 4 5 7 8 10 11 12 13 14 15 16 17 18 20 21 22 23-
 M  V30 ) XBONDS=(4 6 7 9 19) BRKXYZ=(9 0.378135 -0.327313 0.000000 -0.472675 -
 M  V30 -0.163522 0.000000 0.000000 0.000000 0.000000) BRKXYZ=(9 0.094475 0.49-
 M  V30 0838 0.000000 -0.093645 -0.491037 0.000000 0.000000 0.000000 0.000000)-
-M  V30  LABEL=(R1,R3,R4) CLASS=RNA SAP=(3 17 19 Al) SAP=(3 7 9 Br) SAP=(3 5 6-
-M  V30  Cx) NATREPLACE=RNA/G
+M  V30  LABEL=(R1,R3,R4) CLASS=BASE SAP=(3 17 19 Al) SAP=(3 7 9 Br) SAP=(3 5 -
+M  V30 6 Cx) NATREPLACE=BASE/G
 M  V30 END SGROUP
 M  V30 END CTAB
 M  V30 END TEMPLATE

diff --git a/ketcher-autotests/tests/test-data/Molfiles-V3000/Base-Templates/09 - (R1,R3,R4).mol b/ketcher-autotests/tests/test-data/Molfiles-V3000/Base-Templates/09 - (R1,R3,R4).mol
@@ -1,17 +1,17 @@
 
-  -INDIGO-12292314202D
+  -INDIGO-06242418012D
 
   0  0  0  0  0  0  0  0  0  0  0 V3000
 M  V30 BEGIN CTAB
 M  V30 COUNTS 1 0 0 0 0
 M  V30 BEGIN ATOM
-M  V30 1 (R1,R3,R4) 11.9 -8.325 0.0 0 CLASS=RNA
+M  V30 1 (R1,R3,R4) 13.9 -9.175 0.0 0 CLASS=BASE
 M  V30 END ATOM
 M  V30 BEGIN BOND
 M  V30 END BOND
 M  V30 END CTAB
 M  V30 BEGIN TEMPLATE
-M  V30 TEMPLATE 1 RNA/(R1,R3,R4)/(R1,R3,R4) NATREPLACE=RNA/G
+M  V30 TEMPLATE 1 BASE/(R1,R3,R4)/(R1,R3,R4) NATREPLACE=BASE/G
 M  V30 BEGIN CTAB
 M  V30 COUNTS 23 23 4 0 0
 M  V30 BEGIN ATOM
@@ -65,21 +65,21 @@ M  V30 22 1 21 22
 M  V30 23 2 21 23
 M  V30 END BOND
 M  V30 BEGIN SGROUP
-M  V30 1 SUP 1 ATOMS=(1 19) XBONDS=(1 19) BRKXYZ=(9 0.093642 0.491038 0.00000-
+M  V30 1 SUP 1 ATOMS=(1 19) XBONDS=(1 19) BRKXYZ=(9 0.093645 0.491037 0.00000-
 M  V30 0 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) LABEL=H CLASS-
 M  V30 =LGRP
 M  V30 2 SUP 2 ATOMS=(1 9) XBONDS=(1 9) BRKXYZ=(9 -0.094475 -0.490838 0.00000-
 M  V30 0 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) LABEL=H CLASS-
 M  V30 =LGRP
-M  V30 3 SUP 3 ATOMS=(1 6) XBONDS=(2 6 7) BRKXYZ=(9 -0.378134 0.327314 0.0000-
-M  V30 00 0.472676 0.163524 0.000000 0.000000 0.000000 0.000000) LABEL=CH2 CL-
+M  V30 3 SUP 3 ATOMS=(1 6) XBONDS=(2 6 7) BRKXYZ=(9 -0.378135 0.327313 0.0000-
+M  V30 00 0.472675 0.163522 0.000000 0.000000 0.000000 0.000000) LABEL=CH2 CL-
 M  V30 ASS=LGRP
 M  V30 4 SUP 4 ATOMS=(20 1 2 3 4 5 7 8 10 11 12 13 14 15 16 17 18 20 21 22 23-
-M  V30 ) XBONDS=(4 6 7 9 19) BRKXYZ=(9 0.378134 -0.327314 0.000000 -0.472676 -
-M  V30 -0.163524 0.000000 0.000000 0.000000 0.000000) BRKXYZ=(9 0.094475 0.49-
-M  V30 0838 0.000000 -0.093642 -0.491038 0.000000 0.000000 0.000000 0.000000)-
-M  V30  LABEL=(R1,R3,R4) CLASS=RNA SAP=(3 17 19 Al) SAP=(3 7 9 Br) SAP=(3 5 6-
-M  V30  Cx) NATREPLACE=RNA/G
+M  V30 ) XBONDS=(4 6 7 9 19) BRKXYZ=(9 0.378135 -0.327313 0.000000 -0.472675 -
+M  V30 -0.163522 0.000000 0.000000 0.000000 0.000000) BRKXYZ=(9 0.094475 0.49-
+M  V30 0838 0.000000 -0.093645 -0.491037 0.000000 0.000000 0.000000 0.000000)-
+M  V30  LABEL=(R1,R3,R4) CLASS=BASE SAP=(3 17 19 Al) SAP=(3 7 9 Br) SAP=(3 5 -
+M  V30 6 Cx) NATREPLACE=BASE/G
 M  V30 END SGROUP
 M  V30 END CTAB
 M  V30 END TEMPLATE