diff --git a/compiler/fir/resolve/testData/resolve/problems/asImports.kt b/compiler/fir/resolve/testData/resolve/asImports.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/asImports.kt
rename to compiler/fir/resolve/testData/resolve/asImports.kt
diff --git a/compiler/fir/resolve/testData/resolve/problems/asImports.txt b/compiler/fir/resolve/testData/resolve/asImports.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/asImports.txt
rename to compiler/fir/resolve/testData/resolve/asImports.txt
diff --git a/compiler/fir/resolve/testData/resolve/problems/bareTypes.kt b/compiler/fir/resolve/testData/resolve/bareTypes.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/bareTypes.kt
rename to compiler/fir/resolve/testData/resolve/bareTypes.kt
diff --git a/compiler/fir/resolve/testData/resolve/problems/bareTypes.txt b/compiler/fir/resolve/testData/resolve/bareTypes.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/bareTypes.txt
rename to compiler/fir/resolve/testData/resolve/bareTypes.txt
diff --git a/compiler/fir/resolve/testData/resolve/problems/defaultJavaImportHiding.kt b/compiler/fir/resolve/testData/resolve/defaultJavaImportHiding.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/defaultJavaImportHiding.kt
rename to compiler/fir/resolve/testData/resolve/defaultJavaImportHiding.kt
diff --git a/compiler/fir/resolve/testData/resolve/problems/defaultJavaImportHiding.txt b/compiler/fir/resolve/testData/resolve/defaultJavaImportHiding.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/defaultJavaImportHiding.txt
rename to compiler/fir/resolve/testData/resolve/defaultJavaImportHiding.txt
diff --git a/compiler/fir/resolve/testData/resolve/problems/definitelyNotNullAmbiguity.kt b/compiler/fir/resolve/testData/resolve/definitelyNotNullAmbiguity.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/definitelyNotNullAmbiguity.kt
rename to compiler/fir/resolve/testData/resolve/definitelyNotNullAmbiguity.kt
diff --git a/compiler/fir/resolve/testData/resolve/problems/definitelyNotNullAmbiguity.txt b/compiler/fir/resolve/testData/resolve/definitelyNotNullAmbiguity.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/definitelyNotNullAmbiguity.txt
rename to compiler/fir/resolve/testData/resolve/definitelyNotNullAmbiguity.txt
diff --git a/compiler/fir/resolve/testData/resolve/problems/incorrectSuperCall.kt b/compiler/fir/resolve/testData/resolve/incorrectSuperCall.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/incorrectSuperCall.kt
rename to compiler/fir/resolve/testData/resolve/incorrectSuperCall.kt
diff --git a/compiler/fir/resolve/testData/resolve/problems/incorrectSuperCall.txt b/compiler/fir/resolve/testData/resolve/incorrectSuperCall.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/incorrectSuperCall.txt
rename to compiler/fir/resolve/testData/resolve/incorrectSuperCall.txt
diff --git a/compiler/fir/resolve/testData/resolve/problems/invokeOfLambdaWithReceiver.kt b/compiler/fir/resolve/testData/resolve/invokeOfLambdaWithReceiver.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/invokeOfLambdaWithReceiver.kt
rename to compiler/fir/resolve/testData/resolve/invokeOfLambdaWithReceiver.kt
diff --git a/compiler/fir/resolve/testData/resolve/problems/invokeOfLambdaWithReceiver.txt b/compiler/fir/resolve/testData/resolve/invokeOfLambdaWithReceiver.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/invokeOfLambdaWithReceiver.txt
rename to compiler/fir/resolve/testData/resolve/invokeOfLambdaWithReceiver.txt
diff --git a/compiler/fir/resolve/testData/resolve/problems/javaFieldVsAccessor.kt b/compiler/fir/resolve/testData/resolve/javaFieldVsAccessor.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/javaFieldVsAccessor.kt
rename to compiler/fir/resolve/testData/resolve/javaFieldVsAccessor.kt
diff --git a/compiler/fir/resolve/testData/resolve/problems/javaFieldVsAccessor.txt b/compiler/fir/resolve/testData/resolve/javaFieldVsAccessor.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/javaFieldVsAccessor.txt
rename to compiler/fir/resolve/testData/resolve/javaFieldVsAccessor.txt
diff --git a/compiler/fir/resolve/testData/resolve/problems/javaStaticScopeInheritance.kt b/compiler/fir/resolve/testData/resolve/javaStaticScopeInheritance.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/javaStaticScopeInheritance.kt
rename to compiler/fir/resolve/testData/resolve/javaStaticScopeInheritance.kt
diff --git a/compiler/fir/resolve/testData/resolve/problems/javaStaticScopeInheritance.txt b/compiler/fir/resolve/testData/resolve/javaStaticScopeInheritance.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/javaStaticScopeInheritance.txt
rename to compiler/fir/resolve/testData/resolve/javaStaticScopeInheritance.txt
diff --git a/compiler/fir/resolve/testData/resolve/problems/localFunctionsHiding.kt b/compiler/fir/resolve/testData/resolve/localFunctionsHiding.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/localFunctionsHiding.kt
rename to compiler/fir/resolve/testData/resolve/localFunctionsHiding.kt
diff --git a/compiler/fir/resolve/testData/resolve/problems/localFunctionsHiding.txt b/compiler/fir/resolve/testData/resolve/localFunctionsHiding.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/localFunctionsHiding.txt
rename to compiler/fir/resolve/testData/resolve/localFunctionsHiding.txt
diff --git a/compiler/fir/resolve/testData/resolve/problems/nestedClassContructor.kt b/compiler/fir/resolve/testData/resolve/nestedClassContructor.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/nestedClassContructor.kt
rename to compiler/fir/resolve/testData/resolve/nestedClassContructor.kt
diff --git a/compiler/fir/resolve/testData/resolve/problems/nestedClassContructor.txt b/compiler/fir/resolve/testData/resolve/nestedClassContructor.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/nestedClassContructor.txt
rename to compiler/fir/resolve/testData/resolve/nestedClassContructor.txt
diff --git a/compiler/fir/resolve/testData/resolve/problems/propertyFromJavaPlusAssign.kt b/compiler/fir/resolve/testData/resolve/propertyFromJavaPlusAssign.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/propertyFromJavaPlusAssign.kt
rename to compiler/fir/resolve/testData/resolve/propertyFromJavaPlusAssign.kt
diff --git a/compiler/fir/resolve/testData/resolve/problems/propertyFromJavaPlusAssign.txt b/compiler/fir/resolve/testData/resolve/propertyFromJavaPlusAssign.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/propertyFromJavaPlusAssign.txt
rename to compiler/fir/resolve/testData/resolve/propertyFromJavaPlusAssign.txt
diff --git a/compiler/fir/resolve/testData/resolve/problems/syntheticsVsNormalProperties.kt b/compiler/fir/resolve/testData/resolve/syntheticsVsNormalProperties.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/syntheticsVsNormalProperties.kt
rename to compiler/fir/resolve/testData/resolve/syntheticsVsNormalProperties.kt
diff --git a/compiler/fir/resolve/testData/resolve/problems/syntheticsVsNormalProperties.txt b/compiler/fir/resolve/testData/resolve/syntheticsVsNormalProperties.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/syntheticsVsNormalProperties.txt
rename to compiler/fir/resolve/testData/resolve/syntheticsVsNormalProperties.txt
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
index 813c67fd18a..41d4ad7c38e 100644
--- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
+++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
@@ -28,6 +28,16 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
         KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolve"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "stdlib", "cfg", "smartcasts");
     }
 
+    @TestMetadata("asImports.kt")
+    public void testAsImports() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/asImports.kt");
+    }
+
+    @TestMetadata("bareTypes.kt")
+    public void testBareTypes() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/bareTypes.kt");
+    }
+
     @TestMetadata("cast.kt")
     public void testCast() throws Exception {
         runTest("compiler/fir/resolve/testData/resolve/cast.kt");
@@ -48,6 +58,16 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
         runTest("compiler/fir/resolve/testData/resolve/copy.kt");
     }
 
+    @TestMetadata("defaultJavaImportHiding.kt")
+    public void testDefaultJavaImportHiding() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/defaultJavaImportHiding.kt");
+    }
+
+    @TestMetadata("definitelyNotNullAmbiguity.kt")
+    public void testDefinitelyNotNullAmbiguity() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/definitelyNotNullAmbiguity.kt");
+    }
+
     @TestMetadata("delegatedSuperType.kt")
     public void testDelegatedSuperType() throws Exception {
         runTest("compiler/fir/resolve/testData/resolve/delegatedSuperType.kt");
@@ -148,6 +168,11 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
         runTest("compiler/fir/resolve/testData/resolve/genericFunctions.kt");
     }
 
+    @TestMetadata("incorrectSuperCall.kt")
+    public void testIncorrectSuperCall() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/incorrectSuperCall.kt");
+    }
+
     @TestMetadata("intersectionScope.kt")
     public void testIntersectionScope() throws Exception {
         runTest("compiler/fir/resolve/testData/resolve/intersectionScope.kt");
@@ -158,6 +183,26 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
         runTest("compiler/fir/resolve/testData/resolve/intersectionTypes.kt");
     }
 
+    @TestMetadata("invokeOfLambdaWithReceiver.kt")
+    public void testInvokeOfLambdaWithReceiver() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/invokeOfLambdaWithReceiver.kt");
+    }
+
+    @TestMetadata("javaFieldVsAccessor.kt")
+    public void testJavaFieldVsAccessor() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/javaFieldVsAccessor.kt");
+    }
+
+    @TestMetadata("javaStaticScopeInheritance.kt")
+    public void testJavaStaticScopeInheritance() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/javaStaticScopeInheritance.kt");
+    }
+
+    @TestMetadata("localFunctionsHiding.kt")
+    public void testLocalFunctionsHiding() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/localFunctionsHiding.kt");
+    }
+
     @TestMetadata("localObject.kt")
     public void testLocalObject() throws Exception {
         runTest("compiler/fir/resolve/testData/resolve/localObject.kt");
@@ -168,6 +213,11 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
         runTest("compiler/fir/resolve/testData/resolve/nestedClass.kt");
     }
 
+    @TestMetadata("nestedClassContructor.kt")
+    public void testNestedClassContructor() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/nestedClassContructor.kt");
+    }
+
     @TestMetadata("nestedClassNameClash.kt")
     public void testNestedClassNameClash() throws Exception {
         runTest("compiler/fir/resolve/testData/resolve/nestedClassNameClash.kt");
@@ -193,6 +243,11 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
         runTest("compiler/fir/resolve/testData/resolve/problems2.kt");
     }
 
+    @TestMetadata("propertyFromJavaPlusAssign.kt")
+    public void testPropertyFromJavaPlusAssign() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/propertyFromJavaPlusAssign.kt");
+    }
+
     @TestMetadata("qualifierWithCompanion.kt")
     public void testQualifierWithCompanion() throws Exception {
         runTest("compiler/fir/resolve/testData/resolve/qualifierWithCompanion.kt");
@@ -213,6 +268,11 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
         runTest("compiler/fir/resolve/testData/resolve/simpleTypeAlias.kt");
     }
 
+    @TestMetadata("syntheticsVsNormalProperties.kt")
+    public void testSyntheticsVsNormalProperties() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/syntheticsVsNormalProperties.kt");
+    }
+
     @TestMetadata("treeSet.kt")
     public void testTreeSet() throws Exception {
         runTest("compiler/fir/resolve/testData/resolve/treeSet.kt");
@@ -1106,80 +1166,20 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
             KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolve/problems"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
-        @TestMetadata("asImports.kt")
-        public void testAsImports() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/asImports.kt");
-        }
-
-        @TestMetadata("bareTypes.kt")
-        public void testBareTypes() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/bareTypes.kt");
-        }
-
         @TestMetadata("covariantArrayAsReceiver.kt")
         public void testCovariantArrayAsReceiver() throws Exception {
             runTest("compiler/fir/resolve/testData/resolve/problems/covariantArrayAsReceiver.kt");
         }
 
-        @TestMetadata("defaultJavaImportHiding.kt")
-        public void testDefaultJavaImportHiding() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/defaultJavaImportHiding.kt");
-        }
-
         @TestMetadata("definetelyNotNullForTypeParameter.kt")
         public void testDefinetelyNotNullForTypeParameter() throws Exception {
             runTest("compiler/fir/resolve/testData/resolve/problems/definetelyNotNullForTypeParameter.kt");
         }
 
-        @TestMetadata("definitelyNotNullAmbiguity.kt")
-        public void testDefinitelyNotNullAmbiguity() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/definitelyNotNullAmbiguity.kt");
-        }
-
-        @TestMetadata("incorrectSuperCall.kt")
-        public void testIncorrectSuperCall() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/incorrectSuperCall.kt");
-        }
-
-        @TestMetadata("invokeOfLambdaWithReceiver.kt")
-        public void testInvokeOfLambdaWithReceiver() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/invokeOfLambdaWithReceiver.kt");
-        }
-
         @TestMetadata("javaAccessorConversion.kt")
         public void testJavaAccessorConversion() throws Exception {
             runTest("compiler/fir/resolve/testData/resolve/problems/javaAccessorConversion.kt");
         }
-
-        @TestMetadata("javaFieldVsAccessor.kt")
-        public void testJavaFieldVsAccessor() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/javaFieldVsAccessor.kt");
-        }
-
-        @TestMetadata("javaStaticScopeInheritance.kt")
-        public void testJavaStaticScopeInheritance() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/javaStaticScopeInheritance.kt");
-        }
-
-        @TestMetadata("localFunctionsHiding.kt")
-        public void testLocalFunctionsHiding() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/localFunctionsHiding.kt");
-        }
-
-        @TestMetadata("nestedClassContructor.kt")
-        public void testNestedClassContructor() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/nestedClassContructor.kt");
-        }
-
-        @TestMetadata("propertyFromJavaPlusAssign.kt")
-        public void testPropertyFromJavaPlusAssign() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/propertyFromJavaPlusAssign.kt");
-        }
-
-        @TestMetadata("syntheticsVsNormalProperties.kt")
-        public void testSyntheticsVsNormalProperties() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/syntheticsVsNormalProperties.kt");
-        }
     }
 
     @TestMetadata("compiler/fir/resolve/testData/resolve/references")
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java
index f08d5fc3a2e..ade75d50722 100644
--- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java
+++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java
@@ -28,6 +28,16 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
         KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolve"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "stdlib", "cfg", "smartcasts");
     }
 
+    @TestMetadata("asImports.kt")
+    public void testAsImports() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/asImports.kt");
+    }
+
+    @TestMetadata("bareTypes.kt")
+    public void testBareTypes() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/bareTypes.kt");
+    }
+
     @TestMetadata("cast.kt")
     public void testCast() throws Exception {
         runTest("compiler/fir/resolve/testData/resolve/cast.kt");
@@ -48,6 +58,16 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
         runTest("compiler/fir/resolve/testData/resolve/copy.kt");
     }
 
+    @TestMetadata("defaultJavaImportHiding.kt")
+    public void testDefaultJavaImportHiding() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/defaultJavaImportHiding.kt");
+    }
+
+    @TestMetadata("definitelyNotNullAmbiguity.kt")
+    public void testDefinitelyNotNullAmbiguity() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/definitelyNotNullAmbiguity.kt");
+    }
+
     @TestMetadata("delegatedSuperType.kt")
     public void testDelegatedSuperType() throws Exception {
         runTest("compiler/fir/resolve/testData/resolve/delegatedSuperType.kt");
@@ -148,6 +168,11 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
         runTest("compiler/fir/resolve/testData/resolve/genericFunctions.kt");
     }
 
+    @TestMetadata("incorrectSuperCall.kt")
+    public void testIncorrectSuperCall() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/incorrectSuperCall.kt");
+    }
+
     @TestMetadata("intersectionScope.kt")
     public void testIntersectionScope() throws Exception {
         runTest("compiler/fir/resolve/testData/resolve/intersectionScope.kt");
@@ -158,6 +183,26 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
         runTest("compiler/fir/resolve/testData/resolve/intersectionTypes.kt");
     }
 
+    @TestMetadata("invokeOfLambdaWithReceiver.kt")
+    public void testInvokeOfLambdaWithReceiver() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/invokeOfLambdaWithReceiver.kt");
+    }
+
+    @TestMetadata("javaFieldVsAccessor.kt")
+    public void testJavaFieldVsAccessor() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/javaFieldVsAccessor.kt");
+    }
+
+    @TestMetadata("javaStaticScopeInheritance.kt")
+    public void testJavaStaticScopeInheritance() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/javaStaticScopeInheritance.kt");
+    }
+
+    @TestMetadata("localFunctionsHiding.kt")
+    public void testLocalFunctionsHiding() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/localFunctionsHiding.kt");
+    }
+
     @TestMetadata("localObject.kt")
     public void testLocalObject() throws Exception {
         runTest("compiler/fir/resolve/testData/resolve/localObject.kt");
@@ -168,6 +213,11 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
         runTest("compiler/fir/resolve/testData/resolve/nestedClass.kt");
     }
 
+    @TestMetadata("nestedClassContructor.kt")
+    public void testNestedClassContructor() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/nestedClassContructor.kt");
+    }
+
     @TestMetadata("nestedClassNameClash.kt")
     public void testNestedClassNameClash() throws Exception {
         runTest("compiler/fir/resolve/testData/resolve/nestedClassNameClash.kt");
@@ -193,6 +243,11 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
         runTest("compiler/fir/resolve/testData/resolve/problems2.kt");
     }
 
+    @TestMetadata("propertyFromJavaPlusAssign.kt")
+    public void testPropertyFromJavaPlusAssign() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/propertyFromJavaPlusAssign.kt");
+    }
+
     @TestMetadata("qualifierWithCompanion.kt")
     public void testQualifierWithCompanion() throws Exception {
         runTest("compiler/fir/resolve/testData/resolve/qualifierWithCompanion.kt");
@@ -213,6 +268,11 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
         runTest("compiler/fir/resolve/testData/resolve/simpleTypeAlias.kt");
     }
 
+    @TestMetadata("syntheticsVsNormalProperties.kt")
+    public void testSyntheticsVsNormalProperties() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/syntheticsVsNormalProperties.kt");
+    }
+
     @TestMetadata("treeSet.kt")
     public void testTreeSet() throws Exception {
         runTest("compiler/fir/resolve/testData/resolve/treeSet.kt");
@@ -1106,80 +1166,20 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
             KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolve/problems"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
-        @TestMetadata("asImports.kt")
-        public void testAsImports() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/asImports.kt");
-        }
-
-        @TestMetadata("bareTypes.kt")
-        public void testBareTypes() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/bareTypes.kt");
-        }
-
         @TestMetadata("covariantArrayAsReceiver.kt")
         public void testCovariantArrayAsReceiver() throws Exception {
             runTest("compiler/fir/resolve/testData/resolve/problems/covariantArrayAsReceiver.kt");
         }
 
-        @TestMetadata("defaultJavaImportHiding.kt")
-        public void testDefaultJavaImportHiding() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/defaultJavaImportHiding.kt");
-        }
-
         @TestMetadata("definetelyNotNullForTypeParameter.kt")
         public void testDefinetelyNotNullForTypeParameter() throws Exception {
             runTest("compiler/fir/resolve/testData/resolve/problems/definetelyNotNullForTypeParameter.kt");
         }
 
-        @TestMetadata("definitelyNotNullAmbiguity.kt")
-        public void testDefinitelyNotNullAmbiguity() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/definitelyNotNullAmbiguity.kt");
-        }
-
-        @TestMetadata("incorrectSuperCall.kt")
-        public void testIncorrectSuperCall() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/incorrectSuperCall.kt");
-        }
-
-        @TestMetadata("invokeOfLambdaWithReceiver.kt")
-        public void testInvokeOfLambdaWithReceiver() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/invokeOfLambdaWithReceiver.kt");
-        }
-
         @TestMetadata("javaAccessorConversion.kt")
         public void testJavaAccessorConversion() throws Exception {
             runTest("compiler/fir/resolve/testData/resolve/problems/javaAccessorConversion.kt");
         }
-
-        @TestMetadata("javaFieldVsAccessor.kt")
-        public void testJavaFieldVsAccessor() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/javaFieldVsAccessor.kt");
-        }
-
-        @TestMetadata("javaStaticScopeInheritance.kt")
-        public void testJavaStaticScopeInheritance() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/javaStaticScopeInheritance.kt");
-        }
-
-        @TestMetadata("localFunctionsHiding.kt")
-        public void testLocalFunctionsHiding() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/localFunctionsHiding.kt");
-        }
-
-        @TestMetadata("nestedClassContructor.kt")
-        public void testNestedClassContructor() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/nestedClassContructor.kt");
-        }
-
-        @TestMetadata("propertyFromJavaPlusAssign.kt")
-        public void testPropertyFromJavaPlusAssign() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/propertyFromJavaPlusAssign.kt");
-        }
-
-        @TestMetadata("syntheticsVsNormalProperties.kt")
-        public void testSyntheticsVsNormalProperties() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/syntheticsVsNormalProperties.kt");
-        }
     }
 
     @TestMetadata("compiler/fir/resolve/testData/resolve/references")