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 f8007ac8dc5..2c28343d7f6 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
@@ -26,7 +26,7 @@ abstract class AbstractSymbolLightClassesLoadingTest(
         val lightClasses = ktFiles.flatMap { getLightClassesFromFile(it) }
         if (lightClasses.isEmpty()) return LightClassTestCommon.NOT_GENERATED_DIRECTIVE
         return withExtendedTypeRenderer(testDataFile) {
-            lightClasses.joinToString("\n\n") { it.renderClass() }
+            lightClasses.sortedBy { it.name }.joinToString("\n\n") { it.renderClass() }
         }
     }
 
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.fir.java
index 12332b959f6..ad803c04695 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.fir.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.fir.java
@@ -1,43 +1,3 @@
-public final class KotlinClass /* KotlinClass*/ {
-  @kotlin.jvm.JvmStatic()
-  public static Custom companionLateinitStaticVariable;
-
-  @org.jetbrains.annotations.NotNull()
-  public static final KotlinClass.Companion Companion;
-
-  public Custom classLateinitVariable;
-
-  public static Custom companionLateinitVariable;
-
-  @org.jetbrains.annotations.NotNull()
-  public final Custom getClassLateinitVariable();//  getClassLateinitVariable()
-
-  @org.jetbrains.annotations.NotNull()
-  public static final Custom getCompanionLateinitStaticVariable();//  getCompanionLateinitStaticVariable()
-
-  public  KotlinClass();//  .ctor()
-
-  public final void setClassLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);//  setClassLateinitVariable(Custom)
-
-  public static final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);//  setCompanionLateinitStaticVariable(Custom)
-
-  class Companion ...
-}
-
-public static final class Companion /* KotlinClass.Companion*/ {
-  @org.jetbrains.annotations.NotNull()
-  public final Custom getCompanionLateinitStaticVariable();//  getCompanionLateinitStaticVariable()
-
-  @org.jetbrains.annotations.NotNull()
-  public final Custom getCompanionLateinitVariable();//  getCompanionLateinitVariable()
-
-  private  Companion();//  .ctor()
-
-  public final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);//  setCompanionLateinitStaticVariable(Custom)
-
-  public final void setCompanionLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);//  setCompanionLateinitVariable(Custom)
-}
-
 public abstract class AbstractKotlinClass /* AbstractKotlinClass*/ {
   @kotlin.jvm.JvmStatic()
   public static Custom companionLateinitStaticVariable;
@@ -64,6 +24,20 @@ public abstract class AbstractKotlinClass /* AbstractKotlinClass*/ {
   class Companion ...
 }
 
+public static final class Companion /* KotlinClass.Companion*/ {
+  @org.jetbrains.annotations.NotNull()
+  public final Custom getCompanionLateinitStaticVariable();//  getCompanionLateinitStaticVariable()
+
+  @org.jetbrains.annotations.NotNull()
+  public final Custom getCompanionLateinitVariable();//  getCompanionLateinitVariable()
+
+  private  Companion();//  .ctor()
+
+  public final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);//  setCompanionLateinitStaticVariable(Custom)
+
+  public final void setCompanionLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);//  setCompanionLateinitVariable(Custom)
+}
+
 public static final class Companion /* AbstractKotlinClass.Companion*/ {
   @org.jetbrains.annotations.NotNull()
   public final Custom getCompanionLateinitStaticVariable();//  getCompanionLateinitStaticVariable()
@@ -82,6 +56,32 @@ public final class Custom /* Custom*/ {
   public  Custom();//  .ctor()
 }
 
+public final class KotlinClass /* KotlinClass*/ {
+  @kotlin.jvm.JvmStatic()
+  public static Custom companionLateinitStaticVariable;
+
+  @org.jetbrains.annotations.NotNull()
+  public static final KotlinClass.Companion Companion;
+
+  public Custom classLateinitVariable;
+
+  public static Custom companionLateinitVariable;
+
+  @org.jetbrains.annotations.NotNull()
+  public final Custom getClassLateinitVariable();//  getClassLateinitVariable()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final Custom getCompanionLateinitStaticVariable();//  getCompanionLateinitStaticVariable()
+
+  public  KotlinClass();//  .ctor()
+
+  public final void setClassLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);//  setClassLateinitVariable(Custom)
+
+  public static final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);//  setCompanionLateinitStaticVariable(Custom)
+
+  class Companion ...
+}
+
 public final class LateinitPropertiesKt /* LateinitPropertiesKt*/ {
   public static Custom topLevelLateinit;
 
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.java
index 8b17df3f71b..dfdd6c8b239 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.java
@@ -1,42 +1,3 @@
-public final class KotlinClass /* KotlinClass*/ {
-  @org.jetbrains.annotations.NotNull()
-  public static final KotlinClass.Companion Companion;
-
-  public Custom classLateinitVariable;
-
-  public static Custom companionLateinitStaticVariable;
-
-  public static Custom companionLateinitVariable;
-
-  @org.jetbrains.annotations.NotNull()
-  public final Custom getClassLateinitVariable();//  getClassLateinitVariable()
-
-  @org.jetbrains.annotations.NotNull()
-  public static final Custom getCompanionLateinitStaticVariable();//  getCompanionLateinitStaticVariable()
-
-  public  KotlinClass();//  .ctor()
-
-  public final void setClassLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);//  setClassLateinitVariable(Custom)
-
-  public static final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);//  setCompanionLateinitStaticVariable(Custom)
-
-  class Companion ...
-}
-
-public static final class Companion /* KotlinClass.Companion*/ {
-  @org.jetbrains.annotations.NotNull()
-  public final Custom getCompanionLateinitStaticVariable();//  getCompanionLateinitStaticVariable()
-
-  @org.jetbrains.annotations.NotNull()
-  public final Custom getCompanionLateinitVariable();//  getCompanionLateinitVariable()
-
-  private  Companion();//  .ctor()
-
-  public final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);//  setCompanionLateinitStaticVariable(Custom)
-
-  public final void setCompanionLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);//  setCompanionLateinitVariable(Custom)
-}
-
 public abstract class AbstractKotlinClass /* AbstractKotlinClass*/ {
   @org.jetbrains.annotations.NotNull()
   public static final AbstractKotlinClass.Companion Companion;
@@ -62,6 +23,20 @@ public abstract class AbstractKotlinClass /* AbstractKotlinClass*/ {
   class Companion ...
 }
 
+public static final class Companion /* KotlinClass.Companion*/ {
+  @org.jetbrains.annotations.NotNull()
+  public final Custom getCompanionLateinitStaticVariable();//  getCompanionLateinitStaticVariable()
+
+  @org.jetbrains.annotations.NotNull()
+  public final Custom getCompanionLateinitVariable();//  getCompanionLateinitVariable()
+
+  private  Companion();//  .ctor()
+
+  public final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);//  setCompanionLateinitStaticVariable(Custom)
+
+  public final void setCompanionLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);//  setCompanionLateinitVariable(Custom)
+}
+
 public static final class Companion /* AbstractKotlinClass.Companion*/ {
   @org.jetbrains.annotations.NotNull()
   public final Custom getCompanionLateinitStaticVariable();//  getCompanionLateinitStaticVariable()
@@ -80,6 +55,31 @@ public final class Custom /* Custom*/ {
   public  Custom();//  .ctor()
 }
 
+public final class KotlinClass /* KotlinClass*/ {
+  @org.jetbrains.annotations.NotNull()
+  public static final KotlinClass.Companion Companion;
+
+  public Custom classLateinitVariable;
+
+  public static Custom companionLateinitStaticVariable;
+
+  public static Custom companionLateinitVariable;
+
+  @org.jetbrains.annotations.NotNull()
+  public final Custom getClassLateinitVariable();//  getClassLateinitVariable()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final Custom getCompanionLateinitStaticVariable();//  getCompanionLateinitStaticVariable()
+
+  public  KotlinClass();//  .ctor()
+
+  public final void setClassLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);//  setClassLateinitVariable(Custom)
+
+  public static final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);//  setCompanionLateinitStaticVariable(Custom)
+
+  class Companion ...
+}
+
 public final class LateinitPropertiesKt /* LateinitPropertiesKt*/ {
   public static Custom topLevelLateinit;
 
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.lib.java
deleted file mode 100644
index 6bbf374709c..00000000000
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.lib.java
+++ /dev/null
@@ -1,90 +0,0 @@
-public final class KotlinClass /* KotlinClass*/ {
-  @org.jetbrains.annotations.NotNull()
-  public static final KotlinClass.Companion Companion;
-
-  public Custom classLateinitVariable;
-
-  public static Custom companionLateinitStaticVariable;
-
-  public static Custom companionLateinitVariable;
-
-  @org.jetbrains.annotations.NotNull()
-  public final Custom getClassLateinitVariable();//  getClassLateinitVariable()
-
-  @org.jetbrains.annotations.NotNull()
-  public static final Custom getCompanionLateinitStaticVariable();//  getCompanionLateinitStaticVariable()
-
-  public  KotlinClass();//  .ctor()
-
-  public final void setClassLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);//  setClassLateinitVariable(Custom)
-
-  public static final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);//  setCompanionLateinitStaticVariable(Custom)
-
-  class Companion ...
-}
-
-public static final class Companion /* KotlinClass.Companion*/ {
-  @org.jetbrains.annotations.NotNull()
-  public final Custom getCompanionLateinitStaticVariable();//  getCompanionLateinitStaticVariable()
-
-  @org.jetbrains.annotations.NotNull()
-  public final Custom getCompanionLateinitVariable();//  getCompanionLateinitVariable()
-
-  private  Companion();//  .ctor()
-
-  public final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);//  setCompanionLateinitStaticVariable(Custom)
-
-  public final void setCompanionLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);//  setCompanionLateinitVariable(Custom)
-}
-
-public final class Custom /* Custom*/ {
-  public  Custom();//  .ctor()
-}
-
-public final class LateinitPropertiesKt /* LateinitPropertiesKt*/ {
-  public static Custom topLevelLateinit;
-
-  @org.jetbrains.annotations.NotNull()
-  public static final Custom getTopLevelLateinit();//  getTopLevelLateinit()
-
-  public static final void setTopLevelLateinit(@org.jetbrains.annotations.NotNull() Custom);//  setTopLevelLateinit(Custom)
-}
-
-public abstract class AbstractKotlinClass /* AbstractKotlinClass*/ {
-  @org.jetbrains.annotations.NotNull()
-  public static final AbstractKotlinClass.Companion Companion;
-
-  public Custom classLateinitVariable;
-
-  public static Custom companionLateinitStaticVariable;
-
-  public static Custom companionLateinitVariable;
-
-  @org.jetbrains.annotations.NotNull()
-  public final Custom getClassLateinitVariable();//  getClassLateinitVariable()
-
-  @org.jetbrains.annotations.NotNull()
-  public static final Custom getCompanionLateinitStaticVariable();//  getCompanionLateinitStaticVariable()
-
-  public  AbstractKotlinClass();//  .ctor()
-
-  public final void setClassLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);//  setClassLateinitVariable(Custom)
-
-  public static final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);//  setCompanionLateinitStaticVariable(Custom)
-
-  class Companion ...
-}
-
-public static final class Companion /* AbstractKotlinClass.Companion*/ {
-  @org.jetbrains.annotations.NotNull()
-  public final Custom getCompanionLateinitStaticVariable();//  getCompanionLateinitStaticVariable()
-
-  @org.jetbrains.annotations.NotNull()
-  public final Custom getCompanionLateinitVariable();//  getCompanionLateinitVariable()
-
-  private  Companion();//  .ctor()
-
-  public final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);//  setCompanionLateinitStaticVariable(Custom)
-
-  public final void setCompanionLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);//  setCompanionLateinitVariable(Custom)
-}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.fir.java
index deaa71ea82a..efa1ddda82d 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.fir.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.fir.java
@@ -1,3 +1,17 @@
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Ann /* Ann*/ {
+  public abstract java.lang.Class<? extends java.lang.Object> arg2();//  arg2()
+
+  public abstract java.lang.Class<?> arg1();//  arg1()
+}
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Anno /* Anno*/ {
+  public abstract Anno[] x() default {Anno(p = "a"), Anno(p = "b")};//  x()
+
+  public abstract java.lang.String p() default "";//  p()
+}
+
 @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
 @java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER})
 @kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.VALUE_PARAMETER, kotlin.annotation.AnnotationTarget.EXPRESSION})
@@ -39,38 +53,39 @@ public abstract @interface AnnoWithCompanion /* AnnoWithCompanion*/ {
   class Companion ...
 }
 
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface AnnotatedAttribute /* AnnotatedAttribute*/ {
+  @Anno()
+  public abstract java.lang.String x();//  x()
+}
+
 public static final class Companion /* AnnoWithCompanion.Companion*/ {
   private  Companion();//  .ctor()
 
   public final void foo();//  foo()
 }
 
-@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
-public abstract @interface Anno /* Anno*/ {
-  public abstract Anno[] x() default {Anno(p = "a"), Anno(p = "b")};//  x()
-
-  public abstract java.lang.String p() default "";//  p()
-}
-
-@Deprecated(message = "This anno is deprecated, use === instead", replaceWith = @ReplaceWith(expression = "this === other"))
-@java.lang.annotation.Documented()
-@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.SOURCE)
-@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER})
-@kotlin.annotation.MustBeDocumented()
-@kotlin.annotation.Retention(value = kotlin.annotation.AnnotationRetention.SOURCE)
-@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.VALUE_PARAMETER, kotlin.annotation.AnnotationTarget.EXPRESSION})
-public abstract @interface Fancy /* Fancy*/ {
-}
-
-@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
-public abstract @interface ReplaceWith /* ReplaceWith*/ {
-  public abstract java.lang.String expression();//  expression()
-}
-
-@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
-public abstract @interface AnnotatedAttribute /* AnnotatedAttribute*/ {
+public final class CtorAnnotations /* CtorAnnotations*/ {
   @Anno()
-  public abstract java.lang.String x();//  x()
+  @org.jetbrains.annotations.NotNull()
+  private final java.lang.String x;
+
+  @org.jetbrains.annotations.NotNull()
+  private final java.lang.String y;
+
+  @org.jetbrains.annotations.NotNull()
+  private final java.lang.String z;
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getX();//  getX()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getY();//  getY()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getZ();//  getZ()
+
+  public  CtorAnnotations(@Anno() @org.jetbrains.annotations.NotNull() java.lang.String, @Anno() @org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String, java.lang.String, java.lang.String)
 }
 
 @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@@ -80,52 +95,6 @@ public abstract @interface Deprecated /* Deprecated*/ {
   public abstract java.lang.String message();//  message()
 }
 
-@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
-public abstract @interface Ann /* Ann*/ {
-  public abstract java.lang.Class<? extends java.lang.Object> arg2();//  arg2()
-
-  public abstract java.lang.Class<?> arg1();//  arg1()
-}
-
-@Anno()
-public final class F /* F*/ implements java.lang.Runnable {
-  @Anno(p = "p")
-  @org.jetbrains.annotations.NotNull()
-  private java.lang.String prop = "x" /* initializer type: java.lang.String */;
-
-  @Anno(p = "f")
-  public final void f(@Anno() @org.jetbrains.annotations.NotNull() java.lang.String);//  f(java.lang.String)
-
-  @org.jetbrains.annotations.NotNull()
-  public final java.lang.String getProp();//  getProp()
-
-  public  F();//  .ctor()
-
-  public final void setProp(@org.jetbrains.annotations.NotNull() java.lang.String);//  setProp(java.lang.String)
-}
-
-public final class Foo /* Foo*/ {
-  @org.jetbrains.annotations.Nullable()
-  private java.lang.String x = null /* initializer type: null */;
-
-  @Anno()
-  public  Foo(error.NonExistentClass);//  .ctor(error.NonExistentClass)
-
-  @Anno()
-  public final void f4(@org.jetbrains.annotations.NotNull() java.lang.String);//  f4(java.lang.String)
-
-  @Anno()
-  public final void setX(@org.jetbrains.annotations.Nullable() java.lang.String);//  setX(java.lang.String)
-
-  @org.jetbrains.annotations.Nullable()
-  public final java.lang.String getX();//  getX()
-}
-
-@Ann(arg1 = java.lang.String.class, arg2 = int.class)
-public final class MyClass /* MyClass*/ {
-  public  MyClass();//  .ctor()
-}
-
 public final class Example /* Example*/ {
   @Ann()
   @org.jetbrains.annotations.NotNull()
@@ -150,25 +119,56 @@ public final class Example /* Example*/ {
   public  Example(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String, @Ann() @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String, java.lang.String, java.lang.String)
 }
 
-public final class CtorAnnotations /* CtorAnnotations*/ {
-  @Anno()
+@Anno()
+public final class F /* F*/ implements java.lang.Runnable {
+  @Anno(p = "p")
   @org.jetbrains.annotations.NotNull()
-  private final java.lang.String x;
+  private java.lang.String prop = "x" /* initializer type: java.lang.String */;
+
+  @Anno(p = "f")
+  public final void f(@Anno() @org.jetbrains.annotations.NotNull() java.lang.String);//  f(java.lang.String)
 
   @org.jetbrains.annotations.NotNull()
-  private final java.lang.String y;
+  public final java.lang.String getProp();//  getProp()
 
-  @org.jetbrains.annotations.NotNull()
-  private final java.lang.String z;
+  public  F();//  .ctor()
 
-  @org.jetbrains.annotations.NotNull()
-  public final java.lang.String getX();//  getX()
-
-  @org.jetbrains.annotations.NotNull()
-  public final java.lang.String getY();//  getY()
-
-  @org.jetbrains.annotations.NotNull()
-  public final java.lang.String getZ();//  getZ()
-
-  public  CtorAnnotations(@Anno() @org.jetbrains.annotations.NotNull() java.lang.String, @Anno() @org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String, java.lang.String, java.lang.String)
+  public final void setProp(@org.jetbrains.annotations.NotNull() java.lang.String);//  setProp(java.lang.String)
+}
+
+@Deprecated(message = "This anno is deprecated, use === instead", replaceWith = @ReplaceWith(expression = "this === other"))
+@java.lang.annotation.Documented()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.SOURCE)
+@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER})
+@kotlin.annotation.MustBeDocumented()
+@kotlin.annotation.Retention(value = kotlin.annotation.AnnotationRetention.SOURCE)
+@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.VALUE_PARAMETER, kotlin.annotation.AnnotationTarget.EXPRESSION})
+public abstract @interface Fancy /* Fancy*/ {
+}
+
+public final class Foo /* Foo*/ {
+  @org.jetbrains.annotations.Nullable()
+  private java.lang.String x = null /* initializer type: null */;
+
+  @Anno()
+  public  Foo(error.NonExistentClass);//  .ctor(error.NonExistentClass)
+
+  @Anno()
+  public final void f4(@org.jetbrains.annotations.NotNull() java.lang.String);//  f4(java.lang.String)
+
+  @Anno()
+  public final void setX(@org.jetbrains.annotations.Nullable() java.lang.String);//  setX(java.lang.String)
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String getX();//  getX()
+}
+
+@Ann(arg1 = java.lang.String.class, arg2 = int.class)
+public final class MyClass /* MyClass*/ {
+  public  MyClass();//  .ctor()
+}
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface ReplaceWith /* ReplaceWith*/ {
+  public abstract java.lang.String expression();//  expression()
 }
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.java
index 759ed05a625..5d7c7f0ea55 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.java
@@ -1,3 +1,17 @@
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Ann /* Ann*/ {
+  public abstract java.lang.Class<? extends java.lang.Object> arg2();//  arg2()
+
+  public abstract java.lang.Class<?> arg1();//  arg1()
+}
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Anno /* Anno*/ {
+  public abstract Anno[] x() default {@Anno(p = "a"), @Anno(p = "b")};//  x()
+
+  public abstract java.lang.String p() default "";//  p()
+}
+
 @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
 @java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER})
 @kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.VALUE_PARAMETER, kotlin.annotation.AnnotationTarget.EXPRESSION})
@@ -39,38 +53,38 @@ public abstract @interface AnnoWithCompanion /* AnnoWithCompanion*/ {
   class Companion ...
 }
 
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface AnnotatedAttribute /* AnnotatedAttribute*/ {
+  @Anno()
+  public abstract java.lang.String x();//  x()
+}
+
 public static final class Companion /* AnnoWithCompanion.Companion*/ {
   private  Companion();//  .ctor()
 
   public final void foo();//  foo()
 }
 
-@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
-public abstract @interface Anno /* Anno*/ {
-  public abstract Anno[] x() default {@Anno(p = "a"), @Anno(p = "b")};//  x()
+public final class CtorAnnotations /* CtorAnnotations*/ {
+  @org.jetbrains.annotations.NotNull()
+  private final java.lang.String x;
 
-  public abstract java.lang.String p() default "";//  p()
-}
+  @org.jetbrains.annotations.NotNull()
+  private final java.lang.String y;
 
-@Deprecated(message = "This anno is deprecated, use === instead", replaceWith = @ReplaceWith(expression = "this === other"))
-@java.lang.annotation.Documented()
-@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.SOURCE)
-@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER})
-@kotlin.annotation.MustBeDocumented()
-@kotlin.annotation.Retention(value = kotlin.annotation.AnnotationRetention.SOURCE)
-@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.VALUE_PARAMETER, kotlin.annotation.AnnotationTarget.EXPRESSION})
-public abstract @interface Fancy /* Fancy*/ {
-}
+  @org.jetbrains.annotations.NotNull()
+  private final java.lang.String z;
 
-@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
-public abstract @interface ReplaceWith /* ReplaceWith*/ {
-  public abstract java.lang.String expression();//  expression()
-}
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getX();//  getX()
 
-@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
-public abstract @interface AnnotatedAttribute /* AnnotatedAttribute*/ {
-  @Anno()
-  public abstract java.lang.String x();//  x()
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getY();//  getY()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getZ();//  getZ()
+
+  public  CtorAnnotations(@Anno() @org.jetbrains.annotations.NotNull() java.lang.String, @Anno() @org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String, java.lang.String, java.lang.String)
 }
 
 @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@@ -80,51 +94,6 @@ public abstract @interface Deprecated /* Deprecated*/ {
   public abstract java.lang.String message();//  message()
 }
 
-@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
-public abstract @interface Ann /* Ann*/ {
-  public abstract java.lang.Class<? extends java.lang.Object> arg2();//  arg2()
-
-  public abstract java.lang.Class<?> arg1();//  arg1()
-}
-
-@Anno()
-public final class F /* F*/ implements java.lang.Runnable {
-  @org.jetbrains.annotations.NotNull()
-  private java.lang.String prop;
-
-  @Anno(p = "f")
-  public final void f(@Anno() @org.jetbrains.annotations.NotNull() java.lang.String);//  f(java.lang.String)
-
-  @org.jetbrains.annotations.NotNull()
-  public final java.lang.String getProp();//  getProp()
-
-  public  F();//  .ctor()
-
-  public final void setProp(@org.jetbrains.annotations.NotNull() java.lang.String);//  setProp(java.lang.String)
-}
-
-public final class Foo /* Foo*/ {
-  @org.jetbrains.annotations.Nullable()
-  private java.lang.String x;
-
-  @Anno()
-  public  Foo(error.NonExistentClass);//  .ctor(error.NonExistentClass)
-
-  @Anno()
-  public final void f4(@org.jetbrains.annotations.NotNull() java.lang.String);//  f4(java.lang.String)
-
-  @Anno()
-  public final void setX(@org.jetbrains.annotations.Nullable() java.lang.String);//  setX(java.lang.String)
-
-  @org.jetbrains.annotations.Nullable()
-  public final java.lang.String getX();//  getX()
-}
-
-@Ann(arg1 = kotlin.String.class, arg2 = kotlin.Int.class)
-public final class MyClass /* MyClass*/ {
-  public  MyClass();//  .ctor()
-}
-
 public final class Example /* Example*/ {
   @Ann()
   @org.jetbrains.annotations.NotNull()
@@ -149,24 +118,55 @@ public final class Example /* Example*/ {
   public  Example(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String, @Ann() @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String, java.lang.String, java.lang.String)
 }
 
-public final class CtorAnnotations /* CtorAnnotations*/ {
+@Anno()
+public final class F /* F*/ implements java.lang.Runnable {
   @org.jetbrains.annotations.NotNull()
-  private final java.lang.String x;
+  private java.lang.String prop;
+
+  @Anno(p = "f")
+  public final void f(@Anno() @org.jetbrains.annotations.NotNull() java.lang.String);//  f(java.lang.String)
 
   @org.jetbrains.annotations.NotNull()
-  private final java.lang.String y;
+  public final java.lang.String getProp();//  getProp()
 
-  @org.jetbrains.annotations.NotNull()
-  private final java.lang.String z;
+  public  F();//  .ctor()
 
-  @org.jetbrains.annotations.NotNull()
-  public final java.lang.String getX();//  getX()
-
-  @org.jetbrains.annotations.NotNull()
-  public final java.lang.String getY();//  getY()
-
-  @org.jetbrains.annotations.NotNull()
-  public final java.lang.String getZ();//  getZ()
-
-  public  CtorAnnotations(@Anno() @org.jetbrains.annotations.NotNull() java.lang.String, @Anno() @org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String, java.lang.String, java.lang.String)
+  public final void setProp(@org.jetbrains.annotations.NotNull() java.lang.String);//  setProp(java.lang.String)
+}
+
+@Deprecated(message = "This anno is deprecated, use === instead", replaceWith = @ReplaceWith(expression = "this === other"))
+@java.lang.annotation.Documented()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.SOURCE)
+@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER})
+@kotlin.annotation.MustBeDocumented()
+@kotlin.annotation.Retention(value = kotlin.annotation.AnnotationRetention.SOURCE)
+@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.VALUE_PARAMETER, kotlin.annotation.AnnotationTarget.EXPRESSION})
+public abstract @interface Fancy /* Fancy*/ {
+}
+
+public final class Foo /* Foo*/ {
+  @org.jetbrains.annotations.Nullable()
+  private java.lang.String x;
+
+  @Anno()
+  public  Foo(error.NonExistentClass);//  .ctor(error.NonExistentClass)
+
+  @Anno()
+  public final void f4(@org.jetbrains.annotations.NotNull() java.lang.String);//  f4(java.lang.String)
+
+  @Anno()
+  public final void setX(@org.jetbrains.annotations.Nullable() java.lang.String);//  setX(java.lang.String)
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String getX();//  getX()
+}
+
+@Ann(arg1 = kotlin.String.class, arg2 = kotlin.Int.class)
+public final class MyClass /* MyClass*/ {
+  public  MyClass();//  .ctor()
+}
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface ReplaceWith /* ReplaceWith*/ {
+  public abstract java.lang.String expression();//  expression()
 }
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.java
index 3ff01425b94..6cadf18fb66 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.java
@@ -1,3 +1,7 @@
+public static final class Nested /* pkg.Season.Nested*/ extends pkg.Season {
+  public  Nested();//  .ctor()
+}
+
 public class Open /* pkg.Open*/ {
   public  Open();//  .ctor()
 
@@ -8,6 +12,10 @@ public class Open /* pkg.Open*/ {
   class StaticInternal ...
 }
 
+public final class OuterInternal /* pkg.OuterInternal*/ {
+  public  OuterInternal();//  .ctor()
+}
+
 private static final class Private /* pkg.Open.Private*/ extends pkg.Open {
   public  Private();//  .ctor()
 }
@@ -16,28 +24,6 @@ protected final class Private2 /* pkg.Open.Private2*/ {
   public  Private2();//  .ctor()
 }
 
-public static final class StaticInternal /* pkg.Open.StaticInternal*/ {
-  public  StaticInternal();//  .ctor()
-}
-
-public final class OuterInternal /* pkg.OuterInternal*/ {
-  public  OuterInternal();//  .ctor()
-}
-
-final class TopLevelPrivate /* pkg.TopLevelPrivate*/ {
-  public  TopLevelPrivate();//  .ctor()
-}
-
-public abstract class Season /* pkg.Season*/ {
-  protected  Season();//  .ctor()
-
-  class Nested ...
-}
-
-public static final class Nested /* pkg.Season.Nested*/ extends pkg.Season {
-  public  Nested();//  .ctor()
-}
-
 public abstract class SealedWithArgs /* pkg.SealedWithArgs*/ {
   private final int a;
 
@@ -45,3 +31,17 @@ public abstract class SealedWithArgs /* pkg.SealedWithArgs*/ {
 
   public final int getA();//  getA()
 }
+
+public abstract class Season /* pkg.Season*/ {
+  protected  Season();//  .ctor()
+
+  class Nested ...
+}
+
+public static final class StaticInternal /* pkg.Open.StaticInternal*/ {
+  public  StaticInternal();//  .ctor()
+}
+
+final class TopLevelPrivate /* pkg.TopLevelPrivate*/ {
+  public  TopLevelPrivate();//  .ctor()
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.lib.java
index 47f3bbc2c45..986ee8f216d 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.lib.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.lib.java
@@ -1,9 +1,3 @@
-public abstract class Season /* pkg.Season*/ {
-  private  Season();//  .ctor()
-
-  class Nested ...
-}
-
 public static final class Nested /* pkg.Season.Nested*/ extends pkg.Season {
   public  Nested();//  .ctor()
 }
@@ -18,6 +12,10 @@ public class Open /* pkg.Open*/ {
   class StaticInternal ...
 }
 
+public final class OuterInternal /* pkg.OuterInternal*/ {
+  public  OuterInternal();//  .ctor()
+}
+
 private static final class Private /* pkg.Open.Private*/ extends pkg.Open {
   public  Private();//  .ctor()
 }
@@ -26,18 +24,6 @@ protected final class Private2 /* pkg.Open.Private2*/ {
   public  Private2();//  .ctor()
 }
 
-public static final class StaticInternal /* pkg.Open.StaticInternal*/ {
-  public  StaticInternal();//  .ctor()
-}
-
-final class TopLevelPrivate /* pkg.TopLevelPrivate*/ {
-  public  TopLevelPrivate();//  .ctor()
-}
-
-public final class OuterInternal /* pkg.OuterInternal*/ {
-  public  OuterInternal();//  .ctor()
-}
-
 public abstract class SealedWithArgs /* pkg.SealedWithArgs*/ {
   private final int a;
 
@@ -45,3 +31,17 @@ public abstract class SealedWithArgs /* pkg.SealedWithArgs*/ {
 
   public final int getA();//  getA()
 }
+
+public abstract class Season /* pkg.Season*/ {
+  private  Season();//  .ctor()
+
+  class Nested ...
+}
+
+public static final class StaticInternal /* pkg.Open.StaticInternal*/ {
+  public  StaticInternal();//  .ctor()
+}
+
+final class TopLevelPrivate /* pkg.TopLevelPrivate*/ {
+  public  TopLevelPrivate();//  .ctor()
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.fir.java
index 134352b0ef3..c9e3478c692 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.fir.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.fir.java
@@ -1,32 +1,3 @@
-public final class TestConstructor /* TestConstructor*/ {
-  private  TestConstructor(int);//  .ctor(int)
-}
-
-public final class AAA /* AAA*/ {
-  public /* vararg */  AAA(@org.jetbrains.annotations.NotNull() int..., @org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function0<kotlin.Unit>);//  .ctor(int[], kotlin.jvm.functions.Function0<kotlin.Unit>)
-}
-
-public final class B /* B*/ {
-}
-
-public final class Outer /* Outer*/ {
-  public  Outer();//  .ctor()
-
-  class Inner ...
-
-  class Nested ...
-}
-
-public final class Inner /* Outer.Inner*/ {
-  public  Inner(int, @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(int, java.lang.String)
-}
-
-public static final class Nested /* Outer.Nested*/ {
-  public  Nested();//  .ctor()
-
-  public  Nested(int, @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(int, java.lang.String)
-}
-
 public abstract class A /* A*/ {
   @org.jetbrains.annotations.Nullable()
   private final java.lang.String x = null /* initializer type: null */;
@@ -39,6 +10,13 @@ public abstract class A /* A*/ {
   class C ...
 }
 
+public final class AAA /* AAA*/ {
+  public /* vararg */  AAA(@org.jetbrains.annotations.NotNull() int..., @org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function0<kotlin.Unit>);//  .ctor(int[], kotlin.jvm.functions.Function0<kotlin.Unit>)
+}
+
+public final class B /* B*/ {
+}
+
 public static final class C /* A.C*/ extends A {
   public  C();//  .ctor()
 }
@@ -52,3 +30,25 @@ public final class ClassWithPrivateCtor /* ClassWithPrivateCtor*/ {
 
   private  ClassWithPrivateCtor(java.util.Set<java.lang.Integer>);//  .ctor(java.util.Set<java.lang.Integer>)
 }
+
+public final class Inner /* Outer.Inner*/ {
+  public  Inner(int, @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(int, java.lang.String)
+}
+
+public static final class Nested /* Outer.Nested*/ {
+  public  Nested();//  .ctor()
+
+  public  Nested(int, @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(int, java.lang.String)
+}
+
+public final class Outer /* Outer*/ {
+  public  Outer();//  .ctor()
+
+  class Inner ...
+
+  class Nested ...
+}
+
+public final class TestConstructor /* TestConstructor*/ {
+  private  TestConstructor(int);//  .ctor(int)
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.java
index c6ef745a847..899f12c351f 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.java
@@ -1,32 +1,3 @@
-public final class TestConstructor /* TestConstructor*/ {
-  private  TestConstructor(int);//  .ctor(int)
-}
-
-public final class AAA /* AAA*/ {
-  public  AAA(@org.jetbrains.annotations.NotNull() int[], @org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function0<kotlin.Unit>);//  .ctor(int[], kotlin.jvm.functions.Function0<kotlin.Unit>)
-}
-
-public final class B /* B*/ {
-}
-
-public final class Outer /* Outer*/ {
-  public  Outer();//  .ctor()
-
-  class Inner ...
-
-  class Nested ...
-}
-
-public final class Inner /* Outer.Inner*/ {
-  public  Inner(int, @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(int, java.lang.String)
-}
-
-public static final class Nested /* Outer.Nested*/ {
-  public  Nested();//  .ctor()
-
-  public  Nested(int, @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(int, java.lang.String)
-}
-
 public abstract class A /* A*/ {
   @org.jetbrains.annotations.Nullable()
   private final java.lang.String x;
@@ -39,6 +10,13 @@ public abstract class A /* A*/ {
   class C ...
 }
 
+public final class AAA /* AAA*/ {
+  public  AAA(@org.jetbrains.annotations.NotNull() int[], @org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function0<kotlin.Unit>);//  .ctor(int[], kotlin.jvm.functions.Function0<kotlin.Unit>)
+}
+
+public final class B /* B*/ {
+}
+
 public static final class C /* A.C*/ extends A {
   public  C();//  .ctor()
 }
@@ -52,3 +30,25 @@ public final class ClassWithPrivateCtor /* ClassWithPrivateCtor*/ {
 
   private  ClassWithPrivateCtor(java.util.Set<java.lang.Integer>);//  .ctor(java.util.Set<java.lang.Integer>)
 }
+
+public final class Inner /* Outer.Inner*/ {
+  public  Inner(int, @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(int, java.lang.String)
+}
+
+public static final class Nested /* Outer.Nested*/ {
+  public  Nested();//  .ctor()
+
+  public  Nested(int, @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(int, java.lang.String)
+}
+
+public final class Outer /* Outer*/ {
+  public  Outer();//  .ctor()
+
+  class Inner ...
+
+  class Nested ...
+}
+
+public final class TestConstructor /* TestConstructor*/ {
+  private  TestConstructor(int);//  .ctor(int)
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.lib.java
index 3892111d475..01012a19ccd 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.lib.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.lib.java
@@ -1,38 +1,3 @@
-public final class ClassWithPrivateCtor /* ClassWithPrivateCtor*/ {
-  @org.jetbrains.annotations.NotNull()
-  private final java.util.Set<java.lang.Integer> property;
-
-  @org.jetbrains.annotations.NotNull()
-  public final java.util.Set<java.lang.Integer> getProperty();//  getProperty()
-
-  private  ClassWithPrivateCtor(java.util.Set<java.lang.Integer>);//  .ctor(java.util.Set<java.lang.Integer>)
-}
-
-public final class B /* B*/ {
-}
-
-public final class AAA /* AAA*/ {
-  public  AAA(@org.jetbrains.annotations.NotNull() int[], @org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function0<kotlin.Unit>);//  .ctor(int[], kotlin.jvm.functions.Function0<kotlin.Unit>)
-}
-
-public final class Outer /* Outer*/ {
-  public  Outer();//  .ctor()
-
-  class Inner ...
-
-  class Nested ...
-}
-
-public final class Inner /* Outer.Inner*/ {
-  public  Inner(int, @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(int, java.lang.String)
-}
-
-public static final class Nested /* Outer.Nested*/ {
-  public  Nested();//  .ctor()
-
-  public  Nested(int, @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(int, java.lang.String)
-}
-
 public abstract class A /* A*/ {
   @org.jetbrains.annotations.Nullable()
   private final java.lang.String x;
@@ -45,10 +10,45 @@ public abstract class A /* A*/ {
   class C ...
 }
 
+public final class AAA /* AAA*/ {
+  public  AAA(@org.jetbrains.annotations.NotNull() int[], @org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function0<kotlin.Unit>);//  .ctor(int[], kotlin.jvm.functions.Function0<kotlin.Unit>)
+}
+
+public final class B /* B*/ {
+}
+
 public static final class C /* A.C*/ extends A {
   public  C();//  .ctor()
 }
 
+public final class ClassWithPrivateCtor /* ClassWithPrivateCtor*/ {
+  @org.jetbrains.annotations.NotNull()
+  private final java.util.Set<java.lang.Integer> property;
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.util.Set<java.lang.Integer> getProperty();//  getProperty()
+
+  private  ClassWithPrivateCtor(java.util.Set<java.lang.Integer>);//  .ctor(java.util.Set<java.lang.Integer>)
+}
+
+public final class Inner /* Outer.Inner*/ {
+  public  Inner(int, @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(int, java.lang.String)
+}
+
+public static final class Nested /* Outer.Nested*/ {
+  public  Nested();//  .ctor()
+
+  public  Nested(int, @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(int, java.lang.String)
+}
+
+public final class Outer /* Outer*/ {
+  public  Outer();//  .ctor()
+
+  class Inner ...
+
+  class Nested ...
+}
+
 public final class TestConstructor /* TestConstructor*/ {
   private  TestConstructor(int);//  .ctor(int)
 }
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.fir.java
index f1bd8d4e45a..d1c5c06adc5 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.fir.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.fir.java
@@ -1,16 +1,3 @@
-public final class Foo /* Foo*/ {
-  @org.jetbrains.annotations.Nullable()
-  public final java.lang.Object doSomething(@org.jetbrains.annotations.NotNull() Foo, @org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation<? super Bar>);//  doSomething(Foo, kotlin.coroutines.Continuation<? super Bar>)
-
-  public  Foo();//  .ctor()
-}
-
-public final class Boo /* Boo*/ {
-  private final java.lang.Object doSomething(Foo, kotlin.coroutines.Continuation<? super Bar>);//  doSomething(Foo, kotlin.coroutines.Continuation<? super Bar>)
-
-  public  Boo();//  .ctor()
-}
-
 public final class Bar /* Bar*/ {
   public  Bar();//  .ctor()
 
@@ -22,6 +9,12 @@ public abstract interface Base /* Base*/ {
   public abstract java.lang.Object foo(@org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation<? super kotlin.Unit>);//  foo(kotlin.coroutines.Continuation<? super kotlin.Unit>)
 }
 
+public final class Boo /* Boo*/ {
+  private final java.lang.Object doSomething(Foo, kotlin.coroutines.Continuation<? super Bar>);//  doSomething(Foo, kotlin.coroutines.Continuation<? super Bar>)
+
+  public  Boo();//  .ctor()
+}
+
 public final class Derived /* Derived*/ implements Base {
   @java.lang.Override()
   @org.jetbrains.annotations.Nullable()
@@ -29,3 +22,10 @@ public final class Derived /* Derived*/ implements Base {
 
   public  Derived();//  .ctor()
 }
+
+public final class Foo /* Foo*/ {
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.Object doSomething(@org.jetbrains.annotations.NotNull() Foo, @org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation<? super Bar>);//  doSomething(Foo, kotlin.coroutines.Continuation<? super Bar>)
+
+  public  Foo();//  .ctor()
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.java
index 51a9a219dfa..3db3386dfda 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.java
@@ -1,16 +1,3 @@
-public final class Foo /* Foo*/ {
-  @org.jetbrains.annotations.Nullable()
-  public final java.lang.Object doSomething(@org.jetbrains.annotations.NotNull() Foo, @org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation<? super Bar>);//  doSomething(Foo, kotlin.coroutines.Continuation<? super Bar>)
-
-  public  Foo();//  .ctor()
-}
-
-public final class Boo /* Boo*/ {
-  private final java.lang.Object doSomething(Foo, kotlin.coroutines.Continuation<? super Bar>);//  doSomething(Foo, kotlin.coroutines.Continuation<? super Bar>)
-
-  public  Boo();//  .ctor()
-}
-
 public final class Bar /* Bar*/ {
   public  Bar();//  .ctor()
 
@@ -22,9 +9,22 @@ public abstract interface Base /* Base*/ {
   public abstract java.lang.Object foo(@org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation<? super kotlin.Unit>);//  foo(kotlin.coroutines.Continuation<? super kotlin.Unit>)
 }
 
+public final class Boo /* Boo*/ {
+  private final java.lang.Object doSomething(Foo, kotlin.coroutines.Continuation<? super Bar>);//  doSomething(Foo, kotlin.coroutines.Continuation<? super Bar>)
+
+  public  Boo();//  .ctor()
+}
+
 public final class Derived /* Derived*/ implements Base {
   @org.jetbrains.annotations.Nullable()
   public java.lang.Object foo(@org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation<? super kotlin.Unit>);//  foo(kotlin.coroutines.Continuation<? super kotlin.Unit>)
 
   public  Derived();//  .ctor()
 }
+
+public final class Foo /* Foo*/ {
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.Object doSomething(@org.jetbrains.annotations.NotNull() Foo, @org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation<? super Bar>);//  doSomething(Foo, kotlin.coroutines.Continuation<? super Bar>)
+
+  public  Foo();//  .ctor()
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.lib.java
deleted file mode 100644
index 48c53de89f6..00000000000
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.lib.java
+++ /dev/null
@@ -1,30 +0,0 @@
-public abstract interface Base /* Base*/ {
-  @org.jetbrains.annotations.Nullable()
-  public abstract java.lang.Object foo(@org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation<? super kotlin.Unit>);//  foo(kotlin.coroutines.Continuation<? super kotlin.Unit>)
-}
-
-public final class Derived /* Derived*/ implements Base {
-  @org.jetbrains.annotations.Nullable()
-  public java.lang.Object foo(@org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation<? super kotlin.Unit>);//  foo(kotlin.coroutines.Continuation<? super kotlin.Unit>)
-
-  public  Derived();//  .ctor()
-}
-
-public final class Foo /* Foo*/ {
-  @org.jetbrains.annotations.Nullable()
-  public final java.lang.Object doSomething(@org.jetbrains.annotations.NotNull() Foo, @org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation<? super Bar>);//  doSomething(Foo, kotlin.coroutines.Continuation<? super Bar>)
-
-  public  Foo();//  .ctor()
-}
-
-public final class Bar /* Bar*/ {
-  public  Bar();//  .ctor()
-
-  public final <T> void async(@org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super T>, ? extends java.lang.Object>);// <T>  async(kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super T>, ? extends java.lang.Object>)
-}
-
-public final class Boo /* Boo*/ {
-  private final java.lang.Object doSomething(Foo, kotlin.coroutines.Continuation<? super Bar>);//  doSomething(Foo, kotlin.coroutines.Continuation<? super Bar>)
-
-  public  Boo();//  .ctor()
-}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/dataClasses.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/dataClasses.java
index 2ad0caad6e5..ac8e6861240 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/dataClasses.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/dataClasses.java
@@ -1,3 +1,32 @@
+public final class Person /* Person*/ {
+  @org.jetbrains.annotations.NotNull()
+  private final java.lang.String name;
+
+  private int age;
+
+  @org.jetbrains.annotations.NotNull()
+  public final Person copy(@org.jetbrains.annotations.NotNull() java.lang.String);//  copy(java.lang.String)
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String component1();//  component1()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getName();//  getName()
+
+  @org.jetbrains.annotations.NotNull()
+  public java.lang.String toString();//  toString()
+
+  public  Person(@org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String)
+
+  public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);//  equals(java.lang.Object)
+
+  public final int getAge();//  getAge()
+
+  public final void setAge(int);//  setAge(int)
+
+  public int hashCode();//  hashCode()
+}
+
 public final class User /* User*/ {
   @org.jetbrains.annotations.NotNull()
   private final java.lang.String name;
@@ -28,32 +57,3 @@ public final class User /* User*/ {
 
   public int hashCode();//  hashCode()
 }
-
-public final class Person /* Person*/ {
-  @org.jetbrains.annotations.NotNull()
-  private final java.lang.String name;
-
-  private int age;
-
-  @org.jetbrains.annotations.NotNull()
-  public final Person copy(@org.jetbrains.annotations.NotNull() java.lang.String);//  copy(java.lang.String)
-
-  @org.jetbrains.annotations.NotNull()
-  public final java.lang.String component1();//  component1()
-
-  @org.jetbrains.annotations.NotNull()
-  public final java.lang.String getName();//  getName()
-
-  @org.jetbrains.annotations.NotNull()
-  public java.lang.String toString();//  toString()
-
-  public  Person(@org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String)
-
-  public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);//  equals(java.lang.Object)
-
-  public final int getAge();//  getAge()
-
-  public final void setAge(int);//  setAge(int)
-
-  public int hashCode();//  hashCode()
-}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.fir.java
index c712f98537f..8431e0f486b 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.fir.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.fir.java
@@ -1,8 +1,3 @@
-@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
-public abstract @interface SimpleAnn /* SimpleAnn*/ {
-  public abstract java.lang.String value();//  value()
-}
-
 @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
 public abstract @interface Ann /* Ann*/ {
   public abstract SimpleAnn[] t();//  t()
@@ -30,3 +25,8 @@ public final class Derived /* Derived*/ implements Base {
 
   public  Derived(@org.jetbrains.annotations.NotNull() Base);//  .ctor(Base)
 }
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface SimpleAnn /* SimpleAnn*/ {
+  public abstract java.lang.String value();//  value()
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.java
index 08dfe28597f..261895d7854 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.java
@@ -1,8 +1,3 @@
-@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
-public abstract @interface SimpleAnn /* SimpleAnn*/ {
-  public abstract java.lang.String value();//  value()
-}
-
 @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
 public abstract @interface Ann /* Ann*/ {
   public abstract SimpleAnn[] t();//  t()
@@ -29,3 +24,8 @@ public final class Derived /* Derived*/ implements Base {
 
   public  Derived(@org.jetbrains.annotations.NotNull() Base);//  .ctor(Base)
 }
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface SimpleAnn /* SimpleAnn*/ {
+  public abstract java.lang.String value();//  value()
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.lib.java
index 38402b9db0b..70de2e5baab 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.lib.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.lib.java
@@ -1,8 +1,3 @@
-@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
-public abstract @interface SimpleAnn /* SimpleAnn*/ {
-  public abstract java.lang.String value();//  value()
-}
-
 @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
 public abstract @interface Ann /* Ann*/ {
   public abstract SimpleAnn[] t();//  t()
@@ -29,3 +24,8 @@ public final class Derived /* Derived*/ implements Base {
 
   public  Derived(@org.jetbrains.annotations.NotNull() Base);//  .ctor(Base)
 }
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface SimpleAnn /* SimpleAnn*/ {
+  public abstract java.lang.String value();//  value()
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.java
index 68928956a38..4835f6dbf56 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.java
@@ -1,7 +1,7 @@
-public final class Foo /* c.b.a.Foo*/ {
-  public  Foo();//  .ctor()
+public final class $$$$$$$ /* null*/ {
+  public  $$$$$$$();//  .ctor()
 
-  public final void bar();//  bar()
+  class G$G$ ...
 }
 
 public static final class A$B /* null*/ {
@@ -16,10 +16,10 @@ public final class C$D /* null*/ {
   public  C$D();//  .ctor()
 }
 
-public final class $$$$$$$ /* null*/ {
-  public  $$$$$$$();//  .ctor()
+public final class Foo /* c.b.a.Foo*/ {
+  public  Foo();//  .ctor()
 
-  class G$G$ ...
+  public final void bar();//  bar()
 }
 
 public final class G$G$ /* null*/ {
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.java
index dcfdad1175d..33be058ba92 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.java
@@ -1,20 +1,11 @@
-@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
-public abstract @interface Some /* Some*/ {
-}
+public final class C /* C*/ {
+  @org.jetbrains.annotations.Nullable()
+  private final Direction enumConst;
 
-public enum Direction /* Direction*/ {
-  @Some() NORTH,
-  SOUTH,
-  WEST,
-  EAST;
+  @org.jetbrains.annotations.Nullable()
+  public final Direction getEnumConst();//  getEnumConst()
 
-  @org.jetbrains.annotations.NotNull()
-  public static Direction valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
-
-  @org.jetbrains.annotations.NotNull()
-  public static Direction[] values();//  values()
-
-  private  Direction();//  .ctor()
+  public  C();//  .ctor()
 }
 
 public enum Color /* Color*/ {
@@ -37,48 +28,19 @@ public enum Color /* Color*/ {
   public final int getRgb();//  getRgb()
 }
 
-public enum ProtocolState /* ProtocolState*/ {
-  WAITING {
-   WAITING();//  .ctor()
+public enum Direction /* Direction*/ {
+  @Some() NORTH,
+  SOUTH,
+  WEST,
+  EAST;
 
   @org.jetbrains.annotations.NotNull()
-  public ProtocolState signal();//  signal()
-  },
-  TALKING {
-   TALKING();//  .ctor()
+  public static Direction valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
 
   @org.jetbrains.annotations.NotNull()
-  public ProtocolState signal();//  signal()
-  };
+  public static Direction[] values();//  values()
 
-  @org.jetbrains.annotations.NotNull()
-  public abstract ProtocolState signal();//  signal()
-
-  @org.jetbrains.annotations.NotNull()
-  public static ProtocolState valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
-
-  @org.jetbrains.annotations.NotNull()
-  public static ProtocolState[] values();//  values()
-
-  private  ProtocolState();//  .ctor()
-
-  class TALKING ...
-
-  class WAITING ...
-}
-
-public static final class WAITING /* ProtocolState.WAITING*/ extends ProtocolState {
-   WAITING();//  .ctor()
-
-  @org.jetbrains.annotations.NotNull()
-  public ProtocolState signal();//  signal()
-}
-
-public static final class TALKING /* ProtocolState.TALKING*/ extends ProtocolState {
-   TALKING();//  .ctor()
-
-  @org.jetbrains.annotations.NotNull()
-  public ProtocolState signal();//  signal()
+  private  Direction();//  .ctor()
 }
 
 public enum IntArithmetics /* IntArithmetics*/ implements java.util.function.BinaryOperator<java.lang.Integer>, java.util.function.IntBinaryOperator {
@@ -117,6 +79,47 @@ public static final class PLUS /* IntArithmetics.PLUS*/ extends IntArithmetics {
   public java.lang.Integer apply(int, int);//  apply(int, int)
 }
 
+public enum ProtocolState /* ProtocolState*/ {
+  WAITING {
+   WAITING();//  .ctor()
+
+  @org.jetbrains.annotations.NotNull()
+  public ProtocolState signal();//  signal()
+  },
+  TALKING {
+   TALKING();//  .ctor()
+
+  @org.jetbrains.annotations.NotNull()
+  public ProtocolState signal();//  signal()
+  };
+
+  @org.jetbrains.annotations.NotNull()
+  public abstract ProtocolState signal();//  signal()
+
+  @org.jetbrains.annotations.NotNull()
+  public static ProtocolState valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+
+  @org.jetbrains.annotations.NotNull()
+  public static ProtocolState[] values();//  values()
+
+  private  ProtocolState();//  .ctor()
+
+  class TALKING ...
+
+  class WAITING ...
+}
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Some /* Some*/ {
+}
+
+public static final class TALKING /* ProtocolState.TALKING*/ extends ProtocolState {
+   TALKING();//  .ctor()
+
+  @org.jetbrains.annotations.NotNull()
+  public ProtocolState signal();//  signal()
+}
+
 public static final class TIMES /* IntArithmetics.TIMES*/ extends IntArithmetics {
    TIMES();//  .ctor()
 
@@ -124,12 +127,9 @@ public static final class TIMES /* IntArithmetics.TIMES*/ extends IntArithmetics
   public java.lang.Integer apply(int, int);//  apply(int, int)
 }
 
-public final class C /* C*/ {
-  @org.jetbrains.annotations.Nullable()
-  private final Direction enumConst;
+public static final class WAITING /* ProtocolState.WAITING*/ extends ProtocolState {
+   WAITING();//  .ctor()
 
-  @org.jetbrains.annotations.Nullable()
-  public final Direction getEnumConst();//  getEnumConst()
-
-  public  C();//  .ctor()
+  @org.jetbrains.annotations.NotNull()
+  public ProtocolState signal();//  signal()
 }
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.fir.java
index 4c933d24a62..b8e40e13681 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.fir.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.fir.java
@@ -1,25 +1,13 @@
-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 Final /* Final*/ {
+  public  Final();//  .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 Inv /* Inv*/<E>  {
+  public  Inv();//  .ctor()
 }
 
 public final class JvmWildcardAnnotationsKt /* JvmWildcardAnnotationsKt*/ {
@@ -54,3 +42,15 @@ public final class JvmWildcardAnnotationsKt /* JvmWildcardAnnotationsKt*/ {
 
   public static final void simpleOut(@org.jetbrains.annotations.NotNull() Out<? extends Final>);//  simpleOut(Out<? extends Final>)
 }
+
+public class Open /* Open*/ {
+  public  Open();//  .ctor()
+}
+
+public final class Out /* Out*/<T>  {
+  public  Out();//  .ctor()
+}
+
+public final class OutPair /* OutPair*/<Final, Y>  {
+  public  OutPair();//  .ctor()
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.java
index aada6c1450f..3817693da03 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.java
@@ -1,25 +1,13 @@
-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 Final /* Final*/ {
+  public  Final();//  .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 Inv /* Inv*/<E>  {
+  public  Inv();//  .ctor()
 }
 
 public final class JvmWildcardAnnotationsKt /* JvmWildcardAnnotationsKt*/ {
@@ -54,3 +42,15 @@ public final class JvmWildcardAnnotationsKt /* JvmWildcardAnnotationsKt*/ {
 
   public static final void simpleOut(@org.jetbrains.annotations.NotNull() Out<? extends Final>);//  simpleOut(Out<? extends Final>)
 }
+
+public class Open /* Open*/ {
+  public  Open();//  .ctor()
+}
+
+public final class Out /* Out*/<T>  {
+  public  Out();//  .ctor()
+}
+
+public final class OutPair /* OutPair*/<Final, Y>  {
+  public  OutPair();//  .ctor()
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.java
index c4a424b84c4..aa0032ef809 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.java
@@ -1,7 +1,19 @@
+public final class Final /* Final*/ {
+  public  Final();//  .ctor()
+}
+
+public final class In /* In*/<Z>  {
+  public  In();//  .ctor()
+}
+
 public final class Inv /* Inv*/<E>  {
   public  Inv();//  .ctor()
 }
 
+public class Open /* Open*/ {
+  public  Open();//  .ctor()
+}
+
 public final class Out /* Out*/<T>  {
   public  Out();//  .ctor()
 }
@@ -10,18 +22,6 @@ 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()
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.lib.java
deleted file mode 100644
index 60e04de1b67..00000000000
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.lib.java
+++ /dev/null
@@ -1,100 +0,0 @@
-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/implementingKotlinCollections.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/implementingKotlinCollections.fir.java
index 880cbd4941b..ee2ec773ae0 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/implementingKotlinCollections.fir.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/implementingKotlinCollections.fir.java
@@ -1,3 +1,6 @@
+public abstract interface ASet /* ASet*/<T>  extends java.util.Collection<T>, kotlin.collections.MutableCollection<T>, kotlin.jvm.internal.markers.KMutableCollection {
+}
+
 public final class MyList /* MyList*/ implements java.util.List<java.lang.String>, kotlin.collections.List<java.lang.String>, kotlin.jvm.internal.markers.KMappedMarker {
   @java.lang.Override()
   @org.jetbrains.annotations.NotNull()
@@ -6,9 +9,6 @@ public final class MyList /* MyList*/ implements java.util.List<java.lang.String
   public  MyList();//  .ctor()
 }
 
-public abstract interface ASet /* ASet*/<T>  extends java.util.Collection<T>, kotlin.collections.MutableCollection<T>, kotlin.jvm.internal.markers.KMutableCollection {
-}
-
 public abstract class MySet /* MySet*/<T>  implements ASet<T> {
   public  MySet();//  .ctor()
 
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/implementingKotlinCollections.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/implementingKotlinCollections.java
index 3c752febb18..80b8edec5c3 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/implementingKotlinCollections.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/implementingKotlinCollections.java
@@ -1,3 +1,6 @@
+public abstract interface ASet /* ASet*/<T>  extends java.util.Collection<T>, kotlin.collections.MutableCollection<T>, kotlin.jvm.internal.markers.KMutableCollection {
+}
+
 public final class MyList /* MyList*/ implements java.util.List<java.lang.String>, kotlin.collections.List<java.lang.String>, kotlin.jvm.internal.markers.KMappedMarker {
   @org.jetbrains.annotations.NotNull()
   public java.lang.String get(int);//  get(int)
@@ -5,9 +8,6 @@ public final class MyList /* MyList*/ implements java.util.List<java.lang.String
   public  MyList();//  .ctor()
 }
 
-public abstract interface ASet /* ASet*/<T>  extends java.util.Collection<T>, kotlin.collections.MutableCollection<T>, kotlin.jvm.internal.markers.KMutableCollection {
-}
-
 public abstract class MySet /* MySet*/<T>  implements ASet<T> {
   public  MySet();//  .ctor()
 
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.fir.java
index 2bba22d06d8..d88c32f03ae 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.fir.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.fir.java
@@ -1,11 +1,40 @@
-public final class Prop /* Prop*/ {
-  @org.jetbrains.annotations.NotNull()
-  private final java.lang.Object someProp;
-
-  public  Prop();//  .ctor()
+final class null /* null*/ {
+  private  ();//  .ctor()
 }
 
 final class null /* null*/ {
+  @java.lang.Override()
+  @org.jetbrains.annotations.NotNull()
+  public java.lang.String toString();//  toString()
+
+  private  ();//  .ctor()
+}
+
+final class null /* null*/ implements java.lang.Runnable {
+  @java.lang.Override()
+  public void run();//  run()
+
+  private  ();//  .ctor()
+}
+
+final class null /* null*/ implements java.lang.Runnable {
+  @java.lang.Override()
+  public void run();//  run()
+
+  private  ();//  .ctor()
+}
+
+final class null /* null*/ implements I, java.lang.Runnable {
+  @java.lang.Override()
+  public void run();//  run()
+
+  private  ();//  .ctor()
+}
+
+final class null /* null*/ implements I, java.lang.Runnable {
+  @java.lang.Override()
+  public void run();//  run()
+
   private  ();//  .ctor()
 }
 
@@ -23,41 +52,6 @@ final class C /* C*/ {
   public final int getY();//  getY()
 }
 
-final class null /* null*/ {
-  @java.lang.Override()
-  @org.jetbrains.annotations.NotNull()
-  public java.lang.String toString();//  toString()
-
-  private  ();//  .ctor()
-}
-
-public final class ValidPublicSupertype /* ValidPublicSupertype*/ {
-  @org.jetbrains.annotations.NotNull()
-  private final java.lang.Runnable x;
-
-  @org.jetbrains.annotations.NotNull()
-  public final java.lang.Runnable bar();//  bar()
-
-  @org.jetbrains.annotations.NotNull()
-  public final java.lang.Runnable getX();//  getX()
-
-  public  ValidPublicSupertype();//  .ctor()
-}
-
-final class null /* null*/ implements java.lang.Runnable {
-  @java.lang.Override()
-  public void run();//  run()
-
-  private  ();//  .ctor()
-}
-
-final class null /* null*/ implements java.lang.Runnable {
-  @java.lang.Override()
-  public void run();//  run()
-
-  private  ();//  .ctor()
-}
-
 public abstract interface I /* I*/ {
 }
 
@@ -74,16 +68,22 @@ public final class InvalidPublicSupertype /* InvalidPublicSupertype*/ {
   public  InvalidPublicSupertype();//  .ctor()
 }
 
-final class null /* null*/ implements I, java.lang.Runnable {
-  @java.lang.Override()
-  public void run();//  run()
+public final class Prop /* Prop*/ {
+  @org.jetbrains.annotations.NotNull()
+  private final java.lang.Object someProp;
 
-  private  ();//  .ctor()
+  public  Prop();//  .ctor()
 }
 
-final class null /* null*/ implements I, java.lang.Runnable {
-  @java.lang.Override()
-  public void run();//  run()
+public final class ValidPublicSupertype /* ValidPublicSupertype*/ {
+  @org.jetbrains.annotations.NotNull()
+  private final java.lang.Runnable x;
 
-  private  ();//  .ctor()
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.Runnable bar();//  bar()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.Runnable getX();//  getX()
+
+  public  ValidPublicSupertype();//  .ctor()
 }
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.java
index 7d3906ea4f0..c9a7f99888a 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.java
@@ -1,14 +1,38 @@
-public final class Prop /* Prop*/ {
-  @org.jetbrains.annotations.NotNull()
-  private final java.lang.Object someProp;
-
-  public  Prop();//  .ctor()
+final class null /* null*/ {
+  private  ();//  .ctor()
 }
 
 final class null /* null*/ {
+  @org.jetbrains.annotations.NotNull()
+  public java.lang.String toString();//  toString()
+
   private  ();//  .ctor()
 }
 
+final class null /* null*/ implements java.lang.Runnable {
+  private  ();//  .ctor()
+
+  public void run();//  run()
+}
+
+final class null /* null*/ implements java.lang.Runnable {
+  private  ();//  .ctor()
+
+  public void run();//  run()
+}
+
+final class null /* null*/ implements I, java.lang.Runnable {
+  private  ();//  .ctor()
+
+  public void run();//  run()
+}
+
+final class null /* null*/ implements I, java.lang.Runnable {
+  private  ();//  .ctor()
+
+  public void run();//  run()
+}
+
 final class C /* C*/ {
   @org.jetbrains.annotations.NotNull()
   private final kotlin.jvm.functions.Function0<java.lang.Object> initChild;
@@ -23,38 +47,6 @@ final class C /* C*/ {
   public final int getY();//  getY()
 }
 
-final class null /* null*/ {
-  @org.jetbrains.annotations.NotNull()
-  public java.lang.String toString();//  toString()
-
-  private  ();//  .ctor()
-}
-
-public final class ValidPublicSupertype /* ValidPublicSupertype*/ {
-  @org.jetbrains.annotations.NotNull()
-  private final java.lang.Runnable x;
-
-  @org.jetbrains.annotations.NotNull()
-  public final java.lang.Runnable bar();//  bar()
-
-  @org.jetbrains.annotations.NotNull()
-  public final java.lang.Runnable getX();//  getX()
-
-  public  ValidPublicSupertype();//  .ctor()
-}
-
-final class null /* null*/ implements java.lang.Runnable {
-  private  ();//  .ctor()
-
-  public void run();//  run()
-}
-
-final class null /* null*/ implements java.lang.Runnable {
-  private  ();//  .ctor()
-
-  public void run();//  run()
-}
-
 public abstract interface I /* I*/ {
 }
 
@@ -71,14 +63,22 @@ public final class InvalidPublicSupertype /* InvalidPublicSupertype*/ {
   public  InvalidPublicSupertype();//  .ctor()
 }
 
-final class null /* null*/ implements I, java.lang.Runnable {
-  private  ();//  .ctor()
+public final class Prop /* Prop*/ {
+  @org.jetbrains.annotations.NotNull()
+  private final java.lang.Object someProp;
 
-  public void run();//  run()
+  public  Prop();//  .ctor()
 }
 
-final class null /* null*/ implements I, java.lang.Runnable {
-  private  ();//  .ctor()
+public final class ValidPublicSupertype /* ValidPublicSupertype*/ {
+  @org.jetbrains.annotations.NotNull()
+  private final java.lang.Runnable x;
 
-  public void run();//  run()
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.Runnable bar();//  bar()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.Runnable getX();//  getX()
+
+  public  ValidPublicSupertype();//  .ctor()
 }
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/inheritance.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inheritance.fir.java
index 621f31ca8a4..77cb1d633c4 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/inheritance.fir.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/inheritance.fir.java
@@ -1,9 +1,24 @@
-public abstract interface Intf /* Intf*/ {
-  public abstract int v();//  v()
-}
+public abstract class AnotherDerived /* AnotherDerived*/ extends Base {
+  private final int x;
 
-public abstract interface IntfWithProp /* IntfWithProp*/ extends Intf {
-  public abstract int getX();//  getX()
+  private final int y;
+
+  private final int z;
+
+  @java.lang.Override()
+  protected final void v();//  v()
+
+  protected int getZ();//  getZ()
+
+  public  AnotherDerived(int, int, int);//  .ctor(int, int, int)
+
+  public abstract int getAbstractProp();//  getAbstractProp()
+
+  public abstract void noReturn(@org.jetbrains.annotations.NotNull() java.lang.String);//  noReturn(java.lang.String)
+
+  public int getX$light_idea_test_case();//  getX$light_idea_test_case()
+
+  public int getY();//  getY()
 }
 
 public abstract class Base /* Base*/ {
@@ -45,27 +60,12 @@ public final class Derived /* Derived*/ extends Base implements IntfWithProp {
   public int getX();//  getX()
 }
 
-public abstract class AnotherDerived /* AnotherDerived*/ extends Base {
-  private final int x;
+public abstract interface Intf /* Intf*/ {
+  public abstract int v();//  v()
+}
 
-  private final int y;
-
-  private final int z;
-
-  @java.lang.Override()
-  protected final void v();//  v()
-
-  protected int getZ();//  getZ()
-
-  public  AnotherDerived(int, int, int);//  .ctor(int, int, int)
-
-  public abstract int getAbstractProp();//  getAbstractProp()
-
-  public abstract void noReturn(@org.jetbrains.annotations.NotNull() java.lang.String);//  noReturn(java.lang.String)
-
-  public int getX$light_idea_test_case();//  getX$light_idea_test_case()
-
-  public int getY();//  getY()
+public abstract interface IntfWithProp /* IntfWithProp*/ extends Intf {
+  public abstract int getX();//  getX()
 }
 
 final class Private /* Private*/ {
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/inheritance.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inheritance.java
index fb282f64d47..dc10dd4cba2 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/inheritance.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/inheritance.java
@@ -1,9 +1,23 @@
-public abstract interface Intf /* Intf*/ {
-  public abstract int v();//  v()
-}
+public abstract class AnotherDerived /* AnotherDerived*/ extends Base {
+  private final int x;
 
-public abstract interface IntfWithProp /* IntfWithProp*/ extends Intf {
-  public abstract int getX();//  getX()
+  private final int y;
+
+  private final int z;
+
+  protected final void v();//  v()
+
+  protected int getZ();//  getZ()
+
+  public  AnotherDerived(int, int, int);//  .ctor(int, int, int)
+
+  public abstract int getAbstractProp();//  getAbstractProp()
+
+  public abstract void noReturn(@org.jetbrains.annotations.NotNull() java.lang.String);//  noReturn(java.lang.String)
+
+  public int getX$light_idea_test_case();//  getX$light_idea_test_case()
+
+  public int getY();//  getY()
 }
 
 public abstract class Base /* Base*/ {
@@ -43,26 +57,12 @@ public final class Derived /* Derived*/ extends Base implements IntfWithProp {
   public int getX();//  getX()
 }
 
-public abstract class AnotherDerived /* AnotherDerived*/ extends Base {
-  private final int x;
+public abstract interface Intf /* Intf*/ {
+  public abstract int v();//  v()
+}
 
-  private final int y;
-
-  private final int z;
-
-  protected final void v();//  v()
-
-  protected int getZ();//  getZ()
-
-  public  AnotherDerived(int, int, int);//  .ctor(int, int, int)
-
-  public abstract int getAbstractProp();//  getAbstractProp()
-
-  public abstract void noReturn(@org.jetbrains.annotations.NotNull() java.lang.String);//  noReturn(java.lang.String)
-
-  public int getX$light_idea_test_case();//  getX$light_idea_test_case()
-
-  public int getY();//  getY()
+public abstract interface IntfWithProp /* IntfWithProp*/ extends Intf {
+  public abstract int getX();//  getX()
 }
 
 final class Private /* Private*/ {
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.fir.java
index 062ddcc37ae..c2c6c1cb1bf 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.fir.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.fir.java
@@ -1,7 +1,3 @@
-public final class UInt /* UInt*/ {
-  private final int value;
-}
-
 public enum Foo /* Foo*/ {
   ;
 
@@ -10,12 +6,6 @@ public enum Foo /* Foo*/ {
   public final int getX();//  getX()
 }
 
-public final class InlinedDelegate /* InlinedDelegate*/<T>  {
-  private T node;
-
-  public final T getNode();//  getNode()
-}
-
 public final class InlineInheritance /* InlineInheritance*/ {
   private final int v;
 
@@ -25,3 +15,13 @@ public final class InlineInheritance /* InlineInheritance*/ {
 
   public int y();//  y()
 }
+
+public final class InlinedDelegate /* InlinedDelegate*/<T>  {
+  private T node;
+
+  public final T getNode();//  getNode()
+}
+
+public final class UInt /* UInt*/ {
+  private final int value;
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.java
index 62ee58c1944..7f2e4e7b14f 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.java
@@ -1,6 +1,3 @@
-public final class UInt /* UInt*/ {
-}
-
 public enum Foo /* Foo*/ {
   ;
 
@@ -13,10 +10,6 @@ public enum Foo /* Foo*/ {
   public final int getX();//  getX()
 }
 
-public final class InlinedDelegate /* InlinedDelegate*/<T>  {
-  public final T getNode();//  getNode()
-}
-
 public final class InlineInheritance /* InlineInheritance*/ {
   public final int getV();//  getV()
 
@@ -24,3 +17,10 @@ public final class InlineInheritance /* InlineInheritance*/ {
 
   public int y();//  y()
 }
+
+public final class InlinedDelegate /* InlinedDelegate*/<T>  {
+  public final T getNode();//  getNode()
+}
+
+public final class UInt /* UInt*/ {
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.java
index 31c82bd442b..5420c82ed19 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.java
@@ -21,10 +21,6 @@ public final class A /* A*/ {
   class Companion ...
 }
 
-public static final class Companion /* A.Companion*/ {
-  private  Companion();//  .ctor()
-}
-
 public abstract interface B /* B*/ {
   @kotlin.jvm.JvmField()
   @org.jetbrains.annotations.NotNull()
@@ -36,10 +32,6 @@ public abstract interface B /* B*/ {
   class Companion ...
 }
 
-public static final class Companion /* B.Companion*/ {
-  private  Companion();//  .ctor()
-}
-
 public final class C /* C*/ {
   @kotlin.jvm.JvmField()
   @org.jetbrains.annotations.NotNull()
@@ -52,3 +44,11 @@ public final class C /* C*/ {
 
   public  C(@org.jetbrains.annotations.NotNull() java.util.Collection<?>, int);//  .ctor(java.util.Collection<?>, int)
 }
+
+public static final class Companion /* A.Companion*/ {
+  private  Companion();//  .ctor()
+}
+
+public static final class Companion /* B.Companion*/ {
+  private  Companion();//  .ctor()
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.fir.java
index 8f57f30665d..377b7845e17 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.fir.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.fir.java
@@ -1,3 +1,18 @@
+public static final class Companion /* MyClass.Companion*/ {
+  @kotlin.jvm.JvmStatic()
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getProp2();//  getProp2()
+
+  @kotlin.jvm.JvmStatic()
+  public final void setProp(int);//  setProp(int)
+
+  private  Companion();//  .ctor()
+
+  public final int getProp();//  getProp()
+
+  public final void setProp2(@org.jetbrains.annotations.NotNull() java.lang.String);//  setProp2(java.lang.String)
+}
+
 public final class MyClass /* MyClass*/ {
   @org.jetbrains.annotations.NotNull()
   private static java.lang.String prop2 = "" /* initializer type: java.lang.String */;
@@ -18,18 +33,3 @@ public final class MyClass /* MyClass*/ {
 
   class Companion ...
 }
-
-public static final class Companion /* MyClass.Companion*/ {
-  @kotlin.jvm.JvmStatic()
-  @org.jetbrains.annotations.NotNull()
-  public final java.lang.String getProp2();//  getProp2()
-
-  @kotlin.jvm.JvmStatic()
-  public final void setProp(int);//  setProp(int)
-
-  private  Companion();//  .ctor()
-
-  public final int getProp();//  getProp()
-
-  public final void setProp2(@org.jetbrains.annotations.NotNull() java.lang.String);//  setProp2(java.lang.String)
-}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.java
index 0877bfe639d..7d00e51f536 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.java
@@ -1,3 +1,18 @@
+public static final class Companion /* MyClass.Companion*/ {
+  @kotlin.jvm.JvmStatic()
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getProp2();//  getProp2()
+
+  @kotlin.jvm.JvmStatic()
+  public final void setProp(int);//  setProp(int)
+
+  private  Companion();//  .ctor()
+
+  public final int getProp();//  getProp()
+
+  public final void setProp2(@org.jetbrains.annotations.NotNull() java.lang.String);//  setProp2(java.lang.String)
+}
+
 public final class MyClass /* MyClass*/ {
   @org.jetbrains.annotations.NotNull()
   private static java.lang.String prop2;
@@ -18,18 +33,3 @@ public final class MyClass /* MyClass*/ {
 
   class Companion ...
 }
-
-public static final class Companion /* MyClass.Companion*/ {
-  @kotlin.jvm.JvmStatic()
-  @org.jetbrains.annotations.NotNull()
-  public final java.lang.String getProp2();//  getProp2()
-
-  @kotlin.jvm.JvmStatic()
-  public final void setProp(int);//  setProp(int)
-
-  private  Companion();//  .ctor()
-
-  public final int getProp();//  getProp()
-
-  public final void setProp2(@org.jetbrains.annotations.NotNull() java.lang.String);//  setProp2(java.lang.String)
-}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.lib.java
index 534629d7500..abe28eb71f0 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.lib.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.lib.java
@@ -1,3 +1,18 @@
+public static final class Companion /* MyClass.Companion*/ {
+  @kotlin.jvm.JvmStatic()
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getProp2();//  getProp2()
+
+  @kotlin.jvm.JvmStatic()
+  public final void setProp(int);//  setProp(int)
+
+  private  Companion();//  .ctor()
+
+  public final int getProp();//  getProp()
+
+  public final void setProp2(@org.jetbrains.annotations.NotNull() java.lang.String);//  setProp2(java.lang.String)
+}
+
 public final class MyClass /* MyClass*/ {
   @org.jetbrains.annotations.NotNull()
   private static java.lang.String prop2;
@@ -18,18 +33,3 @@ public final class MyClass /* MyClass*/ {
 
   class Companion ...
 }
-
-public static final class Companion /* MyClass.Companion*/ {
-  @kotlin.jvm.JvmStatic()
-  @org.jetbrains.annotations.NotNull()
-  public final java.lang.String getProp2();//  getProp2()
-
-  @kotlin.jvm.JvmStatic()
-  public final void setProp(int);//  setProp(int)
-
-  private  Companion();//  .ctor()
-
-  public final int getProp();//  getProp()
-
-  public final void setProp2(@org.jetbrains.annotations.NotNull() java.lang.String);//  setProp2(java.lang.String)
-}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.fir.java
index 9e64b32bb67..f23a750e21e 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.fir.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.fir.java
@@ -1,25 +1,13 @@
-public final class Inv /* Inv*/<E>  {
-  public  Inv();//  .ctor()
+public abstract interface A /* A*/<T>  {
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
+  @org.jetbrains.annotations.NotNull()
+  public abstract Out<T> foo();//  foo()
 }
 
-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 abstract interface B /* B*/ {
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
+  @org.jetbrains.annotations.NotNull()
+  public abstract In<Open> foo();//  foo()
 }
 
 public final class Container /* Container*/ {
@@ -49,14 +37,26 @@ public final class Container /* Container*/ {
   public final void simpleOut(@org.jetbrains.annotations.NotNull() Out<? extends Final>);//  simpleOut(Out<? extends Final>)
 }
 
-public abstract interface A /* A*/<T>  {
-  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
-  @org.jetbrains.annotations.NotNull()
-  public abstract Out<T> foo();//  foo()
+public final class Final /* Final*/ {
+  public  Final();//  .ctor()
 }
 
-public abstract interface B /* B*/ {
-  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
-  @org.jetbrains.annotations.NotNull()
-  public abstract In<Open> foo();//  foo()
+public final class In /* In*/<Z>  {
+  public  In();//  .ctor()
+}
+
+public final class Inv /* Inv*/<E>  {
+  public  Inv();//  .ctor()
+}
+
+public class Open /* Open*/ {
+  public  Open();//  .ctor()
+}
+
+public final class Out /* Out*/<T>  {
+  public  Out();//  .ctor()
+}
+
+public final class OutPair /* OutPair*/<Final, Y>  {
+  public  OutPair();//  .ctor()
 }
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.java
index 10b4ba85d64..a9233ea5d83 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.java
@@ -1,25 +1,13 @@
-public final class Inv /* Inv*/<E>  {
-  public  Inv();//  .ctor()
+public abstract interface A /* A*/<T>  {
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
+  @org.jetbrains.annotations.NotNull()
+  public abstract Out<T> foo();//  foo()
 }
 
-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 abstract interface B /* B*/ {
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
+  @org.jetbrains.annotations.NotNull()
+  public abstract In<Open> foo();//  foo()
 }
 
 public final class Container /* Container*/ {
@@ -49,14 +37,26 @@ public final class Container /* Container*/ {
   public final void simpleOut(@org.jetbrains.annotations.NotNull() Out<? extends Final>);//  simpleOut(Out<? extends Final>)
 }
 
-public abstract interface A /* A*/<T>  {
-  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
-  @org.jetbrains.annotations.NotNull()
-  public abstract Out<T> foo();//  foo()
+public final class Final /* Final*/ {
+  public  Final();//  .ctor()
 }
 
-public abstract interface B /* B*/ {
-  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
-  @org.jetbrains.annotations.NotNull()
-  public abstract In<Open> foo();//  foo()
+public final class In /* In*/<Z>  {
+  public  In();//  .ctor()
+}
+
+public final class Inv /* Inv*/<E>  {
+  public  Inv();//  .ctor()
+}
+
+public class Open /* Open*/ {
+  public  Open();//  .ctor()
+}
+
+public final class Out /* Out*/<T>  {
+  public  Out();//  .ctor()
+}
+
+public final class OutPair /* OutPair*/<Final, Y>  {
+  public  OutPair();//  .ctor()
 }
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.lib.java
deleted file mode 100644
index 7676666e19e..00000000000
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.lib.java
+++ /dev/null
@@ -1,62 +0,0 @@
-public final class OutPair /* OutPair*/<Final, Y>  {
-  public  OutPair();//  .ctor()
-}
-
-public final class In /* In*/<Z>  {
-  public  In();//  .ctor()
-}
-
-public class Open /* Open*/ {
-  public  Open();//  .ctor()
-}
-
-public abstract interface B /* B*/ {
-  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
-  @org.jetbrains.annotations.NotNull()
-  public abstract In<Open> foo();//  foo()
-}
-
-public final class Container /* Container*/ {
-  @kotlin.jvm.JvmSuppressWildcards(suppress = false)
-  @org.jetbrains.annotations.NotNull()
-  public final Out<? extends Open> bar();//  bar()
-
-  @kotlin.jvm.JvmSuppressWildcards(suppress = false)
-  public final int foo(boolean, @org.jetbrains.annotations.NotNull() Out<? extends java.lang.Integer>);//  foo(boolean, Out<? extends java.lang.Integer>)
-
-  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
-  public final int bar(boolean, @org.jetbrains.annotations.NotNull() In<java.lang.Long>, long);//  bar(boolean, In<java.lang.Long>, long)
-
-  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
-  public final void deepOpen(@org.jetbrains.annotations.NotNull() Out<Out<Out<Open>>>);//  deepOpen(Out<Out<Out<Open>>>)
-
-  @org.jetbrains.annotations.NotNull()
-  public final OutPair<? extends Final, OutPair<Out<Final>, Out<? extends Final>>> falseTrueFalse();//  falseTrueFalse()
-
-  @org.jetbrains.annotations.NotNull()
-  public final OutPair<Open, ? extends OutPair<Open,? extends Out<Open>>> combination();//  combination()
-
-  public  Container();//  .ctor()
-
-  public final void simpleIn(@org.jetbrains.annotations.NotNull() In<? super java.lang.Object>);//  simpleIn(In<? super java.lang.Object>)
-
-  public final void simpleOut(@org.jetbrains.annotations.NotNull() Out<? extends Final>);//  simpleOut(Out<? extends Final>)
-}
-
-public final class Inv /* Inv*/<E>  {
-  public  Inv();//  .ctor()
-}
-
-public final class Out /* Out*/<T>  {
-  public  Out();//  .ctor()
-}
-
-public abstract interface A /* A*/<T>  {
-  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
-  @org.jetbrains.annotations.NotNull()
-  public abstract Out<T> foo();//  foo()
-}
-
-public final class Final /* Final*/ {
-  public  Final();//  .ctor()
-}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.fir.java
index ecc86cd372f..c6cbdb8817a 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.fir.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.fir.java
@@ -40,6 +40,39 @@ public final class C /* C*/ {
   class Factory ...
 }
 
+public final class C1 /* C1*/ {
+  @org.jetbrains.annotations.NotNull()
+  private static final C1.Companion Companion;
+
+  public  C1();//  .ctor()
+
+  class Companion ...
+}
+
+public final class ClassWithConstContainer /* ClassWithConstContainer*/ {
+  @org.jetbrains.annotations.NotNull()
+  public static final ClassWithConstContainer.Companion Companion;
+
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String str = "one" /* initializer type: java.lang.String */ /* constant value one */;
+
+  public static final double complexFloat = 5.118281745910645 /* initializer type: double */ /* constant value 5.118281745910645 */;
+
+  public static final double e = 2.7182818284 /* initializer type: double */ /* constant value 2.7182818284 */;
+
+  public static final float eFloat = 2.7182817f /* initializer type: float */ /* constant value 2.7182817 */;
+
+  public static final int one = 1 /* initializer type: int */ /* constant value 1 */;
+
+  public static final long complexLong = 2L /* initializer type: long */ /* constant value 2 */;
+
+  public static final long oneLong = 1L /* initializer type: long */ /* constant value 1 */;
+
+  public  ClassWithConstContainer();//  .ctor()
+
+  class Companion ...
+}
+
 public static final class Companion /* C.Companion*/ {
   @kotlin.jvm.JvmStatic()
   @org.jetbrains.annotations.NotNull()
@@ -67,54 +100,16 @@ public static final class Companion /* C.Companion*/ {
   public final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);//  setX(java.lang.String)
 }
 
-public static final class Factory /* C.Factory*/ {
-  private  Factory();//  .ctor()
-}
-
-public final class C1 /* C1*/ {
-  @org.jetbrains.annotations.NotNull()
-  private static final C1.Companion Companion;
-
-  public  C1();//  .ctor()
-
-  class Companion ...
-}
-
 private static final class Companion /* C1.Companion*/ {
   private  Companion();//  .ctor()
 }
 
-public abstract interface I /* I*/ {
-  @org.jetbrains.annotations.NotNull()
-  public static final I.Companion Companion;
-
-  class Companion ...
-}
-
 public static final class Companion /* I.Companion*/ {
   private  Companion();//  .ctor()
 }
 
-public final class Obj /* Obj*/ implements java.lang.Runnable {
-  @kotlin.jvm.JvmStatic()
-  @org.jetbrains.annotations.NotNull()
-  private static java.lang.String x = "" /* initializer type: java.lang.String */;
-
-  @org.jetbrains.annotations.NotNull()
-  public static final Obj INSTANCE;
-
-  @java.lang.Override()
-  public void run();//  run()
-
-  @kotlin.jvm.JvmStatic()
-  public static final int zoo();//  zoo()
-
-  @org.jetbrains.annotations.NotNull()
-  public static final java.lang.String getX();//  getX()
-
-  private  Obj();//  .ctor()
-
-  public static final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);//  setX(java.lang.String)
+public static final class Companion /* ClassWithConstContainer.Companion*/ {
+  private  Companion();//  .ctor()
 }
 
 public final class ConstContainer /* ConstContainer*/ {
@@ -139,30 +134,35 @@ public final class ConstContainer /* ConstContainer*/ {
   private  ConstContainer();//  .ctor()
 }
 
-public final class ClassWithConstContainer /* ClassWithConstContainer*/ {
+public static final class Factory /* C.Factory*/ {
+  private  Factory();//  .ctor()
+}
+
+public abstract interface I /* I*/ {
   @org.jetbrains.annotations.NotNull()
-  public static final ClassWithConstContainer.Companion Companion;
-
-  @org.jetbrains.annotations.NotNull()
-  public static final java.lang.String str = "one" /* initializer type: java.lang.String */ /* constant value one */;
-
-  public static final double complexFloat = 5.118281745910645 /* initializer type: double */ /* constant value 5.118281745910645 */;
-
-  public static final double e = 2.7182818284 /* initializer type: double */ /* constant value 2.7182818284 */;
-
-  public static final float eFloat = 2.7182817f /* initializer type: float */ /* constant value 2.7182817 */;
-
-  public static final int one = 1 /* initializer type: int */ /* constant value 1 */;
-
-  public static final long complexLong = 2L /* initializer type: long */ /* constant value 2 */;
-
-  public static final long oneLong = 1L /* initializer type: long */ /* constant value 1 */;
-
-  public  ClassWithConstContainer();//  .ctor()
+  public static final I.Companion Companion;
 
   class Companion ...
 }
 
-public static final class Companion /* ClassWithConstContainer.Companion*/ {
-  private  Companion();//  .ctor()
+public final class Obj /* Obj*/ implements java.lang.Runnable {
+  @kotlin.jvm.JvmStatic()
+  @org.jetbrains.annotations.NotNull()
+  private static java.lang.String x = "" /* initializer type: java.lang.String */;
+
+  @org.jetbrains.annotations.NotNull()
+  public static final Obj INSTANCE;
+
+  @java.lang.Override()
+  public void run();//  run()
+
+  @kotlin.jvm.JvmStatic()
+  public static final int zoo();//  zoo()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String getX();//  getX()
+
+  private  Obj();//  .ctor()
+
+  public static final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);//  setX(java.lang.String)
 }
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.java
index 02ddd1a40cf..8203bfdb6d6 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.java
@@ -30,6 +30,39 @@ public final class C /* C*/ {
   class Factory ...
 }
 
+public final class C1 /* C1*/ {
+  @org.jetbrains.annotations.NotNull()
+  private static final C1.Companion Companion;
+
+  public  C1();//  .ctor()
+
+  class Companion ...
+}
+
+public final class ClassWithConstContainer /* ClassWithConstContainer*/ {
+  @org.jetbrains.annotations.NotNull()
+  public static final ClassWithConstContainer.Companion Companion;
+
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String str = "one" /* initializer type: java.lang.String */ /* constant value one */;
+
+  public static final double complexFloat = 5.118281745910645 /* initializer type: double */ /* constant value 5.118281745910645 */;
+
+  public static final double e = 2.7182818284 /* initializer type: double */ /* constant value 2.7182818284 */;
+
+  public static final float eFloat = 2.7182817f /* initializer type: float */ /* constant value 2.7182817 */;
+
+  public static final int one = 1 /* initializer type: int */ /* constant value 1 */;
+
+  public static final long complexLong = 2L /* initializer type: long */ /* constant value 2 */;
+
+  public static final long oneLong = 1L /* initializer type: long */ /* constant value 1 */;
+
+  public  ClassWithConstContainer();//  .ctor()
+
+  class Companion ...
+}
+
 public static final class Companion /* C.Companion*/ {
   @kotlin.jvm.JvmStatic()
   @org.jetbrains.annotations.NotNull()
@@ -57,52 +90,16 @@ public static final class Companion /* C.Companion*/ {
   public final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);//  setX(java.lang.String)
 }
 
-public static final class Factory /* C.Factory*/ {
-  private  Factory();//  .ctor()
-}
-
-public final class C1 /* C1*/ {
-  @org.jetbrains.annotations.NotNull()
-  private static final C1.Companion Companion;
-
-  public  C1();//  .ctor()
-
-  class Companion ...
-}
-
 private static final class Companion /* C1.Companion*/ {
   private  Companion();//  .ctor()
 }
 
-public abstract interface I /* I*/ {
-  @org.jetbrains.annotations.NotNull()
-  public static final I.Companion Companion;
-
-  class Companion ...
-}
-
 public static final class Companion /* I.Companion*/ {
   private  Companion();//  .ctor()
 }
 
-public final class Obj /* Obj*/ implements java.lang.Runnable {
-  @org.jetbrains.annotations.NotNull()
-  private static java.lang.String x;
-
-  @org.jetbrains.annotations.NotNull()
-  public static final Obj INSTANCE;
-
-  @kotlin.jvm.JvmStatic()
-  public static final int zoo();//  zoo()
-
-  @org.jetbrains.annotations.NotNull()
-  public static final java.lang.String getX();//  getX()
-
-  private  Obj();//  .ctor()
-
-  public static final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);//  setX(java.lang.String)
-
-  public void run();//  run()
+public static final class Companion /* ClassWithConstContainer.Companion*/ {
+  private  Companion();//  .ctor()
 }
 
 public final class ConstContainer /* ConstContainer*/ {
@@ -127,30 +124,33 @@ public final class ConstContainer /* ConstContainer*/ {
   private  ConstContainer();//  .ctor()
 }
 
-public final class ClassWithConstContainer /* ClassWithConstContainer*/ {
+public static final class Factory /* C.Factory*/ {
+  private  Factory();//  .ctor()
+}
+
+public abstract interface I /* I*/ {
   @org.jetbrains.annotations.NotNull()
-  public static final ClassWithConstContainer.Companion Companion;
-
-  @org.jetbrains.annotations.NotNull()
-  public static final java.lang.String str = "one" /* initializer type: java.lang.String */ /* constant value one */;
-
-  public static final double complexFloat = 5.118281745910645 /* initializer type: double */ /* constant value 5.118281745910645 */;
-
-  public static final double e = 2.7182818284 /* initializer type: double */ /* constant value 2.7182818284 */;
-
-  public static final float eFloat = 2.7182817f /* initializer type: float */ /* constant value 2.7182817 */;
-
-  public static final int one = 1 /* initializer type: int */ /* constant value 1 */;
-
-  public static final long complexLong = 2L /* initializer type: long */ /* constant value 2 */;
-
-  public static final long oneLong = 1L /* initializer type: long */ /* constant value 1 */;
-
-  public  ClassWithConstContainer();//  .ctor()
+  public static final I.Companion Companion;
 
   class Companion ...
 }
 
-public static final class Companion /* ClassWithConstContainer.Companion*/ {
-  private  Companion();//  .ctor()
+public final class Obj /* Obj*/ implements java.lang.Runnable {
+  @org.jetbrains.annotations.NotNull()
+  private static java.lang.String x;
+
+  @org.jetbrains.annotations.NotNull()
+  public static final Obj INSTANCE;
+
+  @kotlin.jvm.JvmStatic()
+  public static final int zoo();//  zoo()
+
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String getX();//  getX()
+
+  private  Obj();//  .ctor()
+
+  public static final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);//  setX(java.lang.String)
+
+  public void run();//  run()
 }
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.java
index 0d251a89784..7d9531d132d 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.java
@@ -1,3 +1,23 @@
+public abstract interface A /* A*/ {
+  protected abstract int getInt1();//  getInt1()
+
+  public abstract int getInt2();//  getInt2()
+
+  public abstract void setInt2$light_idea_test_case(int);//  setInt2$light_idea_test_case(int)
+}
+
+public static final class Companion /* Foo.Companion*/ {
+  private  Companion();//  .ctor()
+
+  public final int getF1();//  getF1()
+
+  public final int getProp3();//  getProp3()
+
+  public final int getProp7();//  getProp7()
+
+  public final void setProp7(int);//  setProp7(int)
+}
+
 public final class Foo /* Foo*/ {
   @org.jetbrains.annotations.NotNull()
   private final Foo b;
@@ -190,42 +210,6 @@ D'E"F\G$H */;
   class Companion ...
 }
 
-public static final class Companion /* Foo.Companion*/ {
-  private  Companion();//  .ctor()
-
-  public final int getF1();//  getF1()
-
-  public final int getProp3();//  getProp3()
-
-  public final int getProp7();//  getProp7()
-
-  public final void setProp7(int);//  setProp7(int)
-}
-
-public final class MyProperty /* MyProperty*/<T>  {
-  public  MyProperty();//  .ctor()
-
-  public final int getValue(T, @org.jetbrains.annotations.NotNull() kotlin.reflect.KProperty<?>);//  getValue(T, kotlin.reflect.KProperty<?>)
-
-  public final void setValue(T, @org.jetbrains.annotations.NotNull() kotlin.reflect.KProperty<?>, int);//  setValue(T, kotlin.reflect.KProperty<?>, int)
-}
-
-public final class Modifiers /* Modifiers*/ {
-  private final int plainField;
-
-  public  Modifiers();//  .ctor()
-
-  public final int getPlainField();//  getPlainField()
-}
-
-public abstract interface A /* A*/ {
-  protected abstract int getInt1();//  getInt1()
-
-  public abstract int getInt2();//  getInt2()
-
-  public abstract void setInt2$light_idea_test_case(int);//  setInt2$light_idea_test_case(int)
-}
-
 public final class Foo /* Foo*/ {
   @org.jetbrains.annotations.NotNull()
   public final Foo getFoo();//  getFoo()
@@ -238,3 +222,19 @@ public final class Foo /* Foo*/ {
 
   public  Foo();//  .ctor()
 }
+
+public final class Modifiers /* Modifiers*/ {
+  private final int plainField;
+
+  public  Modifiers();//  .ctor()
+
+  public final int getPlainField();//  getPlainField()
+}
+
+public final class MyProperty /* MyProperty*/<T>  {
+  public  MyProperty();//  .ctor()
+
+  public final int getValue(T, @org.jetbrains.annotations.NotNull() kotlin.reflect.KProperty<?>);//  getValue(T, kotlin.reflect.KProperty<?>)
+
+  public final void setValue(T, @org.jetbrains.annotations.NotNull() kotlin.reflect.KProperty<?>, int);//  setValue(T, kotlin.reflect.KProperty<?>, int)
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.java
index ae855acb048..cf1cc3134dd 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.java
@@ -1,11 +1,3 @@
-public class InnerClasses /* InnerClasses*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
-  public  InnerClasses(java.lang.String[]);//  .ctor(java.lang.String[])
-
-  public static final void main(java.lang.String[]);//  main(java.lang.String[])
-
-  class Bar ...
-}
-
 public static final class Bar /* InnerClasses.Bar*/ {
   private final int a;
 
@@ -27,3 +19,11 @@ public static final class Baz /* InnerClasses.Bar.Baz*/ {
 
   public final void doSomething();//  doSomething()
 }
+
+public class InnerClasses /* InnerClasses*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
+  public  InnerClasses(java.lang.String[]);//  .ctor(java.lang.String[])
+
+  public static final void main(java.lang.String[]);//  main(java.lang.String[])
+
+  class Bar ...
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.fir.java
index 6a741b15d05..32d785bd198 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.fir.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.fir.java
@@ -1,7 +1,3 @@
-public final class MyException /* MyException*/ extends java.lang.Exception {
-  public  MyException();//  .ctor()
-}
-
 public final class C /* C*/ {
   @kotlin.jvm.Throws(exceptionClasses = {java.io.IOException.class, MyException.class})
   @org.jetbrains.annotations.NotNull()
@@ -15,3 +11,7 @@ public final class C /* C*/ {
 
   public  C();//  .ctor()
 }
+
+public final class MyException /* MyException*/ extends java.lang.Exception {
+  public  MyException();//  .ctor()
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.java
index e7d4a93de83..1010244c3aa 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.java
@@ -1,7 +1,3 @@
-public final class MyException /* MyException*/ extends java.lang.Exception {
-  public  MyException();//  .ctor()
-}
-
 public final class C /* C*/ {
   @kotlin.jvm.Throws(exceptionClasses = {java.io.IOException.class, MyException.class})
   @org.jetbrains.annotations.NotNull()
@@ -16,3 +12,7 @@ public final class C /* C*/ {
   @kotlin.jvm.Throws(exceptionClasses = {kotlin.Throwable.class})
   public final void baz() throws java.lang.Throwable;//  baz()
 }
+
+public final class MyException /* MyException*/ extends java.lang.Exception {
+  public  MyException();//  .ctor()
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.lib.java
index de20107f6cc..e9cf67d8904 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.lib.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.lib.java
@@ -1,7 +1,3 @@
-public final class MyException /* MyException*/ extends java.lang.Exception {
-  public  MyException();//  .ctor()
-}
-
 public final class C /* C*/ {
   @org.jetbrains.annotations.NotNull()
   public final java.lang.String readFile(@org.jetbrains.annotations.NotNull() java.lang.String) throws java.io.IOException, MyException;//  readFile(java.lang.String)
@@ -12,3 +8,7 @@ public final class C /* C*/ {
 
   public final void baz() throws java.lang.Throwable;//  baz()
 }
+
+public final class MyException /* MyException*/ extends java.lang.Exception {
+  public  MyException();//  .ctor()
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.lib.java
deleted file mode 100644
index e23382798d4..00000000000
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.lib.java
+++ /dev/null
@@ -1,18 +0,0 @@
-public final class TypeAliasesKt /* TypeAliasesKt*/ {
-}
-
-public final class O /* O*/ {
-  @org.jetbrains.annotations.NotNull()
-  public static final O INSTANCE;
-
-  @kotlin.jvm.JvmOverloads()
-  public final void foo();//  foo()
-
-  @kotlin.jvm.JvmOverloads()
-  public final void foo(int);//  foo(int)
-
-  @kotlin.jvm.JvmOverloads()
-  public final void foo(int, @org.jetbrains.annotations.NotNull() java.lang.String);//  foo(int, java.lang.String)
-
-  private  O();//  .ctor()
-}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.fir.java
similarity index 77%
rename from compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.lib.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.fir.java
index bc179ecdb76..bf08dad7c83 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.lib.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.fir.java
@@ -1,23 +1,3 @@
-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 Inv /* Inv*/<E>  {
-  public  Inv();//  .ctor()
-}
-
 public final class Container /* Container*/ {
   @org.jetbrains.annotations.NotNull()
   public final In<Final> notDeepIn();//  notDeepIn()
@@ -31,14 +11,14 @@ public final class Container /* Container*/ {
   @org.jetbrains.annotations.NotNull()
   public final Inv<OutPair<Open, Out<Out<Open>>>> skipAllOutInvWildcards();//  skipAllOutInvWildcards()
 
+  @org.jetbrains.annotations.NotNull()
+  public final Out<In<Out<? extends Final>>> skipWildcardsUntilIn1();//  skipWildcardsUntilIn1()
+
   @org.jetbrains.annotations.NotNull()
   public final Out<In<Out<? extends Open>>> skipWildcardsUntilIn0();//  skipWildcardsUntilIn0()
 
   @org.jetbrains.annotations.NotNull()
-  public final Out<In<Out<Final>>> skipWildcardsUntilIn1();//  skipWildcardsUntilIn1()
-
-  @org.jetbrains.annotations.NotNull()
-  public final Out<In<OutPair<Final, ? extends Out<? extends Open>>>> skipWildcardsUntilIn2();//  skipWildcardsUntilIn2()
+  public final Out<In<OutPair<? extends Final, ? extends Out<? extends Open>>>> skipWildcardsUntilIn2();//  skipWildcardsUntilIn2()
 
   public  Container();//  .ctor()
 
@@ -48,29 +28,29 @@ public final class Container /* Container*/ {
 
   public final void arrayOfOutOpen(@org.jetbrains.annotations.NotNull() Out<Open>[]);//  arrayOfOutOpen(Out<Open>[])
 
-  public final void deepFinal(@org.jetbrains.annotations.NotNull() Out<Out<Out<Final>>>);//  deepFinal(Out<Out<Out<Final>>>)
+  public final void deepFinal(@org.jetbrains.annotations.NotNull() Out<? extends Out<? extends Out<? extends Final>>>);//  deepFinal(Out<? extends Out<? extends Out<? extends Final>>>)
 
   public final void deepOpen(@org.jetbrains.annotations.NotNull() Out<? extends Out<? extends Out<? extends Open>>>);//  deepOpen(Out<? extends Out<? extends Out<? extends Open>>>)
 
-  public final void finalClassArgument(@org.jetbrains.annotations.NotNull() Out<Final>, @org.jetbrains.annotations.NotNull() In<? super Final>);//  finalClassArgument(Out<Final>, In<? super Final>)
+  public final void finalClassArgument(@org.jetbrains.annotations.NotNull() Out<? extends Final>, @org.jetbrains.annotations.NotNull() In<? super Final>);//  finalClassArgument(Out<? extends Final>, In<? super Final>)
 
   public final void inAny(@org.jetbrains.annotations.NotNull() In<java.lang.Object>);//  inAny(In<java.lang.Object>)
 
   public final void inFinal(@org.jetbrains.annotations.NotNull() In<? super Final>);//  inFinal(In<? super Final>)
 
-  public final void inOutFinal(@org.jetbrains.annotations.NotNull() In<? super Out<Final>>);//  inOutFinal(In<? super Out<Final>>)
+  public final void inOutFinal(@org.jetbrains.annotations.NotNull() In<? super Out<? extends Final>>);//  inOutFinal(In<? super Out<? extends Final>>)
 
   public final void invFinal(@org.jetbrains.annotations.NotNull() Inv<Final>);//  invFinal(Inv<Final>)
 
   public final void invIn(@org.jetbrains.annotations.NotNull() Out<? extends Inv<? super Final>>);//  invIn(Out<? extends Inv<? super Final>>)
 
-  public final void invInAny(@org.jetbrains.annotations.NotNull() Out<Inv<? super java.lang.Object>>);//  invInAny(Out<Inv<? super java.lang.Object>>)
+  public final void invInAny(@org.jetbrains.annotations.NotNull() Out<? extends Inv<? super java.lang.Object>>);//  invInAny(Out<? extends Inv<? super java.lang.Object>>)
 
-  public final void invInOutFinal(@org.jetbrains.annotations.NotNull() Inv<In<Out<Final>>>);//  invInOutFinal(Inv<In<Out<Final>>>)
+  public final void invInOutFinal(@org.jetbrains.annotations.NotNull() Inv<In<Out<? extends Final>>>);//  invInOutFinal(Inv<In<Out<? extends Final>>>)
 
   public final void invInOutOpen(@org.jetbrains.annotations.NotNull() Inv<In<Out<? extends Open>>>);//  invInOutOpen(Inv<In<Out<? extends Open>>>)
 
-  public final void invInv(@org.jetbrains.annotations.NotNull() Out<Inv<Open>>);//  invInv(Out<Inv<Open>>)
+  public final void invInv(@org.jetbrains.annotations.NotNull() Out<? extends Inv<Open>>);//  invInv(Out<? extends Inv<Open>>)
 
   public final void invOpen(@org.jetbrains.annotations.NotNull() Inv<Open>);//  invOpen(Inv<Open>)
 
@@ -78,19 +58,19 @@ public final class Container /* Container*/ {
 
   public final void invOutFinal(@org.jetbrains.annotations.NotNull() Inv<Out<Final>>);//  invOutFinal(Inv<Out<Final>>)
 
-  public final void invOutFinal(@org.jetbrains.annotations.NotNull() Out<Inv<? extends Final>>);//  invOutFinal(Out<Inv<? extends Final>>)
+  public final void invOutFinal(@org.jetbrains.annotations.NotNull() Out<? extends Inv<? extends Final>>);//  invOutFinal(Out<? extends Inv<? extends Final>>)
 
   public final void invOutOpen(@org.jetbrains.annotations.NotNull() Inv<Out<Open>>);//  invOutOpen(Inv<Out<Open>>)
 
-  public final void invOutProjectedOutFinal(@org.jetbrains.annotations.NotNull() Inv<? extends Out<Final>>);//  invOutProjectedOutFinal(Inv<? extends Out<Final>>)
+  public final void invOutProjectedOutFinal(@org.jetbrains.annotations.NotNull() Inv<? extends Out<? extends Final>>);//  invOutProjectedOutFinal(Inv<? extends Out<? extends Final>>)
 
-  public final void oneArgumentFinal(@org.jetbrains.annotations.NotNull() OutPair<Final, ? extends Open>);//  oneArgumentFinal(OutPair<Final, ? extends Open>)
+  public final void oneArgumentFinal(@org.jetbrains.annotations.NotNull() OutPair<? extends Final, ? extends Open>);//  oneArgumentFinal(OutPair<? extends Final, ? extends Open>)
 
   public 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 final void outIn(@org.jetbrains.annotations.NotNull() Out<? extends In<? super Final>>);//  outIn(Out<? extends In<? super Final>>)
 
-  public final void outInAny(@org.jetbrains.annotations.NotNull() Out<In<java.lang.Object>>);//  outInAny(Out<In<java.lang.Object>>)
+  public final void outInAny(@org.jetbrains.annotations.NotNull() Out<? extends In<java.lang.Object>>);//  outInAny(Out<? extends In<java.lang.Object>>)
 
   public final void outOfArrayOpen(@org.jetbrains.annotations.NotNull() Out<Open[]>);//  outOfArrayOpen(Out<Open[]>)
 
@@ -100,3 +80,23 @@ public final class Container /* Container*/ {
 public final class Final /* Final*/ {
   public  Final();//  .ctor()
 }
+
+public final class In /* In*/<Z>  {
+  public  In();//  .ctor()
+}
+
+public final class Inv /* Inv*/<E>  {
+  public  Inv();//  .ctor()
+}
+
+public class Open /* Open*/ {
+  public  Open();//  .ctor()
+}
+
+public final class Out /* Out*/<T>  {
+  public  Out();//  .ctor()
+}
+
+public final class OutPair /* OutPair*/<Final, Y>  {
+  public  OutPair();//  .ctor()
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.java
index 0bc29c9fe4c..203e774fb54 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.java
@@ -1,27 +1,3 @@
-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 Container /* Container*/ {
   @org.jetbrains.annotations.NotNull()
   public final In<Final> notDeepIn();//  notDeepIn()
@@ -100,3 +76,27 @@ public final class Container /* Container*/ {
 
   public final void outOfArrayOutOpen(@org.jetbrains.annotations.NotNull() Out<? extends Open[]>);//  outOfArrayOutOpen(Out<? extends Open[]>)
 }
+
+public final class Final /* Final*/ {
+  public  Final();//  .ctor()
+}
+
+public final class In /* In*/<Z>  {
+  public  In();//  .ctor()
+}
+
+public final class Inv /* Inv*/<E>  {
+  public  Inv();//  .ctor()
+}
+
+public class Open /* Open*/ {
+  public  Open();//  .ctor()
+}
+
+public final class Out /* Out*/<T>  {
+  public  Out();//  .ctor()
+}
+
+public final class OutPair /* OutPair*/<Final, Y>  {
+  public  OutPair();//  .ctor()
+}