diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesFacadeTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesFacadeTest.kt
deleted file mode 100644
index ce920f308a6..00000000000
--- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesFacadeTest.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.light.classes.symbol.base
-
-import com.intellij.openapi.project.Project
-import com.intellij.psi.search.GlobalSearchScope
-import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator
-import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport
-import org.jetbrains.kotlin.asJava.LightClassTestCommon
-import org.jetbrains.kotlin.asJava.classes.KtLightClass
-import org.jetbrains.kotlin.asJava.renderClass
-import org.jetbrains.kotlin.light.classes.symbol.base.service.withExtendedTypeRenderer
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.psi.KtFile
-import org.jetbrains.kotlin.test.model.TestModule
-import java.nio.file.Path
-
-abstract class AbstractSymbolLightClassesFacadeTest(
-    configurator: AnalysisApiTestConfigurator,
-    override val currentExtension: String,
-    override val stopIfCompilationErrorDirectivePresent: Boolean,
-) : AbstractSymbolLightClassesTestBase(configurator) {
-    override fun getRenderResult(ktFile: KtFile, ktFiles: List<KtFile>, testDataFile: Path, module: TestModule, project: Project): String {
-        val lightClasses = getFacades(project)
-        if (lightClasses.isEmpty()) return LightClassTestCommon.NOT_GENERATED_DIRECTIVE
-        return withExtendedTypeRenderer((testDataFile)) {
-            lightClasses.joinToString("\n\n") { it.renderClass() }
-        }
-    }
-
-    private fun getFacades(
-        project: Project
-    ): List<KtLightClass> {
-        val kotlinAsJavaSupport = KotlinAsJavaSupport.getInstance(project)
-        val scope = GlobalSearchScope.allScope(project)
-        val facades = kotlinAsJavaSupport.getFacadeNames(FqName.ROOT, scope).sorted()
-        return facades.flatMap { facadeName -> kotlinAsJavaSupport.getFacadeClasses(FqName(facadeName), scope) }
-    }
-}
\ No newline at end of file
diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesLoadingTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesLoadingTest.kt
index 37f97d171b5..f8007ac8dc5 100644
--- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesLoadingTest.kt
+++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesLoadingTest.kt
@@ -23,19 +23,15 @@ abstract class AbstractSymbolLightClassesLoadingTest(
 ) : AbstractSymbolLightClassesTestBase(configurator) {
 
     override fun getRenderResult(ktFile: KtFile, ktFiles: List<KtFile>, testDataFile: Path, module: TestModule, project: Project): String {
-        val lightClasses = ktFiles.flatMap { getLightClassesFromFile(it, project) }
+        val lightClasses = ktFiles.flatMap { getLightClassesFromFile(it) }
         if (lightClasses.isEmpty()) return LightClassTestCommon.NOT_GENERATED_DIRECTIVE
         return withExtendedTypeRenderer(testDataFile) {
             lightClasses.joinToString("\n\n") { it.renderClass() }
         }
     }
 
-    private fun getLightClassesFromFile(
-        ktFile: KtFile,
-        project: Project
-    ): List<PsiClass> {
+    private fun getLightClassesFromFile(ktFile: KtFile): List<PsiClass> {
         val ktClasses = SyntaxTraverser.psiTraverser(ktFile).filter(KtClassOrObject::class.java).toList()
-        val kotlinAsJavaSupport = KotlinAsJavaSupport.getInstance(project)
-        return ktClasses.mapNotNull(kotlinAsJavaSupport::getLightClass) + listOfNotNull(kotlinAsJavaSupport.getLightFacade(ktFile))
+        return ktClasses.plus(ktFile).flatMap { it.toLightElements() }.filterIsInstance<PsiClass>()
     }
 }
diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesFacadeForLibraryTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesFacadeForLibraryTest.kt
deleted file mode 100644
index 9310f27aab3..00000000000
--- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesFacadeForLibraryTest.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.light.classes.symbol.decompiled
-
-import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClassesFacadeTest
-import org.jetbrains.kotlin.light.classes.symbol.decompiled.test.configurators.AnalysisApiSymbolLightClassesDecompiledTestConfigurator
-
-abstract class AbstractSymbolLightClassesFacadeForLibraryTest :
-    AbstractSymbolLightClassesFacadeTest(
-        AnalysisApiSymbolLightClassesDecompiledTestConfigurator,
-        EXTENSIONS.LIB_JAVA,
-        stopIfCompilationErrorDirectivePresent = true
-    )
\ No newline at end of file
diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesFacadeForLibraryTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesFacadeForLibraryTestGenerated.java
deleted file mode 100644
index 6a0a5a33da4..00000000000
--- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesFacadeForLibraryTestGenerated.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.light.classes.symbol.decompiled;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("compiler/testData/asJava/lightClasses/ultraLightFacades")
-@TestDataPath("$PROJECT_ROOT")
-public class SymbolLightClassesFacadeForLibraryTestGenerated extends AbstractSymbolLightClassesFacadeForLibraryTest {
-    @Test
-    public void testAllFilesPresentInUltraLightFacades() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/ultraLightFacades"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true);
-    }
-
-    @Test
-    @TestMetadata("coroutines.kt")
-    public void testCoroutines() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/coroutines.kt");
-    }
-
-    @Test
-    @TestMetadata("importAliases.kt")
-    public void testImportAliases() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/importAliases.kt");
-    }
-
-    @Test
-    @TestMetadata("inlineOnly.kt")
-    public void testInlineOnly() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/inlineOnly.kt");
-    }
-
-    @Test
-    @TestMetadata("jvmField.kt")
-    public void testJvmField() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/jvmField.kt");
-    }
-
-    @Test
-    @TestMetadata("jvmName.kt")
-    public void testJvmName() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/jvmName.kt");
-    }
-
-    @Test
-    @TestMetadata("jvmWildcardAnnotations.kt")
-    public void testJvmWildcardAnnotations() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/jvmWildcardAnnotations.kt");
-    }
-
-    @Test
-    @TestMetadata("lateinitProperty.kt")
-    public void testLateinitProperty() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/lateinitProperty.kt");
-    }
-
-    @Test
-    @TestMetadata("multifileFacade.kt")
-    public void testMultifileFacade() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacade.kt");
-    }
-
-    @Test
-    @TestMetadata("multifileFacadeJvmName.kt")
-    public void testMultifileFacadeJvmName() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacadeJvmName.kt");
-    }
-
-    @Test
-    @TestMetadata("properties.kt")
-    public void testProperties() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/properties.kt");
-    }
-
-    @Test
-    @TestMetadata("script.kts")
-    public void testScript() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/script.kts");
-    }
-
-    @Test
-    @TestMetadata("simpleFunctions.kt")
-    public void testSimpleFunctions() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/simpleFunctions.kt");
-    }
-
-    @Test
-    @TestMetadata("throwsAnnotation.kt")
-    public void testThrowsAnnotation() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/throwsAnnotation.kt");
-    }
-
-    @Test
-    @TestMetadata("wildcardOptimization.kt")
-    public void testWildcardOptimization() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/wildcardOptimization.kt");
-    }
-}
diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesLoadingForLibraryTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesLoadingForLibraryTestGenerated.java
index 99d1afcd51b..b4285aaf8c2 100644
--- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesLoadingForLibraryTestGenerated.java
+++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesLoadingForLibraryTestGenerated.java
@@ -222,6 +222,12 @@ public class SymbolLightClassesLoadingForLibraryTestGenerated extends AbstractSy
         runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/properties.kt");
     }
 
+    @Test
+    @TestMetadata("script.kts")
+    public void testScript() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/script.kts");
+    }
+
     @Test
     @TestMetadata("simpleFunctions.kt")
     public void testSimpleFunctions() throws Exception {
@@ -251,4 +257,92 @@ public class SymbolLightClassesLoadingForLibraryTestGenerated extends AbstractSy
     public void testWildcardOptimization() throws Exception {
         runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.kt");
     }
+
+    @Nested
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByPsi/facades")
+    @TestDataPath("$PROJECT_ROOT")
+    public class Facades {
+        @Test
+        public void testAllFilesPresentInFacades() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByPsi/facades"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true);
+        }
+
+        @Test
+        @TestMetadata("coroutines.kt")
+        public void testCoroutines() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/coroutines.kt");
+        }
+
+        @Test
+        @TestMetadata("importAliases.kt")
+        public void testImportAliases() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/importAliases.kt");
+        }
+
+        @Test
+        @TestMetadata("inlineOnly.kt")
+        public void testInlineOnly() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.kt");
+        }
+
+        @Test
+        @TestMetadata("jvmField.kt")
+        public void testJvmField() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmField.kt");
+        }
+
+        @Test
+        @TestMetadata("jvmName.kt")
+        public void testJvmName() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmName.kt");
+        }
+
+        @Test
+        @TestMetadata("jvmWildcardAnnotations.kt")
+        public void testJvmWildcardAnnotations() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.kt");
+        }
+
+        @Test
+        @TestMetadata("lateinitProperty.kt")
+        public void testLateinitProperty() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/lateinitProperty.kt");
+        }
+
+        @Test
+        @TestMetadata("multifileFacade.kt")
+        public void testMultifileFacade() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.kt");
+        }
+
+        @Test
+        @TestMetadata("multifileFacadeJvmName.kt")
+        public void testMultifileFacadeJvmName() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.kt");
+        }
+
+        @Test
+        @TestMetadata("properties.kt")
+        public void testProperties() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/properties.kt");
+        }
+
+        @Test
+        @TestMetadata("simpleFunctions.kt")
+        public void testSimpleFunctions() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/simpleFunctions.kt");
+        }
+
+        @Test
+        @TestMetadata("throwsAnnotation.kt")
+        public void testThrowsAnnotation() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.kt");
+        }
+
+        @Test
+        @TestMetadata("wildcardOptimization.kt")
+        public void testWildcardOptimization() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.kt");
+        }
+    }
 }
diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesFacadeForSourceTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesFacadeForSourceTest.kt
deleted file mode 100644
index 00654d2e44d..00000000000
--- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesFacadeForSourceTest.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.light.classes.symbol.source
-
-import org.jetbrains.kotlin.analysis.low.level.api.fir.test.configurators.AnalysisApiFirSourceTestConfigurator
-import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClassesFacadeTest
-
-abstract class AbstractSymbolLightClassesFacadeForSourceTest :
-    AbstractSymbolLightClassesFacadeTest(
-        AnalysisApiFirSourceTestConfigurator(analyseInDependentSession = false),
-        EXTENSIONS.FIR_JAVA,
-        stopIfCompilationErrorDirectivePresent = false
-    )
\ No newline at end of file
diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesFacadeForSourceTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesFacadeForSourceTestGenerated.java
deleted file mode 100644
index 68f4f40769e..00000000000
--- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesFacadeForSourceTestGenerated.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.light.classes.symbol.source;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("compiler/testData/asJava/lightClasses/ultraLightFacades")
-@TestDataPath("$PROJECT_ROOT")
-public class SymbolLightClassesFacadeForSourceTestGenerated extends AbstractSymbolLightClassesFacadeForSourceTest {
-    @Test
-    public void testAllFilesPresentInUltraLightFacades() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/ultraLightFacades"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true);
-    }
-
-    @Test
-    @TestMetadata("coroutines.kt")
-    public void testCoroutines() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/coroutines.kt");
-    }
-
-    @Test
-    @TestMetadata("importAliases.kt")
-    public void testImportAliases() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/importAliases.kt");
-    }
-
-    @Test
-    @TestMetadata("inlineOnly.kt")
-    public void testInlineOnly() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/inlineOnly.kt");
-    }
-
-    @Test
-    @TestMetadata("jvmField.kt")
-    public void testJvmField() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/jvmField.kt");
-    }
-
-    @Test
-    @TestMetadata("jvmName.kt")
-    public void testJvmName() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/jvmName.kt");
-    }
-
-    @Test
-    @TestMetadata("jvmWildcardAnnotations.kt")
-    public void testJvmWildcardAnnotations() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/jvmWildcardAnnotations.kt");
-    }
-
-    @Test
-    @TestMetadata("lateinitProperty.kt")
-    public void testLateinitProperty() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/lateinitProperty.kt");
-    }
-
-    @Test
-    @TestMetadata("multifileFacade.kt")
-    public void testMultifileFacade() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacade.kt");
-    }
-
-    @Test
-    @TestMetadata("multifileFacadeJvmName.kt")
-    public void testMultifileFacadeJvmName() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacadeJvmName.kt");
-    }
-
-    @Test
-    @TestMetadata("properties.kt")
-    public void testProperties() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/properties.kt");
-    }
-
-    @Test
-    @TestMetadata("script.kts")
-    public void testScript() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/script.kts");
-    }
-
-    @Test
-    @TestMetadata("simpleFunctions.kt")
-    public void testSimpleFunctions() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/simpleFunctions.kt");
-    }
-
-    @Test
-    @TestMetadata("throwsAnnotation.kt")
-    public void testThrowsAnnotation() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/throwsAnnotation.kt");
-    }
-
-    @Test
-    @TestMetadata("wildcardOptimization.kt")
-    public void testWildcardOptimization() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/wildcardOptimization.kt");
-    }
-}
diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesLoadingForSourceTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesLoadingForSourceTestGenerated.java
index 39abad4a9b8..f0c9b7a6f12 100644
--- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesLoadingForSourceTestGenerated.java
+++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesLoadingForSourceTestGenerated.java
@@ -222,6 +222,12 @@ public class SymbolLightClassesLoadingForSourceTestGenerated extends AbstractSym
         runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/properties.kt");
     }
 
+    @Test
+    @TestMetadata("script.kts")
+    public void testScript() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/script.kts");
+    }
+
     @Test
     @TestMetadata("simpleFunctions.kt")
     public void testSimpleFunctions() throws Exception {
@@ -251,4 +257,92 @@ public class SymbolLightClassesLoadingForSourceTestGenerated extends AbstractSym
     public void testWildcardOptimization() throws Exception {
         runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.kt");
     }
+
+    @Nested
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByPsi/facades")
+    @TestDataPath("$PROJECT_ROOT")
+    public class Facades {
+        @Test
+        public void testAllFilesPresentInFacades() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByPsi/facades"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true);
+        }
+
+        @Test
+        @TestMetadata("coroutines.kt")
+        public void testCoroutines() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/coroutines.kt");
+        }
+
+        @Test
+        @TestMetadata("importAliases.kt")
+        public void testImportAliases() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/importAliases.kt");
+        }
+
+        @Test
+        @TestMetadata("inlineOnly.kt")
+        public void testInlineOnly() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.kt");
+        }
+
+        @Test
+        @TestMetadata("jvmField.kt")
+        public void testJvmField() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmField.kt");
+        }
+
+        @Test
+        @TestMetadata("jvmName.kt")
+        public void testJvmName() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmName.kt");
+        }
+
+        @Test
+        @TestMetadata("jvmWildcardAnnotations.kt")
+        public void testJvmWildcardAnnotations() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.kt");
+        }
+
+        @Test
+        @TestMetadata("lateinitProperty.kt")
+        public void testLateinitProperty() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/lateinitProperty.kt");
+        }
+
+        @Test
+        @TestMetadata("multifileFacade.kt")
+        public void testMultifileFacade() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.kt");
+        }
+
+        @Test
+        @TestMetadata("multifileFacadeJvmName.kt")
+        public void testMultifileFacadeJvmName() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.kt");
+        }
+
+        @Test
+        @TestMetadata("properties.kt")
+        public void testProperties() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/properties.kt");
+        }
+
+        @Test
+        @TestMetadata("simpleFunctions.kt")
+        public void testSimpleFunctions() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/simpleFunctions.kt");
+        }
+
+        @Test
+        @TestMetadata("throwsAnnotation.kt")
+        public void testThrowsAnnotation() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.kt");
+        }
+
+        @Test
+        @TestMetadata("wildcardOptimization.kt")
+        public void testWildcardOptimization() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.kt");
+        }
+    }
 }
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/coroutines.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/coroutines.java
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/coroutines.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/coroutines.java
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/coroutines.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/coroutines.kt
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/coroutines.kt
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/coroutines.kt
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/importAliases.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/importAliases.java
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/importAliases.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/importAliases.java
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/importAliases.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/importAliases.kt
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/importAliases.kt
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/importAliases.kt
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/inlineOnly.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.fir.java
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/inlineOnly.fir.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.fir.java
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/inlineOnly.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.java
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/inlineOnly.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.java
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/inlineOnly.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.kt
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/inlineOnly.kt
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.kt
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/jvmField.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmField.fir.java
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/jvmField.fir.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmField.fir.java
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/jvmField.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmField.java
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/jvmField.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmField.java
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/jvmField.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmField.kt
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/jvmField.kt
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmField.kt
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/jvmName.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmName.java
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/jvmName.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmName.java
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/jvmName.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmName.kt
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/jvmName.kt
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmName.kt
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/jvmWildcardAnnotations.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.fir.java
similarity index 80%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/jvmWildcardAnnotations.fir.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.fir.java
index a969a31ed89..5387f77d861 100644
--- a/compiler/testData/asJava/lightClasses/ultraLightFacades/jvmWildcardAnnotations.fir.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.fir.java
@@ -1,3 +1,33 @@
+public final class Inv /* Inv*/<E>  {
+  public  Inv();//  .ctor()
+
+}
+
+public final class Out /* Out*/<T>  {
+  public  Out();//  .ctor()
+
+}
+
+public final class OutPair /* OutPair*/<Final, Y>  {
+  public  OutPair();//  .ctor()
+
+}
+
+public final class In /* In*/<Z>  {
+  public  In();//  .ctor()
+
+}
+
+public final class Final /* Final*/ {
+  public  Final();//  .ctor()
+
+}
+
+public class Open /* Open*/ {
+  public  Open();//  .ctor()
+
+}
+
 public final class JvmWildcardAnnotationsKt /* JvmWildcardAnnotationsKt*/ {
   @kotlin.jvm.JvmSuppressWildcards(suppress = false)
   @org.jetbrains.annotations.NotNull()
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/jvmWildcardAnnotations.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.java
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/jvmWildcardAnnotations.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.java
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/jvmWildcardAnnotations.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.kt
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/jvmWildcardAnnotations.kt
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.kt
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/lateinitProperty.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/lateinitProperty.fir.java
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/lateinitProperty.fir.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/lateinitProperty.fir.java
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/lateinitProperty.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/lateinitProperty.java
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/lateinitProperty.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/lateinitProperty.java
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/lateinitProperty.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/lateinitProperty.kt
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/lateinitProperty.kt
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/lateinitProperty.kt
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacade.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.fir.java
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacade.fir.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.fir.java
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacade.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.java
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacade.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.java
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacade.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.kt
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacade.kt
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.kt
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacade.kt.1 b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.kt.1
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacade.kt.1
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.kt.1
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacade.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.lib.java
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacade.lib.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.lib.java
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacadeJvmName.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.fir.java
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacadeJvmName.fir.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.fir.java
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacadeJvmName.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.java
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacadeJvmName.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.java
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacadeJvmName.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.kt
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacadeJvmName.kt
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.kt
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacadeJvmName.kt.1 b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.kt.1
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacadeJvmName.kt.1
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.kt.1
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacadeJvmName.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.lib.java
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacadeJvmName.lib.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.lib.java
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/properties.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/properties.fir.java
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/properties.fir.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/properties.fir.java
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/properties.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/properties.java
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/properties.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/properties.java
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/properties.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/properties.kt
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/properties.kt
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/properties.kt
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/simpleFunctions.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/simpleFunctions.fir.java
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/simpleFunctions.fir.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/simpleFunctions.fir.java
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/simpleFunctions.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/simpleFunctions.java
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/simpleFunctions.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/simpleFunctions.java
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/simpleFunctions.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/simpleFunctions.kt
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/simpleFunctions.kt
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/simpleFunctions.kt
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/throwsAnnotation.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.fir.java
similarity index 81%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/throwsAnnotation.fir.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.fir.java
index 65c5f8ed677..8156ff8d200 100644
--- a/compiler/testData/asJava/lightClasses/ultraLightFacades/throwsAnnotation.fir.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.fir.java
@@ -1,3 +1,8 @@
+public final class MyException /* MyException*/ extends java.lang.Exception {
+  public  MyException();//  .ctor()
+
+}
+
 public final class ThrowsAnnotationKt /* ThrowsAnnotationKt*/ {
   @kotlin.jvm.Throws(exceptionClasses = {java.io.IOException.class, MyException.class})
   @org.jetbrains.annotations.NotNull()
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/throwsAnnotation.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.java
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/throwsAnnotation.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.java
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/throwsAnnotation.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.kt
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/throwsAnnotation.kt
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.kt
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/throwsAnnotation.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.lib.java
similarity index 74%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/throwsAnnotation.lib.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.lib.java
index 33f99af7c5e..d4e650e6874 100644
--- a/compiler/testData/asJava/lightClasses/ultraLightFacades/throwsAnnotation.lib.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.lib.java
@@ -1,3 +1,8 @@
+public final class MyException /* MyException*/ extends java.lang.Exception {
+  public  MyException();//  .ctor()
+
+}
+
 public final class ThrowsAnnotationKt /* ThrowsAnnotationKt*/ {
   @org.jetbrains.annotations.NotNull()
   public static final java.lang.String readFile(@org.jetbrains.annotations.NotNull() java.lang.String) throws java.io.IOException, MyException;//  readFile(java.lang.String)
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/wildcardOptimization.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.java
similarity index 92%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/wildcardOptimization.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.java
index cb47ab4a35a..c14d2141422 100644
--- a/compiler/testData/asJava/lightClasses/ultraLightFacades/wildcardOptimization.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.java
@@ -1,3 +1,33 @@
+public final class Inv /* Inv*/<E>  {
+  public  Inv();//  .ctor()
+
+}
+
+public final class Out /* Out*/<T>  {
+  public  Out();//  .ctor()
+
+}
+
+public final class OutPair /* OutPair*/<Final, Y>  {
+  public  OutPair();//  .ctor()
+
+}
+
+public final class In /* In*/<Z>  {
+  public  In();//  .ctor()
+
+}
+
+public final class Final /* Final*/ {
+  public  Final();//  .ctor()
+
+}
+
+public class Open /* Open*/ {
+  public  Open();//  .ctor()
+
+}
+
 public final class WildcardOptimizationKt /* WildcardOptimizationKt*/ {
   @org.jetbrains.annotations.NotNull()
   public static final In<Final> notDeepIn();//  notDeepIn()
@@ -74,4 +104,4 @@ public final class WildcardOptimizationKt /* WildcardOptimizationKt*/ {
 
   public static final void outOfArrayOutOpen(@org.jetbrains.annotations.NotNull() Out<? extends Open[]>);//  outOfArrayOutOpen(Out<? extends Open[]>)
 
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/wildcardOptimization.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.kt
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/wildcardOptimization.kt
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.kt
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.lib.java
new file mode 100644
index 00000000000..1e6efdda795
--- /dev/null
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.lib.java
@@ -0,0 +1,107 @@
+public final class Out /* Out*/<T>  {
+  public  Out();//  .ctor()
+
+}
+
+public class Open /* Open*/ {
+  public  Open();//  .ctor()
+
+}
+
+public final class OutPair /* OutPair*/<Final, Y>  {
+  public  OutPair();//  .ctor()
+
+}
+
+public final class In /* In*/<Z>  {
+  public  In();//  .ctor()
+
+}
+
+public final class WildcardOptimizationKt /* WildcardOptimizationKt*/ {
+  @org.jetbrains.annotations.NotNull()
+  public static final In<Final> notDeepIn();//  notDeepIn()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final Inv<? super Out<? extends Open>> skipWildcardsUntilInProjection();//  skipWildcardsUntilInProjection()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final Inv<In<Out<? extends Open>>> skipAllInvWildcards();//  skipAllInvWildcards()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final Inv<OutPair<Open, Out<Out<Open>>>> skipAllOutInvWildcards();//  skipAllOutInvWildcards()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final Out<In<Out<? extends Open>>> skipWildcardsUntilIn0();//  skipWildcardsUntilIn0()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final Out<In<Out<Final>>> skipWildcardsUntilIn1();//  skipWildcardsUntilIn1()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final Out<In<OutPair<Final, ? extends Out<? extends Open>>>> skipWildcardsUntilIn2();//  skipWildcardsUntilIn2()
+
+  public static final <Q extends Final> void typeParameter(@org.jetbrains.annotations.NotNull() Out<? extends Q>, @org.jetbrains.annotations.NotNull() In<? super Q>);// <Q extends Final>  typeParameter(Out<? extends Q>, In<? super Q>)
+
+  public static final void arrayOfOutFinal(@org.jetbrains.annotations.NotNull() Out<Final>[]);//  arrayOfOutFinal(Out<Final>[])
+
+  public static final void arrayOfOutOpen(@org.jetbrains.annotations.NotNull() Out<Open>[]);//  arrayOfOutOpen(Out<Open>[])
+
+  public static final void deepFinal(@org.jetbrains.annotations.NotNull() Out<Out<Out<Final>>>);//  deepFinal(Out<Out<Out<Final>>>)
+
+  public static final void deepOpen(@org.jetbrains.annotations.NotNull() Out<? extends Out<? extends Out<? extends Open>>>);//  deepOpen(Out<? extends Out<? extends Out<? extends Open>>>)
+
+  public static final void finalClassArgument(@org.jetbrains.annotations.NotNull() Out<Final>, @org.jetbrains.annotations.NotNull() In<? super Final>);//  finalClassArgument(Out<Final>, In<? super Final>)
+
+  public static final void inAny(@org.jetbrains.annotations.NotNull() In<java.lang.Object>);//  inAny(In<java.lang.Object>)
+
+  public static final void inFinal(@org.jetbrains.annotations.NotNull() In<? super Final>);//  inFinal(In<? super Final>)
+
+  public static final void inOutFinal(@org.jetbrains.annotations.NotNull() In<? super Out<Final>>);//  inOutFinal(In<? super Out<Final>>)
+
+  public static final void invFinal(@org.jetbrains.annotations.NotNull() Inv<Final>);//  invFinal(Inv<Final>)
+
+  public static final void invIn(@org.jetbrains.annotations.NotNull() Out<? extends Inv<? super Final>>);//  invIn(Out<? extends Inv<? super Final>>)
+
+  public static final void invInAny(@org.jetbrains.annotations.NotNull() Out<Inv<? super java.lang.Object>>);//  invInAny(Out<Inv<? super java.lang.Object>>)
+
+  public static final void invInOutFinal(@org.jetbrains.annotations.NotNull() Inv<In<Out<Final>>>);//  invInOutFinal(Inv<In<Out<Final>>>)
+
+  public static final void invInOutOpen(@org.jetbrains.annotations.NotNull() Inv<In<Out<? extends Open>>>);//  invInOutOpen(Inv<In<Out<? extends Open>>>)
+
+  public static final void invInv(@org.jetbrains.annotations.NotNull() Out<Inv<Open>>);//  invInv(Out<Inv<Open>>)
+
+  public static final void invOpen(@org.jetbrains.annotations.NotNull() Inv<Open>);//  invOpen(Inv<Open>)
+
+  public static final void invOut(@org.jetbrains.annotations.NotNull() Out<? extends Inv<? extends Open>>);//  invOut(Out<? extends Inv<? extends Open>>)
+
+  public static final void invOutFinal(@org.jetbrains.annotations.NotNull() Inv<Out<Final>>);//  invOutFinal(Inv<Out<Final>>)
+
+  public static final void invOutFinal(@org.jetbrains.annotations.NotNull() Out<Inv<? extends Final>>);//  invOutFinal(Out<Inv<? extends Final>>)
+
+  public static final void invOutOpen(@org.jetbrains.annotations.NotNull() Inv<Out<Open>>);//  invOutOpen(Inv<Out<Open>>)
+
+  public static final void invOutProjectedOutFinal(@org.jetbrains.annotations.NotNull() Inv<? extends Out<Final>>);//  invOutProjectedOutFinal(Inv<? extends Out<Final>>)
+
+  public static final void oneArgumentFinal(@org.jetbrains.annotations.NotNull() OutPair<Final, ? extends Open>);//  oneArgumentFinal(OutPair<Final, ? extends Open>)
+
+  public static final void openClassArgument(@org.jetbrains.annotations.NotNull() Out<? extends Open>, @org.jetbrains.annotations.NotNull() In<? super Open>);//  openClassArgument(Out<? extends Open>, In<? super Open>)
+
+  public static final void outIn(@org.jetbrains.annotations.NotNull() Out<? extends In<? super Final>>);//  outIn(Out<? extends In<? super Final>>)
+
+  public static final void outInAny(@org.jetbrains.annotations.NotNull() Out<In<java.lang.Object>>);//  outInAny(Out<In<java.lang.Object>>)
+
+  public static final void outOfArrayOpen(@org.jetbrains.annotations.NotNull() Out<Open[]>);//  outOfArrayOpen(Out<Open[]>)
+
+  public static final void outOfArrayOutOpen(@org.jetbrains.annotations.NotNull() Out<? extends Open[]>);//  outOfArrayOutOpen(Out<? extends Open[]>)
+
+}
+
+public final class Inv /* Inv*/<E>  {
+  public  Inv();//  .ctor()
+
+}
+
+public final class Final /* Final*/ {
+  public  Final();//  .ctor()
+
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/script.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/script.java
new file mode 100644
index 00000000000..1e1bc72eb77
--- /dev/null
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/script.java
@@ -0,0 +1 @@
+// NOT_GENERATED
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/script.kts b/compiler/testData/asJava/lightClasses/lightClassByPsi/script.kts
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ultraLightFacades/script.kts
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/script.kts
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/script.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/script.lib.java
new file mode 100644
index 00000000000..2cd0bfff169
--- /dev/null
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/script.lib.java
@@ -0,0 +1,6 @@
+public final class Script /* Script*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
+  public  Script(@org.jetbrains.annotations.NotNull() java.lang.String[]);//  .ctor(java.lang.String[])
+
+  public static final void main(@org.jetbrains.annotations.NotNull() java.lang.String[]);//  main(java.lang.String[])
+
+}
diff --git a/compiler/testData/asJava/lightClasses/ultraLightFacades/script.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/script.java
deleted file mode 100644
index ff225862b52..00000000000
--- a/compiler/testData/asJava/lightClasses/ultraLightFacades/script.java
+++ /dev/null
@@ -1 +0,0 @@
-// NOT_GENERATED
\ No newline at end of file
diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/lightClasses.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/lightClasses.kt
index ec29b05418a..ec7bf1c3c3c 100644
--- a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/lightClasses.kt
+++ b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/lightClasses.kt
@@ -56,16 +56,6 @@ internal fun TestGroupSuite.generateSymbolLightClassesTests() {
                 model("asJava/lightClasses/lightClassByPsi", pattern = TestGeneratorUtil.KT_OR_KTS)
             }
         }
-
-        run {
-            testClass<AbstractSymbolLightClassesFacadeForSourceTest> {
-                model("asJava/lightClasses/ultraLightFacades", pattern = TestGeneratorUtil.KT_OR_KTS)
-            }
-
-            testClass<AbstractSymbolLightClassesFacadeForLibraryTest> {
-                model("asJava/lightClasses/ultraLightFacades", pattern = TestGeneratorUtil.KT_OR_KTS)
-            }
-        }
     }
 
     testGroup(