Add more tests
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
index 139c299..8c7fca1 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
@@ -26474,12 +26474,30 @@
                 }
 
                 @Test
+                @TestMetadata("commonIntermediateRedeclaration.kt")
+                public void testCommonIntermediateRedeclaration() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/commonIntermediateRedeclaration.kt");
+                }
+
+                @Test
+                @TestMetadata("commonPlatformRedeclaration.kt")
+                public void testCommonPlatformRedeclaration() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/commonPlatformRedeclaration.kt");
+                }
+
+                @Test
                 @TestMetadata("intermediateActualHasAdditionalSupertypes.kt")
                 public void testIntermediateActualHasAdditionalSupertypes() throws Exception {
                     runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/intermediateActualHasAdditionalSupertypes.kt");
                 }
 
                 @Test
+                @TestMetadata("intermediatePlatformRedeclaration.kt")
+                public void testIntermediatePlatformRedeclaration() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/intermediatePlatformRedeclaration.kt");
+                }
+
+                @Test
                 @TestMetadata("kt57320.kt")
                 public void testKt57320() throws Exception {
                     runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/kt57320.kt");
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
index 4a1901f..9d64082 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
@@ -26474,12 +26474,30 @@
                 }
 
                 @Test
+                @TestMetadata("commonIntermediateRedeclaration.kt")
+                public void testCommonIntermediateRedeclaration() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/commonIntermediateRedeclaration.kt");
+                }
+
+                @Test
+                @TestMetadata("commonPlatformRedeclaration.kt")
+                public void testCommonPlatformRedeclaration() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/commonPlatformRedeclaration.kt");
+                }
+
+                @Test
                 @TestMetadata("intermediateActualHasAdditionalSupertypes.kt")
                 public void testIntermediateActualHasAdditionalSupertypes() throws Exception {
                     runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/intermediateActualHasAdditionalSupertypes.kt");
                 }
 
                 @Test
+                @TestMetadata("intermediatePlatformRedeclaration.kt")
+                public void testIntermediatePlatformRedeclaration() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/intermediatePlatformRedeclaration.kt");
+                }
+
+                @Test
                 @TestMetadata("kt57320.kt")
                 public void testKt57320() throws Exception {
                     runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/kt57320.kt");
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated.java
index 063ec16..046b28e 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated.java
@@ -1759,12 +1759,30 @@
         }
 
         @Test
+        @TestMetadata("commonIntermediateRedeclaration.kt")
+        public void testCommonIntermediateRedeclaration() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/commonIntermediateRedeclaration.kt");
+        }
+
+        @Test
+        @TestMetadata("commonPlatformRedeclaration.kt")
+        public void testCommonPlatformRedeclaration() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/commonPlatformRedeclaration.kt");
+        }
+
+        @Test
         @TestMetadata("intermediateActualHasAdditionalSupertypes.kt")
         public void testIntermediateActualHasAdditionalSupertypes() throws Exception {
             runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/intermediateActualHasAdditionalSupertypes.kt");
         }
 
         @Test
+        @TestMetadata("intermediatePlatformRedeclaration.kt")
+        public void testIntermediatePlatformRedeclaration() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/intermediatePlatformRedeclaration.kt");
+        }
+
+        @Test
         @TestMetadata("kt57320.kt")
         public void testKt57320() throws Exception {
             runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/kt57320.kt");
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithPsiTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithPsiTestGenerated.java
index b0ff6a2..8fd4138 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithPsiTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithPsiTestGenerated.java
@@ -1759,12 +1759,30 @@
         }
 
         @Test
+        @TestMetadata("commonIntermediateRedeclaration.kt")
+        public void testCommonIntermediateRedeclaration() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/commonIntermediateRedeclaration.kt");
+        }
+
+        @Test
+        @TestMetadata("commonPlatformRedeclaration.kt")
+        public void testCommonPlatformRedeclaration() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/commonPlatformRedeclaration.kt");
+        }
+
+        @Test
         @TestMetadata("intermediateActualHasAdditionalSupertypes.kt")
         public void testIntermediateActualHasAdditionalSupertypes() throws Exception {
             runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/intermediateActualHasAdditionalSupertypes.kt");
         }
 
         @Test
+        @TestMetadata("intermediatePlatformRedeclaration.kt")
+        public void testIntermediatePlatformRedeclaration() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/intermediatePlatformRedeclaration.kt");
+        }
+
+        @Test
         @TestMetadata("kt57320.kt")
         public void testKt57320() throws Exception {
             runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/kt57320.kt");
diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/commonIntermediateRedeclaration.kt b/compiler/testData/diagnostics/tests/multiplatform/hmpp/commonIntermediateRedeclaration.kt
new file mode 100644
index 0000000..42b00c7
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/multiplatform/hmpp/commonIntermediateRedeclaration.kt
@@ -0,0 +1,12 @@
+// FIR_IDENTICAL
+// MODULE: common
+// TARGET_PLATFORM: Common
+
+class Foo
+
+// MODULE: intermediate()()(common)
+// TARGET_PLATFORM: Common
+
+class Foo
+
+// MODULE: main()()(common, intermediate)
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/commonPlatformRedeclaration.kt b/compiler/testData/diagnostics/tests/multiplatform/hmpp/commonPlatformRedeclaration.kt
new file mode 100644
index 0000000..2dd1089
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/multiplatform/hmpp/commonPlatformRedeclaration.kt
@@ -0,0 +1,13 @@
+// FIR_IDENTICAL
+// MODULE: common
+// TARGET_PLATFORM: Common
+
+class Foo
+
+// MODULE: intermediate()()(common)
+// TARGET_PLATFORM: Common
+
+
+// MODULE: main()()(common, intermediate)
+
+class Foo
diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/intermediatePlatformRedeclaration.kt b/compiler/testData/diagnostics/tests/multiplatform/hmpp/intermediatePlatformRedeclaration.kt
new file mode 100644
index 0000000..b5de92d5
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/multiplatform/hmpp/intermediatePlatformRedeclaration.kt
@@ -0,0 +1,12 @@
+// FIR_IDENTICAL
+// MODULE: common
+// TARGET_PLATFORM: Common
+
+// MODULE: intermediate()()(common)
+// TARGET_PLATFORM: Common
+
+class Foo
+
+// MODULE: main()()(common, intermediate)
+
+class Foo
\ No newline at end of file
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
index 8f921ce..610671a 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
@@ -26474,12 +26474,30 @@
                 }
 
                 @Test
+                @TestMetadata("commonIntermediateRedeclaration.kt")
+                public void testCommonIntermediateRedeclaration() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/commonIntermediateRedeclaration.kt");
+                }
+
+                @Test
+                @TestMetadata("commonPlatformRedeclaration.kt")
+                public void testCommonPlatformRedeclaration() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/commonPlatformRedeclaration.kt");
+                }
+
+                @Test
                 @TestMetadata("intermediateActualHasAdditionalSupertypes.kt")
                 public void testIntermediateActualHasAdditionalSupertypes() throws Exception {
                     runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/intermediateActualHasAdditionalSupertypes.kt");
                 }
 
                 @Test
+                @TestMetadata("intermediatePlatformRedeclaration.kt")
+                public void testIntermediatePlatformRedeclaration() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/intermediatePlatformRedeclaration.kt");
+                }
+
+                @Test
                 @TestMetadata("kt57320.kt")
                 public void testKt57320() throws Exception {
                     runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/kt57320.kt");