diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTestBase.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTestBase.kt
index af761e5ea3c..0feec4a2360 100644
--- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTestBase.kt
+++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTestBase.kt
@@ -5,12 +5,9 @@
 
 package org.jetbrains.kotlin.light.classes.symbol.base
 
-import com.intellij.mock.MockApplication
-import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiClass
 import com.intellij.psi.search.GlobalSearchScope
-import com.intellij.util.pico.DefaultPicoContainer
 import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedSingleModuleTest
 import org.jetbrains.kotlin.analysis.test.framework.services.libraries.CompiledLibraryProvider
 import org.jetbrains.kotlin.analysis.test.framework.services.libraries.CompilerExecutor
@@ -19,10 +16,10 @@ import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
 import org.jetbrains.kotlin.light.classes.symbol.base.service.NullabilityAnnotationSourceProvider
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
+import org.jetbrains.kotlin.test.directives.ConfigurationDirectives
 import org.jetbrains.kotlin.test.directives.model.DirectiveApplicability
 import org.jetbrains.kotlin.test.directives.model.SimpleDirectivesContainer
 import org.jetbrains.kotlin.test.model.TestModule
-import org.jetbrains.kotlin.test.services.TestModuleStructure
 import org.jetbrains.kotlin.test.services.TestServices
 import org.jetbrains.kotlin.test.services.assertions
 import org.jetbrains.kotlin.test.services.service
@@ -42,6 +39,9 @@ abstract class AbstractSymbolLightClassesTestBase(
             useAdditionalServices(service(::CompiledLibraryProvider))
             useDirectives(Directives, CompilerExecutor.Directives)
             useAdditionalSourceProviders(::NullabilityAnnotationSourceProvider)
+            defaultDirectives {
+                +ConfigurationDirectives.WITH_STDLIB
+            }
         }
     }
 
diff --git a/compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.fir.java b/compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.fir.java
index 8a05a6c7417..f708ef4ee6c 100644
--- a/compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.fir.java
+++ b/compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.fir.java
@@ -1,4 +1,4 @@
-public final class SmartSet /* SmartSet*/<T>  implements kotlin.collections.MutableSet<T> {
+public final class SmartSet /* SmartSet*/<T>  extends kotlin.collections.AbstractSet<T> implements kotlin.collections.MutableSet<T> {
   @org.jetbrains.annotations.NotNull()
   public static final SmartSet.Companion Companion;
 
@@ -7,6 +7,14 @@ public final class SmartSet /* SmartSet*/<T>  implements kotlin.collections.Muta
 
   private int size;
 
+  @kotlin.jvm.JvmStatic()
+  @org.jetbrains.annotations.NotNull()
+  public static final <T> SmartSet<T> create();// <T>  create()
+
+  @kotlin.jvm.JvmStatic()
+  @org.jetbrains.annotations.NotNull()
+  public static final <T> SmartSet<T> create(@org.jetbrains.annotations.NotNull() java.util.Collection<? extends T>);// <T>  create(java.util.Collection<? extends T>)
+
   @org.jetbrains.annotations.NotNull()
   public java.util.Iterator<T> iterator();//  iterator()
 
@@ -24,11 +32,11 @@ public final class SmartSet /* SmartSet*/<T>  implements kotlin.collections.Muta
 public static final class Companion /* SmartSet.Companion*/ {
   private final int ARRAY_THRESHOLD;
 
-  @<error>()
+  @kotlin.jvm.JvmStatic()
   @org.jetbrains.annotations.NotNull()
   public final <T> SmartSet<T> create();// <T>  create()
 
-  @<error>()
+  @kotlin.jvm.JvmStatic()
   @org.jetbrains.annotations.NotNull()
   public final <T> SmartSet<T> create(@org.jetbrains.annotations.NotNull() java.util.Collection<? extends T>);// <T>  create(java.util.Collection<? extends T>)
 
diff --git a/compiler/testData/asJava/ultraLightClasses/annotations.fir.java b/compiler/testData/asJava/ultraLightClasses/annotations.fir.java
index 1758a2d43fc..cfba269408f 100644
--- a/compiler/testData/asJava/ultraLightClasses/annotations.fir.java
+++ b/compiler/testData/asJava/ultraLightClasses/annotations.fir.java
@@ -28,13 +28,8 @@ public abstract @interface AnnoWithCompanion /* AnnoWithCompanion*/ {
   }
 
 public static final class Companion /* AnnoWithCompanion.Companion*/ {
-  @<error>()
-  private final int x;
-
   private  Companion();//  .ctor()
 
-  public final int getX();//  getX()
-
   public final void foo();//  foo()
 
 }
diff --git a/compiler/testData/asJava/ultraLightClasses/generics.fir.java b/compiler/testData/asJava/ultraLightClasses/generics.fir.java
index c98d7b7fa44..8c27f677aaa 100644
--- a/compiler/testData/asJava/ultraLightClasses/generics.fir.java
+++ b/compiler/testData/asJava/ultraLightClasses/generics.fir.java
@@ -52,7 +52,7 @@ public abstract class C /* C*/<T>  {
 
   public  C(@org.jetbrains.annotations.NotNull() java.util.List<? extends java.lang.CharSequence>);//  .ctor(java.util.List<? extends java.lang.CharSequence>)
 
-  public final <V, U extends V> T foo(V, @org.jetbrains.annotations.NotNull() C<V>, error.NonExistentClass);// <V, U extends V>  foo(V, C<V>, error.NonExistentClass)
+  public final <V, U extends V> T foo(V, @org.jetbrains.annotations.NotNull() C<V>, @org.jetbrains.annotations.NotNull() kotlin.sequences.Sequence<? extends V>);// <V, U extends V>  foo(V, C<V>, kotlin.sequences.Sequence<? extends V>)
 
   public final Q getW(Q);//  getW(Q)
 
diff --git a/compiler/testData/asJava/ultraLightClasses/implementingKotlinCollections.fir.java b/compiler/testData/asJava/ultraLightClasses/implementingKotlinCollections.fir.java
index 79dd979497c..656a26eabc1 100644
--- a/compiler/testData/asJava/ultraLightClasses/implementingKotlinCollections.fir.java
+++ b/compiler/testData/asJava/ultraLightClasses/implementingKotlinCollections.fir.java
@@ -16,7 +16,7 @@ public abstract class MySet /* MySet*/<T>  implements ASet<T> {
 
 }
 
-public abstract class SmartSet /* SmartSet*/<T>  {
+public abstract class SmartSet /* SmartSet*/<T>  extends kotlin.collections.AbstractMutableSet<T> {
   @org.jetbrains.annotations.NotNull()
   public java.util.Iterator<T> iterator();//  iterator()
 
diff --git a/compiler/testData/asJava/ultraLightClasses/importAliases.fir.java b/compiler/testData/asJava/ultraLightClasses/importAliases.fir.java
deleted file mode 100644
index a9a8f58a0cd..00000000000
--- a/compiler/testData/asJava/ultraLightClasses/importAliases.fir.java
+++ /dev/null
@@ -1,10 +0,0 @@
-public final class O /* O*/ {
-  @org.jetbrains.annotations.NotNull()
-  public static final O INSTANCE;
-
-  @<error>()
-  public final void foo();//  foo()
-
-  private  O();//  .ctor()
-
-}
diff --git a/compiler/testData/asJava/ultraLightClasses/jvmField.fir.java b/compiler/testData/asJava/ultraLightClasses/jvmField.fir.java
index f07a42e93b9..898c6605188 100644
--- a/compiler/testData/asJava/ultraLightClasses/jvmField.fir.java
+++ b/compiler/testData/asJava/ultraLightClasses/jvmField.fir.java
@@ -1,45 +1,31 @@
 public final class A /* A*/ {
-  @<error>()
+  @kotlin.jvm.JvmField()
   @org.jetbrains.annotations.NotNull()
-  private final java.util.Collection<?> a;
+  public final java.util.Collection<?> a;
 
-  @<error>()
-  private int b;
+  @kotlin.jvm.JvmField()
+  @org.jetbrains.annotations.NotNull()
+  public static final java.util.Collection<?> c;
+
+  @kotlin.jvm.JvmField()
+  public int b;
+
+  @kotlin.jvm.JvmField()
+  public static int d;
 
   @org.jetbrains.annotations.NotNull()
   public static final A.Companion Companion;
 
-  @org.jetbrains.annotations.NotNull()
-  public final java.util.Collection<?> getA();//  getA()
-
   public  A();//  .ctor()
 
-  public final int getB();//  getB()
-
-  public final void setB(int);//  setB(int)
-
 
   class Companion ...
 
   }
 
 public static final class Companion /* A.Companion*/ {
-  @<error>()
-  @org.jetbrains.annotations.NotNull()
-  private final java.util.Collection<?> c;
-
-  @<error>()
-  private int d;
-
-  @org.jetbrains.annotations.NotNull()
-  public final java.util.Collection<?> getC();//  getC()
-
   private  Companion();//  .ctor()
 
-  public final int getD();//  getD()
-
-  public final void setD(int);//  setD(int)
-
 }
 
 public abstract interface B /* B*/ {
@@ -52,34 +38,20 @@ public abstract interface B /* B*/ {
   }
 
 public static final class Companion /* B.Companion*/ {
-  @<error>()
-  @org.jetbrains.annotations.NotNull()
-  private final java.util.Collection<?> a;
-
-  @org.jetbrains.annotations.NotNull()
-  public final java.util.Collection<?> getA();//  getA()
-
   private  Companion();//  .ctor()
 
 }
 
 public final class C /* C*/ {
-  @<error>()
+  @kotlin.jvm.JvmField()
   @org.jetbrains.annotations.NotNull()
-  private final java.util.Collection<?> a;
+  public final java.util.Collection<?> a;
 
-  @<error>()
-  private int b;
-
-  @org.jetbrains.annotations.NotNull()
-  public final java.util.Collection<?> getA();//  getA()
+  @kotlin.jvm.JvmField()
+  public int b;
 
   public  C();//  .ctor()
 
-  public  C(@<error>() @org.jetbrains.annotations.NotNull() java.util.Collection<?>, @<error>() int);//  .ctor(java.util.Collection<?>, int)
-
-  public final int getB();//  getB()
-
-  public final void setB(int);//  setB(int)
+  public  C(@kotlin.jvm.JvmField() @org.jetbrains.annotations.NotNull() java.util.Collection<?>, @kotlin.jvm.JvmField() int);//  .ctor(java.util.Collection<?>, int)
 
 }
diff --git a/compiler/testData/asJava/ultraLightClasses/jvmName.fir.java b/compiler/testData/asJava/ultraLightClasses/jvmName.fir.java
deleted file mode 100644
index 60ba0ef2856..00000000000
--- a/compiler/testData/asJava/ultraLightClasses/jvmName.fir.java
+++ /dev/null
@@ -1,29 +0,0 @@
-public final class C /* C*/ {
-  @<error>()
-  @org.jetbrains.annotations.NotNull()
-  public final java.lang.String getXyz();//  getXyz()
-
-  @<error>()
-  public final boolean getHasBigArity();//  getHasBigArity()
-
-  @<error>()
-  public final int getRwProp();//  getRwProp()
-
-  @<error>()
-  public final void foo(@org.jetbrains.annotations.NotNull() java.util.List<java.lang.Integer>);//  foo(java.util.List<java.lang.Integer>)
-
-  @<error>()
-  public final void setRwProp(int);//  setRwProp(int)
-
-  @<error>()
-  public final void setXyz(@org.jetbrains.annotations.NotNull() java.lang.String);//  setXyz(java.lang.String)
-
-  public  C();//  .ctor()
-
-  public final int getRwProp();//  getRwProp()
-
-  public final void foo(@org.jetbrains.annotations.NotNull() java.util.List<java.lang.String>);//  foo(java.util.List<java.lang.String>)
-
-  public final void setRwProp(int);//  setRwProp(int)
-
-}
diff --git a/compiler/testData/asJava/ultraLightClasses/jvmOverloads.fir.java b/compiler/testData/asJava/ultraLightClasses/jvmOverloads.fir.java
index bd427699d54..a07e6f3951f 100644
--- a/compiler/testData/asJava/ultraLightClasses/jvmOverloads.fir.java
+++ b/compiler/testData/asJava/ultraLightClasses/jvmOverloads.fir.java
@@ -10,22 +10,64 @@ public final class C /* C*/ {
 
   private final boolean p1;
 
-  @<error>()
+  @kotlin.jvm.JvmOverloads()
+  @kotlin.jvm.JvmStatic()
+  public static final void fooStatic(double);//  fooStatic(double)
+
+  @kotlin.jvm.JvmOverloads()
+  @kotlin.jvm.JvmStatic()
+  public static final void fooStatic(int, double);//  fooStatic(int, double)
+
+  @kotlin.jvm.JvmOverloads()
+  @kotlin.jvm.JvmStatic()
+  public static final void fooStatic(int, double, @org.jetbrains.annotations.NotNull() java.lang.String);//  fooStatic(int, double, java.lang.String)
+
+  @kotlin.jvm.JvmOverloads()
   public  C(@org.jetbrains.annotations.Nullable() java.lang.String, boolean, @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String, boolean, java.lang.String)
 
-  @<error>()
+  @kotlin.jvm.JvmOverloads()
+  public final void bar();//  bar()
+
+  @kotlin.jvm.JvmOverloads()
+  public final void bar(int);//  bar(int)
+
+  @kotlin.jvm.JvmOverloads()
+  public final void bar(int, double);//  bar(int, double)
+
+  @kotlin.jvm.JvmOverloads()
   public final void bar(int, double, @org.jetbrains.annotations.NotNull() java.lang.String);//  bar(int, double, java.lang.String)
 
-  @<error>()
+  @kotlin.jvm.JvmOverloads()
+  public final void baz(@org.jetbrains.annotations.NotNull() java.lang.String);//  baz(java.lang.String)
+
+  @kotlin.jvm.JvmOverloads()
+  public final void baz(int, @org.jetbrains.annotations.NotNull() java.lang.String);//  baz(int, java.lang.String)
+
+  @kotlin.jvm.JvmOverloads()
   public final void baz(int, double, @org.jetbrains.annotations.NotNull() java.lang.String);//  baz(int, double, java.lang.String)
 
-  @<error>()
+  @kotlin.jvm.JvmOverloads()
+  public final void foo(double);//  foo(double)
+
+  @kotlin.jvm.JvmOverloads()
+  public final void foo(int, double);//  foo(int, double)
+
+  @kotlin.jvm.JvmOverloads()
   public final void foo(int, double, @org.jetbrains.annotations.NotNull() java.lang.String);//  foo(int, double, java.lang.String)
 
-  @<error>()
+  @kotlin.jvm.JvmOverloads()
+  public final void foobar(int);//  foobar(int)
+
+  @kotlin.jvm.JvmOverloads()
+  public final void foobar(int, double);//  foobar(int, double)
+
+  @kotlin.jvm.JvmOverloads()
   public final void foobar(int, double, @org.jetbrains.annotations.NotNull() java.lang.String);//  foobar(int, double, java.lang.String)
 
-  @<error>()
+  @kotlin.jvm.JvmOverloads()
+  public final void foobarbaz(int, @org.jetbrains.annotations.NotNull() java.lang.String);//  foobarbaz(int, java.lang.String)
+
+  @kotlin.jvm.JvmOverloads()
   public final void foobarbaz(int, double, @org.jetbrains.annotations.NotNull() java.lang.String);//  foobarbaz(int, double, java.lang.String)
 
   @org.jetbrains.annotations.NotNull()
@@ -42,11 +84,25 @@ public final class C /* C*/ {
   }
 
 public static final class Companion /* C.Companion*/ {
-  @<error>()
-  @<error>()
+  @kotlin.jvm.JvmOverloads()
+  @kotlin.jvm.JvmStatic()
   public final void fooStatic(int, double, @org.jetbrains.annotations.NotNull() java.lang.String);//  fooStatic(int, double, java.lang.String)
 
-  @<error>()
+  @kotlin.jvm.JvmOverloads()
+  @kotlin.jvm.JvmStatic()
+  public static final void fooStatic(double);//  fooStatic(double)
+
+  @kotlin.jvm.JvmOverloads()
+  @kotlin.jvm.JvmStatic()
+  public static final void fooStatic(int, double);//  fooStatic(int, double)
+
+  @kotlin.jvm.JvmOverloads()
+  public final void foo123(double);//  foo123(double)
+
+  @kotlin.jvm.JvmOverloads()
+  public final void foo123(int, double);//  foo123(int, double)
+
+  @kotlin.jvm.JvmOverloads()
   public final void foo123(int, double, @org.jetbrains.annotations.NotNull() java.lang.String);//  foo123(int, double, java.lang.String)
 
   private  Companion();//  .ctor()
diff --git a/compiler/testData/asJava/ultraLightClasses/jvmRecord.fir.java b/compiler/testData/asJava/ultraLightClasses/jvmRecord.fir.java
index 21d3a2f47c7..8f66d2ec126 100644
--- a/compiler/testData/asJava/ultraLightClasses/jvmRecord.fir.java
+++ b/compiler/testData/asJava/ultraLightClasses/jvmRecord.fir.java
@@ -1,4 +1,4 @@
-@<error>()
+@kotlin.jvm.JvmRecord()
 public final class MyRec /* pkg.MyRec*/ {
   @org.jetbrains.annotations.NotNull()
   private final java.lang.String name;
diff --git a/compiler/testData/asJava/ultraLightClasses/jvmSynthetic.fir.java b/compiler/testData/asJava/ultraLightClasses/jvmSynthetic.fir.java
deleted file mode 100644
index a29eb8be582..00000000000
--- a/compiler/testData/asJava/ultraLightClasses/jvmSynthetic.fir.java
+++ /dev/null
@@ -1,30 +0,0 @@
-public final class A /* A*/ {
-  @<error>()
-  @<error>()
-  private int y;
-
-  @<error>()
-  private int x;
-
-  private int z;
-
-  @<error>()
-  public final int getZ();//  getZ()
-
-  @<error>()
-  public final void foo();//  foo()
-
-  @<error>()
-  public final void setZ(int);//  setZ(int)
-
-  public  A();//  .ctor()
-
-  public final int getX();//  getX()
-
-  public final int getY();//  getY()
-
-  public final void setX(int);//  setX(int)
-
-  public final void setY(int);//  setY(int)
-
-}
diff --git a/compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.fir.java b/compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.fir.java
index d87ea9b742f..22885a0604a 100644
--- a/compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.fir.java
+++ b/compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.fir.java
@@ -3,10 +3,10 @@ public final class X /* X*/ {
 
   private int w;
 
-  @<error>()
+  @kotlin.jvm.JvmSynthetic()
   public final int getV();//  getV()
 
-  @<error>()
+  @kotlin.jvm.JvmSynthetic()
   public final void setW(int);//  setW(int)
 
   public  X();//  .ctor()
diff --git a/compiler/testData/asJava/ultraLightClasses/jvmWildcardAnnotations.fir.java b/compiler/testData/asJava/ultraLightClasses/jvmWildcardAnnotations.fir.java
index d333205188d..03f66b82624 100644
--- a/compiler/testData/asJava/ultraLightClasses/jvmWildcardAnnotations.fir.java
+++ b/compiler/testData/asJava/ultraLightClasses/jvmWildcardAnnotations.fir.java
@@ -29,42 +29,42 @@ public class Open /* Open*/ {
 }
 
 public final class Container /* Container*/ {
-  @<error>()
+  @kotlin.jvm.JvmSuppressWildcards(suppress = false)
   @org.jetbrains.annotations.NotNull()
   public final Out<Open> bar();//  bar()
 
-  @<error>()
-  public final int bar(boolean, @org.jetbrains.annotations.NotNull() In<? super java.lang.Long>, long);//  bar(boolean, In<? super java.lang.Long>, long)
-
-  @<error>()
+  @kotlin.jvm.JvmSuppressWildcards(suppress = false)
   public final int foo(boolean, @org.jetbrains.annotations.NotNull() Out<java.lang.Integer>);//  foo(boolean, Out<java.lang.Integer>)
 
-  @<error>()
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
+  public final int bar(boolean, @org.jetbrains.annotations.NotNull() In<? super java.lang.Long>, long);//  bar(boolean, In<? super java.lang.Long>, long)
+
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
   public final void deepOpen(@org.jetbrains.annotations.NotNull() Out<? extends Out<? extends Out<? extends Open>>>);//  deepOpen(Out<? extends Out<? extends Out<? extends Open>>>)
 
   @org.jetbrains.annotations.NotNull()
   public final OutPair<Final, OutPair<Out<Final>, Out<Final>>> falseTrueFalse();//  falseTrueFalse()
 
   @org.jetbrains.annotations.NotNull()
-  public final OutPair<Open, OutPair<Open, Out<Open>>> combination();//  combination()
+  public final OutPair<Open, ? extends OutPair<Open,? extends Out<Open>>> combination();//  combination()
 
   public  Container();//  .ctor()
 
-  public final void simpleIn(@org.jetbrains.annotations.NotNull() In<java.lang.Object>);//  simpleIn(In<java.lang.Object>)
+  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<Final>);//  simpleOut(Out<Final>)
+  public final void simpleOut(@org.jetbrains.annotations.NotNull() Out<? extends Final>);//  simpleOut(Out<? extends Final>)
 
 }
 
 public abstract interface A /* A*/<T>  {
-  @<error>()
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
   @org.jetbrains.annotations.NotNull()
   public abstract Out<T> foo();//  foo()
 
 }
 
 public abstract interface B /* B*/ {
-  @<error>()
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
   @org.jetbrains.annotations.NotNull()
   public abstract In<Open> foo();//  foo()
 
diff --git a/compiler/testData/asJava/ultraLightClasses/objects.fir.java b/compiler/testData/asJava/ultraLightClasses/objects.fir.java
index 617803e9e3d..a9c95af745c 100644
--- a/compiler/testData/asJava/ultraLightClasses/objects.fir.java
+++ b/compiler/testData/asJava/ultraLightClasses/objects.fir.java
@@ -1,7 +1,14 @@
 public final class C /* C*/ {
+  @kotlin.jvm.JvmStatic()
+  @org.jetbrains.annotations.NotNull()
+  public java.lang.String x;
+
   @org.jetbrains.annotations.NotNull()
   public static final C.Companion Companion;
 
+  @kotlin.jvm.JvmStatic()
+  public static final void foo();//  foo()
+
   public  C();//  .ctor()
 
 
@@ -13,21 +20,21 @@ public final class C /* C*/ {
   }
 
 public static final class Companion /* C.Companion*/ {
-  @<error>()
+  @kotlin.jvm.JvmStatic()
   @org.jetbrains.annotations.NotNull()
   private java.lang.String x;
 
-  @<error>()
+  @kotlin.jvm.JvmStatic()
   @org.jetbrains.annotations.NotNull()
   public final java.lang.String getC(I);//  getC(I)
 
-  @<error>()
+  @kotlin.jvm.JvmStatic()
   public final void foo();//  foo()
 
-  @<error>()
+  @kotlin.jvm.JvmStatic()
   public final void setC(I, @org.jetbrains.annotations.NotNull() java.lang.String);//  setC(I, java.lang.String)
 
-  @<error>()
+  @kotlin.jvm.JvmStatic()
   public final void setC1(@org.jetbrains.annotations.NotNull() java.lang.String);//  setC1(java.lang.String)
 
   @org.jetbrains.annotations.NotNull()
@@ -80,15 +87,15 @@ public static final class Companion /* I.Companion*/ {
 }
 
 public final class Obj /* Obj*/ implements java.lang.Runnable {
-  @<error>()
+  @kotlin.jvm.JvmStatic()
   @org.jetbrains.annotations.NotNull()
   private static java.lang.String x;
 
   @org.jetbrains.annotations.NotNull()
   public static final Obj INSTANCE;
 
-  @<error>()
-  public final int zoo();//  zoo()
+  @kotlin.jvm.JvmStatic()
+  public static final int zoo();//  zoo()
 
   @org.jetbrains.annotations.NotNull()
   public final java.lang.String getX();//  getX()
diff --git a/compiler/testData/asJava/ultraLightClasses/properties.fir.java b/compiler/testData/asJava/ultraLightClasses/properties.fir.java
index 12d2144761f..1d984dc97ca 100644
--- a/compiler/testData/asJava/ultraLightClasses/properties.fir.java
+++ b/compiler/testData/asJava/ultraLightClasses/properties.fir.java
@@ -2,9 +2,6 @@ public final class Foo /* Foo*/ {
   @org.jetbrains.annotations.NotNull()
   private error.NonExistentClass delegatedProp$delegate;
 
-  @org.jetbrains.annotations.NotNull()
-  private error.NonExistentClass lazyProp$delegate;
-
   @org.jetbrains.annotations.NotNull()
   private final Foo b;
 
@@ -32,6 +29,9 @@ public final class Foo /* Foo*/ {
   @org.jetbrains.annotations.NotNull()
   private java.lang.String protectedWithPrivateSet;
 
+  @org.jetbrains.annotations.NotNull()
+  private kotlin.Lazy<java.lang.String> lazyProp$delegate;
+
   @org.jetbrains.annotations.NotNull()
   public static final Foo.Companion Companion;
 
diff --git a/compiler/testData/asJava/ultraLightClasses/throwsAnnotation.fir.java b/compiler/testData/asJava/ultraLightClasses/throwsAnnotation.fir.java
index f2fa4815254..de6668140c9 100644
--- a/compiler/testData/asJava/ultraLightClasses/throwsAnnotation.fir.java
+++ b/compiler/testData/asJava/ultraLightClasses/throwsAnnotation.fir.java
@@ -4,14 +4,14 @@ public final class MyException /* MyException*/ extends java.lang.Exception {
 }
 
 public final class C /* C*/ {
-  @<error>()
+  @kotlin.jvm.Throws()
   @org.jetbrains.annotations.NotNull()
   public final java.lang.String readFile(@org.jetbrains.annotations.NotNull() java.lang.String);//  readFile(java.lang.String)
 
-  @<error>()
+  @kotlin.jvm.Throws()
   public  C(int);//  .ctor(int)
 
-  @<error>()
+  @kotlin.jvm.Throws()
   public final void baz();//  baz()
 
   public  C();//  .ctor()
diff --git a/compiler/testData/asJava/ultraLightClasses/typeAliases.fir.java b/compiler/testData/asJava/ultraLightClasses/typeAliases.fir.java
deleted file mode 100644
index 4aa0e70daa6..00000000000
--- a/compiler/testData/asJava/ultraLightClasses/typeAliases.fir.java
+++ /dev/null
@@ -1,10 +0,0 @@
-public final class O /* O*/ {
-  @org.jetbrains.annotations.NotNull()
-  public static final O INSTANCE;
-
-  @<error>()
-  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/ultraLightFacades/importAliases.fir.java b/compiler/testData/asJava/ultraLightFacades/importAliases.fir.java
deleted file mode 100644
index dcbb60f5ec6..00000000000
--- a/compiler/testData/asJava/ultraLightFacades/importAliases.fir.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public final class ImportAliasesKt /* ImportAliasesKt*/ {
-  @<error>()
-  public static final void foo();//  foo()
-
-}
diff --git a/compiler/testData/asJava/ultraLightFacades/jvmField.fir.java b/compiler/testData/asJava/ultraLightFacades/jvmField.fir.java
deleted file mode 100644
index 3def9fbb49c..00000000000
--- a/compiler/testData/asJava/ultraLightFacades/jvmField.fir.java
+++ /dev/null
@@ -1,16 +0,0 @@
-public final class JvmFieldKt /* JvmFieldKt*/ {
-  @<error>()
-  @org.jetbrains.annotations.NotNull()
-  private static final java.util.Collection<?> a;
-
-  @<error>()
-  private static int b;
-
-  @org.jetbrains.annotations.NotNull()
-  public static final java.util.Collection<?> getA();//  getA()
-
-  public static final int getB();//  getB()
-
-  public static final void setB(int);//  setB(int)
-
-}
diff --git a/compiler/testData/asJava/ultraLightFacades/jvmName.fir.java b/compiler/testData/asJava/ultraLightFacades/jvmName.fir.java
deleted file mode 100644
index dfa631d049c..00000000000
--- a/compiler/testData/asJava/ultraLightFacades/jvmName.fir.java
+++ /dev/null
@@ -1,27 +0,0 @@
-public final class JvmNameKt /* JvmNameKt*/ {
-  @<error>()
-  @org.jetbrains.annotations.NotNull()
-  public static final java.lang.String getXyz();//  getXyz()
-
-  @<error>()
-  public static final boolean getHasBigArity();//  getHasBigArity()
-
-  @<error>()
-  public static final int getRwProp();//  getRwProp()
-
-  @<error>()
-  public static final void foo(@org.jetbrains.annotations.NotNull() java.util.List<java.lang.Integer>);//  foo(java.util.List<java.lang.Integer>)
-
-  @<error>()
-  public static final void setRwProp(int);//  setRwProp(int)
-
-  @<error>()
-  public static final void setXyz(@org.jetbrains.annotations.NotNull() java.lang.String);//  setXyz(java.lang.String)
-
-  public static final int getRwProp();//  getRwProp()
-
-  public static final void foo(@org.jetbrains.annotations.NotNull() java.util.List<java.lang.String>);//  foo(java.util.List<java.lang.String>)
-
-  public static final void setRwProp(int);//  setRwProp(int)
-
-}
diff --git a/compiler/testData/asJava/ultraLightFacades/jvmWildcardAnnotations.fir.java b/compiler/testData/asJava/ultraLightFacades/jvmWildcardAnnotations.fir.java
index 78d6aef5f35..a83e6408533 100644
--- a/compiler/testData/asJava/ultraLightFacades/jvmWildcardAnnotations.fir.java
+++ b/compiler/testData/asJava/ultraLightFacades/jvmWildcardAnnotations.fir.java
@@ -1,32 +1,32 @@
 public final class JvmWildcardAnnotationsKt /* JvmWildcardAnnotationsKt*/ {
-  @<error>()
-  @org.jetbrains.annotations.NotNull()
-  public static final In<Open> foo3();//  foo3()
-
-  @<error>()
+  @kotlin.jvm.JvmSuppressWildcards(suppress = false)
   @org.jetbrains.annotations.NotNull()
   public static final Out<Open> bar();//  bar()
 
-  @<error>()
+  @kotlin.jvm.JvmSuppressWildcards(suppress = false)
+  public static final int foo(boolean, @org.jetbrains.annotations.NotNull() Out<java.lang.Integer>);//  foo(boolean, Out<java.lang.Integer>)
+
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
+  @org.jetbrains.annotations.NotNull()
+  public static final In<Open> foo3();//  foo3()
+
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
   @org.jetbrains.annotations.NotNull()
   public static final error.NonExistentClass foo2();//  foo2()
 
-  @<error>()
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
   public static final int bar(boolean, @org.jetbrains.annotations.NotNull() In<? super java.lang.Long>, long);//  bar(boolean, In<? super java.lang.Long>, long)
 
-  @<error>()
-  public static final int foo(boolean, @org.jetbrains.annotations.NotNull() Out<java.lang.Integer>);//  foo(boolean, Out<java.lang.Integer>)
-
-  @<error>()
+  @kotlin.jvm.JvmSuppressWildcards(suppress = true)
   public static final void deepOpen(@org.jetbrains.annotations.NotNull() Out<? extends Out<? extends Out<? extends Open>>>);//  deepOpen(Out<? extends Out<? extends Out<? extends Open>>>)
 
   @org.jetbrains.annotations.NotNull()
   public static final OutPair<Final, OutPair<Out<Final>, Out<Final>>> falseTrueFalse();//  falseTrueFalse()
 
   @org.jetbrains.annotations.NotNull()
-  public static final OutPair<Open, OutPair<Open, Out<Open>>> combination();//  combination()
+  public static final OutPair<Open, ? extends OutPair<Open,? extends Out<Open>>> combination();//  combination()
 
-  public static final void simpleIn(@org.jetbrains.annotations.NotNull() In<java.lang.Object>);//  simpleIn(In<java.lang.Object>)
+  public static final void simpleIn(@org.jetbrains.annotations.NotNull() In<? super java.lang.Object>);//  simpleIn(In<? super java.lang.Object>)
 
   public static final void simpleOut(@org.jetbrains.annotations.NotNull() Out<? extends Final>);//  simpleOut(Out<? extends Final>)
 
diff --git a/compiler/testData/asJava/ultraLightFacades/multifileFacade.fir.java b/compiler/testData/asJava/ultraLightFacades/multifileFacade.fir.java
index d7a150c4969..ac74d0f18f7 100644
--- a/compiler/testData/asJava/ultraLightFacades/multifileFacade.fir.java
+++ b/compiler/testData/asJava/ultraLightFacades/multifileFacade.fir.java
@@ -1,14 +1,8 @@
-@<error>()
-@<error>()
 public final class multifileFacade /* multifileFacade*/ {
-  private static final int x;
-
   public static final int x1 = 42 /* initializer type: int */;
 
-  private static final int privateFoo();//  privateFoo()
-
   public static final int foo();//  foo()
 
   public static final int getX();//  getX()
 
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.fir.java b/compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.fir.java
index 7efc56890d3..3c9763d615a 100644
--- a/compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.fir.java
+++ b/compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.fir.java
@@ -1,5 +1,3 @@
-@<error>()
-@<error>()
 public final class multifileFacade /* multifileFacade*/ {
   public static final int foo();//  foo()
 
diff --git a/compiler/testData/asJava/ultraLightFacades/properties.fir.java b/compiler/testData/asJava/ultraLightFacades/properties.fir.java
index f6066012e17..4f515b31915 100644
--- a/compiler/testData/asJava/ultraLightFacades/properties.fir.java
+++ b/compiler/testData/asJava/ultraLightFacades/properties.fir.java
@@ -2,9 +2,6 @@ public final class PropertiesKt /* PropertiesKt*/ {
   @org.jetbrains.annotations.NotNull()
   private static error.NonExistentClass delegatedProp$delegate;
 
-  @org.jetbrains.annotations.NotNull()
-  private static error.NonExistentClass lazyProp$delegate;
-
   @org.jetbrains.annotations.NotNull()
   private static final java.lang.Object arrayConst;
 
@@ -23,6 +20,9 @@ public final class PropertiesKt /* PropertiesKt*/ {
   @org.jetbrains.annotations.NotNull()
   private static java.lang.String x$1;
 
+  @org.jetbrains.annotations.NotNull()
+  private static kotlin.Lazy<java.lang.String> lazyProp$delegate;
+
   @org.jetbrains.annotations.NotNull()
   public static final java.lang.String SUBSYSTEM_DEPRECATED = "This subsystem is deprecated" /* initializer type: java.lang.String */;
 
diff --git a/compiler/testData/asJava/ultraLightFacades/throwsAnnotation.fir.java b/compiler/testData/asJava/ultraLightFacades/throwsAnnotation.fir.java
index b4bb0cce29b..b49d7273dbf 100644
--- a/compiler/testData/asJava/ultraLightFacades/throwsAnnotation.fir.java
+++ b/compiler/testData/asJava/ultraLightFacades/throwsAnnotation.fir.java
@@ -1,9 +1,9 @@
 public final class ThrowsAnnotationKt /* ThrowsAnnotationKt*/ {
-  @<error>()
+  @kotlin.jvm.Throws()
   @org.jetbrains.annotations.NotNull()
   public static final java.lang.String readFile(@org.jetbrains.annotations.NotNull() java.lang.String);//  readFile(java.lang.String)
 
-  @<error>()
+  @kotlin.jvm.Throws()
   public static final void baz();//  baz()
 
 }