diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.fir.java
new file mode 100644
index 00000000000..c805751c67e
--- /dev/null
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.fir.java
@@ -0,0 +1,100 @@
+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;
+
+  @org.jetbrains.annotations.NotNull()
+  public static final AbstractKotlinClass.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  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)
+
+}
+
+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)
+
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.java
index c805751c67e..9c21c3cc338 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.java
@@ -1,12 +1,11 @@
 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 companionLateinitStaticVariable;
+
   public static Custom companionLateinitVariable;
 
   @org.jetbrains.annotations.NotNull()
@@ -42,14 +41,13 @@ public static final class Companion /* KotlinClass.Companion*/ {
 }
 
 public abstract class AbstractKotlinClass /* AbstractKotlinClass*/ {
-  @kotlin.jvm.JvmStatic()
-  public static Custom companionLateinitStaticVariable;
-
   @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()
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.java
index b0f6722ec29..dd31e4afb19 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.java
@@ -38,7 +38,7 @@ public abstract @interface AnnoWithCompanion /* AnnoWithCompanion*/ {
 
 
   class Companion ...
-  
+
   }
 
 public static final class Companion /* AnnoWithCompanion.Companion*/ {
@@ -130,7 +130,7 @@ public final class Foo /* Foo*/ {
 
 }
 
-@Ann(arg1 = String::class, arg2 = Int::class)
+@Ann(arg1 = kotlin.String.class, arg2 = kotlin.Int.class)
 public final class MyClass /* MyClass*/ {
   public  MyClass();//  .ctor()
 
@@ -159,4 +159,27 @@ 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)
 
-}
\ No newline at end of file
+}
+
+public final class CtorAnnotations /* CtorAnnotations*/ {
+  @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)
+
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.java
index 7bbedfb4424..e289a438453 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.java
@@ -3,8 +3,8 @@ public final class TestConstructor /* TestConstructor*/ {
 
 }
 
-public final class A /* A*/ {
-  public  A(@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 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>)
 
 }
 
@@ -17,9 +17,9 @@ public final class Outer /* Outer*/ {
 
 
   class Inner ...
-  
+
     class Nested ...
-  
+
   }
 
 public final class Inner /* Outer.Inner*/ {
@@ -41,14 +41,25 @@ public abstract class A /* A*/ {
   @org.jetbrains.annotations.Nullable()
   public final java.lang.String getX();//  getX()
 
-  private  A(@org.jetbrains.annotations.Nullable() java.lang.String);//  .ctor(java.lang.String)
+  protected  A(@org.jetbrains.annotations.Nullable() java.lang.String);//  .ctor(java.lang.String)
 
 
   class C ...
-  
+
   }
 
 public static final class C /* A.C*/ extends A {
   public  C();//  .ctor()
 
-}
\ No newline at end of file
+}
+
+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>)
+
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.java
index f669caab980..18a54ad8374 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.java
@@ -1,5 +1,6 @@
 public final class InlineOnlyKt /* InlineOnlyKt*/ {
+  @kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"})
   @kotlin.internal.InlineOnly()
   private static final void foo();//  foo()
 
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.lib.java
new file mode 100644
index 00000000000..9aa25ce62fb
--- /dev/null
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.lib.java
@@ -0,0 +1,5 @@
+public final class InlineOnlyKt /* InlineOnlyKt*/ {
+  @kotlin.internal.InlineOnly()
+  private static final void foo();//  foo()
+
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.java
index 0eb595209f7..c67842b43c9 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.java
@@ -1,3 +1,33 @@
+public final class Inv /* Inv*/<E>  {
+  public  Inv();//  .ctor()
+
+}
+
+public final class Out /* Out*/<T>  {
+  public  Out();//  .ctor()
+
+}
+
+public final class OutPair /* OutPair*/<Final, Y>  {
+  public  OutPair();//  .ctor()
+
+}
+
+public final class In /* In*/<Z>  {
+  public  In();//  .ctor()
+
+}
+
+public final class Final /* Final*/ {
+  public  Final();//  .ctor()
+
+}
+
+public class Open /* Open*/ {
+  public  Open();//  .ctor()
+
+}
+
 public final class JvmWildcardAnnotationsKt /* JvmWildcardAnnotationsKt*/ {
   @kotlin.jvm.JvmSuppressWildcards(suppress = false)
   @org.jetbrains.annotations.NotNull()
@@ -30,4 +60,4 @@ public final class JvmWildcardAnnotationsKt /* JvmWildcardAnnotationsKt*/ {
 
   public static final void simpleOut(@org.jetbrains.annotations.NotNull() Out<? extends Final>);//  simpleOut(Out<? extends Final>)
 
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.java
index f91a4210efa..486e106329a 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.java
@@ -1,9 +1,14 @@
+public final class MyException /* MyException*/ extends java.lang.Exception {
+  public  MyException();//  .ctor()
+
+}
+
 public final class ThrowsAnnotationKt /* ThrowsAnnotationKt*/ {
-  @kotlin.jvm.Throws(exceptionClasses = {java.io.IOException::class, MyException::class})
+  @kotlin.jvm.Throws(exceptionClasses = {java.io.IOException.class, MyException.class})
   @org.jetbrains.annotations.NotNull()
   public static final java.lang.String readFile(@org.jetbrains.annotations.NotNull() java.lang.String) throws java.io.IOException, MyException;//  readFile(java.lang.String)
 
-  @kotlin.jvm.Throws(exceptionClasses = {kotlin.Throwable::class})
+  @kotlin.jvm.Throws(exceptionClasses = {kotlin.Throwable.class})
   public static final void baz() throws java.lang.Throwable;//  baz()
 
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineOnly.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineOnly.java
index 0d728d6323b..72bf1daf503 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineOnly.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineOnly.java
@@ -1,7 +1,8 @@
 public final class A /* A*/ {
+  @kotlin.Suppress(names = {"INVISIBLE_REFERENCE", "INVISIBLE_MEMBER"})
   @kotlin.internal.InlineOnly()
   private final void foo();//  foo()
 
   public  A();//  .ctor()
 
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineOnly.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineOnly.lib.java
similarity index 64%
rename from compiler/testData/asJava/lightClasses/lightClassByPsi/inlineOnly.fir.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/inlineOnly.lib.java
index 72bf1daf503..4135c12d86f 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineOnly.fir.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineOnly.lib.java
@@ -1,5 +1,4 @@
 public final class A /* A*/ {
-  @kotlin.Suppress(names = {"INVISIBLE_REFERENCE", "INVISIBLE_MEMBER"})
   @kotlin.internal.InlineOnly()
   private final void foo();//  foo()
 
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmOverloads.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmOverloads.fir.java
similarity index 98%
rename from compiler/testData/asJava/lightClasses/lightClassByPsi/jvmOverloads.lib.java
rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmOverloads.fir.java
index 6afcd8b40ad..e739967e9b8 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmOverloads.lib.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmOverloads.fir.java
@@ -8,7 +8,7 @@ public final class C /* C*/ {
   @org.jetbrains.annotations.Nullable()
   private final java.lang.String type;
 
-  private final boolean p1;
+  private final boolean p1 = false /* initializer type: boolean */;
 
   @kotlin.jvm.JvmOverloads()
   @kotlin.jvm.JvmStatic()
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmOverloads.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmOverloads.java
index e739967e9b8..6afcd8b40ad 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmOverloads.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmOverloads.java
@@ -8,7 +8,7 @@ public final class C /* C*/ {
   @org.jetbrains.annotations.Nullable()
   private final java.lang.String type;
 
-  private final boolean p1 = false /* initializer type: boolean */;
+  private final boolean p1;
 
   @kotlin.jvm.JvmOverloads()
   @kotlin.jvm.JvmStatic()
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.fir.java
new file mode 100644
index 00000000000..8590f322330
--- /dev/null
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.fir.java
@@ -0,0 +1,38 @@
+public final class MyClass /* MyClass*/ {
+  @org.jetbrains.annotations.NotNull()
+  private static java.lang.String prop2 = "" /* initializer type: java.lang.String */;
+
+  @org.jetbrains.annotations.NotNull()
+  public static final MyClass.Companion Companion;
+
+  private static int prop = 4 /* initializer type: int */;
+
+  @kotlin.jvm.JvmStatic()
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String getProp2();//  getProp2()
+
+  @kotlin.jvm.JvmStatic()
+  public static final void setProp(int);//  setProp(int)
+
+  public  MyClass();//  .ctor()
+
+
+  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 8590f322330..855bee24765 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.java
@@ -1,12 +1,10 @@
 public final class MyClass /* MyClass*/ {
   @org.jetbrains.annotations.NotNull()
-  private static java.lang.String prop2 = "" /* initializer type: java.lang.String */;
+  private static java.lang.String prop2;
 
   @org.jetbrains.annotations.NotNull()
   public static final MyClass.Companion Companion;
 
-  private static int prop = 4 /* initializer type: int */;
-
   @kotlin.jvm.JvmStatic()
   @org.jetbrains.annotations.NotNull()
   public static final java.lang.String getProp2();//  getProp2()
@@ -16,6 +14,8 @@ public final class MyClass /* MyClass*/ {
 
   public  MyClass();//  .ctor()
 
+  public static final void setProp2(@org.jetbrains.annotations.NotNull() java.lang.String);//  setProp2(java.lang.String)
+
 
   class Companion ...
 
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.java
index ccdfb7162d7..2034247ee01 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.java
@@ -1,8 +1,6 @@
 public final class A /* A*/ {
   private int z;
 
-  public A f;
-
   public  A();//  .ctor()
 
   public final int getX();//  getX()
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.lib.java
new file mode 100644
index 00000000000..ccdfb7162d7
--- /dev/null
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.lib.java
@@ -0,0 +1,14 @@
+public final class A /* A*/ {
+  private int z;
+
+  public A f;
+
+  public  A();//  .ctor()
+
+  public final int getX();//  getX()
+
+  public final void setF(@org.jetbrains.annotations.NotNull() A);//  setF(A)
+
+  public final void setX(int);//  setX(int)
+
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/lateinitProperty.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/lateinitProperty.java
index efe5b40c591..26148a0aace 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/lateinitProperty.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/lateinitProperty.java
@@ -91,4 +91,4 @@ public class D /* D*/ {
 
   public  D();//  .ctor()
 
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.java
index 5e377974013..5e3dc00cb7a 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.java
@@ -28,9 +28,9 @@ public final class C /* C*/ {
 
 
   class Companion ...
-  
+
     class Factory ...
-  
+
   }
 
 public static final class Companion /* C.Companion*/ {
@@ -67,13 +67,14 @@ public static final class Factory /* C.Factory*/ {
 }
 
 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*/ {
@@ -87,7 +88,7 @@ public abstract interface I /* I*/ {
 
 
   class Companion ...
-  
+
   }
 
 public static final class Companion /* I.Companion*/ {
@@ -162,10 +163,10 @@ public final class ClassWithConstContainer /* ClassWithConstContainer*/ {
 
 
   class Companion ...
-  
+
   }
 
 public static final class Companion /* ClassWithConstContainer.Companion*/ {
   private  Companion();//  .ctor()
 
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.java
index d2a5afba7ca..f40492f02de 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.java
@@ -2,15 +2,24 @@ public final class Foo /* Foo*/ {
   @org.jetbrains.annotations.NotNull()
   private final Foo b;
 
+  @org.jetbrains.annotations.NotNull()
+  private final MyProperty delegatedProp2$delegate;
+
   @org.jetbrains.annotations.NotNull()
   private final java.lang.Object arrayConst;
 
   @org.jetbrains.annotations.NotNull()
   private final kotlin.jvm.functions.Function1<java.lang.Integer, java.lang.Integer> sum;
 
+  @org.jetbrains.annotations.NotNull()
+  private java.lang.Object privateVarWithGet;
+
   @org.jetbrains.annotations.NotNull()
   private java.lang.String name;
 
+  @org.jetbrains.annotations.NotNull()
+  private java.lang.String noAccessors;
+
   @org.jetbrains.annotations.NotNull()
   private java.lang.String protectedWithPrivateSet;
 
@@ -43,8 +52,6 @@ public final class Foo /* Foo*/ {
 
   private final error.NonExistentClass delegatedProp$delegate;
 
-  private final error.NonExistentClass delegatedProp2$delegate;
-
   private final error.NonExistentClass lazyProp$delegate;
 
   private final error.NonExistentClass privateDelegated$delegate;
@@ -63,12 +70,8 @@ public final class Foo /* Foo*/ {
 
   private int privateVarWithPrivateSet;
 
-  private java.lang.Object privateVarWithGet;
-
   private java.lang.String internalVarPrivateSet;
 
-  private java.lang.String noAccessors;
-
   private static final error.NonExistentClass contextBean;
 
   private static final int f1;
@@ -186,7 +189,7 @@ public final class Foo /* Foo*/ {
 
 
   class Companion ...
-  
+
   }
 
 public static final class Companion /* Foo.Companion*/ {
@@ -227,4 +230,18 @@ public abstract interface A /* A*/ {
 
   public abstract void setInt2$light_idea_test_case(int);//  setInt2$light_idea_test_case(int)
 
-}
\ No newline at end of file
+}
+
+public final class Foo /* Foo*/ {
+  @org.jetbrains.annotations.NotNull()
+  public final Foo getFoo();//  getFoo()
+
+  @org.jetbrains.annotations.NotNull()
+  public final Foo getFoo2();//  getFoo2()
+
+  @org.jetbrains.annotations.NotNull()
+  public final Foo getMeNonNullFoo();//  getMeNonNullFoo()
+
+  public  Foo();//  .ctor()
+
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/script.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/script.fir.java
new file mode 100644
index 00000000000..1e1bc72eb77
--- /dev/null
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/script.fir.java
@@ -0,0 +1 @@
+// NOT_GENERATED
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/script.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/script.java
index 1e1bc72eb77..8b137891791 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/script.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/script.java
@@ -1 +1 @@
-// NOT_GENERATED
+
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/simpleFunctions.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/simpleFunctions.java
index 50ae6148ae6..43d5a3d6845 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/simpleFunctions.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/simpleFunctions.java
@@ -12,7 +12,7 @@ public final class Foo /* Foo*/ {
 
   public  Foo();//  .ctor()
 
-  public final /* vararg */ void nullableVararg(@org.jetbrains.annotations.NotNull() java.lang.Object...);//  nullableVararg(java.lang.Object[])
+  public final /* vararg */ void nullableVararg(@org.jetbrains.annotations.Nullable() java.lang.Object...);//  nullableVararg(java.lang.Object[])
 
   public final int bar4();//  bar4()
 
@@ -22,10 +22,10 @@ public final class Foo /* Foo*/ {
 
 
   class Inner ...
-  
+
   }
 
 public static final class Inner /* Foo.Inner*/ {
   public  Inner();//  .ctor()
 
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.java
index 7038f73c29a..41269c2413d 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.java
@@ -4,17 +4,17 @@ public final class MyException /* MyException*/ extends java.lang.Exception {
 }
 
 public final class C /* C*/ {
-  @kotlin.jvm.Throws(exceptionClasses = {Exception::class})
-  public  C() throws java.lang.Exception;//  .ctor()
-
-  @kotlin.jvm.Throws(exceptionClasses = {Exception::class})
-  public  C(int) throws java.lang.Exception;//  .ctor(int)
-
-  @kotlin.jvm.Throws(exceptionClasses = {java.io.IOException::class, MyException::class})
+  @kotlin.jvm.Throws(exceptionClasses = {java.io.IOException.class, MyException.class})
   @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)
 
-  @kotlin.jvm.Throws(exceptionClasses = {kotlin.Throwable::class})
+  @kotlin.jvm.Throws(exceptionClasses = {java.lang.Exception.class})
+  public  C() throws java.lang.Exception;//  .ctor()
+
+  @kotlin.jvm.Throws(exceptionClasses = {java.lang.Exception.class})
+  public  C(int) throws java.lang.Exception;//  .ctor(int)
+
+  @kotlin.jvm.Throws(exceptionClasses = {kotlin.Throwable.class})
   public final void baz() throws java.lang.Throwable;//  baz()
 
-}
\ No newline at end of file
+}