diff --git a/compiler/testData/lazyResolve/diagnostics/Abstract.txt b/compiler/testData/lazyResolve/diagnostics/Abstract.txt
deleted file mode 100644
index 1435d8bca97..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/Abstract.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-namespace <root>
-
-// <namespace name="MyNamespace">
-namespace MyNamespace
-
-internal final val a: jet.Int
-internal final val a1: jet.Int
-internal abstract val a2: jet.Int
-internal abstract val a3: jet.Int
-internal final var b: jet.Int private set
-internal final var b1: jet.Int private set
-internal abstract var b2: jet.Int private set
-internal abstract var b3: jet.Int private set
-internal final var c: jet.Int
-internal final var c1: jet.Int
-internal abstract var c2: jet.Int
-internal abstract var c3: jet.Int
-internal final val e: jet.Int
-internal final val e1: jet.Int
-internal abstract val e2: jet.Int
-internal abstract val e3: jet.Int
-internal final var i: jet.Int
-internal final var i1: jet.Int
-internal final var j: jet.Int
-internal final var j1: jet.Int
-internal final var k: jet.Int
-internal final var k1: jet.Int
-internal final var l: jet.Int
-internal final var l1: jet.Int
-internal final var n: jet.Int
-internal final fun f(): jet.Tuple0
-internal final fun g(): jet.Tuple0
-internal abstract fun h(): jet.Tuple0
-internal abstract fun j(): jet.Tuple0
-// </namespace name="MyNamespace">
-internal abstract class B1 : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ i: jet.Int, /*1*/ s: jet.String): B1
-    internal final val i: jet.Int
-    internal final val s: jet.String
-}
-internal final class B2 : B1 {
-    public final /*constructor*/ fun <init>(): B2
-    internal final override /*1*/ val i: jet.Int
-    internal final override /*1*/ val s: jet.String
-}
-internal abstract class B3 : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ i: jet.Int): B3
-}
-internal final fun foo(/*0*/ c: B3): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/AbstractEnum.txt b/compiler/testData/lazyResolve/diagnostics/AbstractEnum.txt
deleted file mode 100644
index 97d87943bae..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/AbstractEnum.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-// <namespace name="abstract">
-namespace abstract
-
-internal abstract enum class abstract.MyAbstractEnum : jet.Any {
-    public final /*constructor*/ fun <init>(): abstract.MyAbstractEnum
-    internal final class object abstract.MyAbstractEnum.<class-object-for-MyAbstractEnum> {
-        internal final /*constructor*/ fun <init>(): abstract.MyAbstractEnum.<class-object-for-MyAbstractEnum>
-    }
-}
-// </namespace name="abstract">
diff --git a/compiler/testData/lazyResolve/diagnostics/AbstractInAbstractClass.txt b/compiler/testData/lazyResolve/diagnostics/AbstractInAbstractClass.txt
deleted file mode 100644
index 6a33d58b255..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/AbstractInAbstractClass.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-namespace <root>
-
-// <namespace name="abstract">
-namespace abstract
-
-internal abstract class abstract.MyAbstractClass : jet.Any {
-    public final /*constructor*/ fun <init>(): abstract.MyAbstractClass
-    internal final val a1: jet.Int
-    internal abstract val a2: jet.Int
-    internal abstract val a3: jet.Int
-    internal final val a: jet.Int
-    internal final var b1: jet.Int private set
-    internal abstract var b2: jet.Int private set
-    internal abstract var b3: jet.Int private set
-    internal final var b: jet.Int private set
-    internal final var c1: jet.Int
-    internal abstract var c2: jet.Int
-    internal abstract var c3: jet.Int
-    internal final var c: jet.Int
-    internal final val e1: jet.Int
-    internal abstract val e2: jet.Int
-    internal abstract val e3: jet.Int
-    internal final val e: jet.Int
-    internal final fun f(): jet.Tuple0
-    internal final fun g(): jet.Tuple0
-    internal abstract fun h(): jet.Tuple0
-    internal final var i1: jet.Int
-    internal final var i: jet.Int
-    internal abstract fun j(): jet.Tuple0
-    internal final var j1: jet.Int
-    internal final var j: jet.Int
-    internal final var k1: jet.Int
-    internal final var k: jet.Int
-    internal final var l1: jet.Int
-    internal final var l: jet.Int
-    internal final var n: jet.Int
-}
-// </namespace name="abstract">
diff --git a/compiler/testData/lazyResolve/diagnostics/AbstractInClass.txt b/compiler/testData/lazyResolve/diagnostics/AbstractInClass.txt
deleted file mode 100644
index a80adecf038..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/AbstractInClass.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-namespace <root>
-
-// <namespace name="abstract">
-namespace abstract
-
-internal final class abstract.MyClass : jet.Any {
-    public final /*constructor*/ fun <init>(): abstract.MyClass
-    internal final val a1: jet.Int
-    internal abstract val a2: jet.Int
-    internal abstract val a3: jet.Int
-    internal final val a: jet.Int
-    internal final var b1: jet.Int private set
-    internal abstract var b2: jet.Int private set
-    internal abstract var b3: jet.Int private set
-    internal final var b: jet.Int private set
-    internal final var c1: jet.Int
-    internal abstract var c2: jet.Int
-    internal abstract var c3: jet.Int
-    internal final var c: jet.Int
-    internal final val e1: jet.Int
-    internal abstract val e2: jet.Int
-    internal abstract val e3: jet.Int
-    internal final val e: jet.Int
-    internal final fun f(): jet.Tuple0
-    internal final fun g(): jet.Tuple0
-    internal abstract fun h(): jet.Tuple0
-    internal final var i1: jet.Int
-    internal final var i: jet.Int
-    internal abstract fun j(): jet.Tuple0
-    internal final var j1: jet.Int
-    internal final var j: jet.Int
-    internal final var k1: jet.Int
-    internal final var k: jet.Int
-    internal final var l1: jet.Int
-    internal final var l: jet.Int
-    internal final var n: jet.Int
-}
-// </namespace name="abstract">
diff --git a/compiler/testData/lazyResolve/diagnostics/AbstractInEnum.txt b/compiler/testData/lazyResolve/diagnostics/AbstractInEnum.txt
deleted file mode 100644
index dd10194a284..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/AbstractInEnum.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-namespace <root>
-
-// <namespace name="abstract">
-namespace abstract
-
-internal final enum class abstract.MyEnum : jet.Any {
-    public final /*constructor*/ fun <init>(): abstract.MyEnum
-    internal final val a1: jet.Int
-    internal abstract val a2: jet.Int
-    internal abstract val a3: jet.Int
-    internal final val a: jet.Int
-    internal final var b1: jet.Int private set
-    internal abstract var b2: jet.Int private set
-    internal abstract var b3: jet.Int private set
-    internal final var b: jet.Int private set
-    internal final var c1: jet.Int
-    internal abstract var c2: jet.Int
-    internal abstract var c3: jet.Int
-    internal final var c: jet.Int
-    internal final val e1: jet.Int
-    internal abstract val e2: jet.Int
-    internal abstract val e3: jet.Int
-    internal final val e: jet.Int
-    internal final fun f(): jet.Tuple0
-    internal final fun g(): jet.Tuple0
-    internal abstract fun h(): jet.Tuple0
-    internal final var i1: jet.Int
-    internal final var i: jet.Int
-    internal abstract fun j(): jet.Tuple0
-    internal final var j1: jet.Int
-    internal final var j: jet.Int
-    internal final var k1: jet.Int
-    internal final var k: jet.Int
-    internal final var l1: jet.Int
-    internal final var l: jet.Int
-    internal final var n: jet.Int
-    internal final class object abstract.MyEnum.<class-object-for-MyEnum> {
-        internal final /*constructor*/ fun <init>(): abstract.MyEnum.<class-object-for-MyEnum>
-    }
-}
-// </namespace name="abstract">
diff --git a/compiler/testData/lazyResolve/diagnostics/AbstractInTrait.txt b/compiler/testData/lazyResolve/diagnostics/AbstractInTrait.txt
deleted file mode 100644
index 29cd19e059f..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/AbstractInTrait.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-namespace <root>
-
-// <namespace name="abstract">
-namespace abstract
-
-internal abstract trait abstract.MyTrait : jet.Any {
-    internal open val a1: jet.Int
-    internal abstract val a2: jet.Int
-    internal abstract val a3: jet.Int
-    internal abstract val a: jet.Int
-    internal open var b1: jet.Int private set
-    internal abstract var b2: jet.Int private set
-    internal abstract var b3: jet.Int private set
-    internal abstract var b: jet.Int private set
-    internal open var c1: jet.Int
-    internal abstract var c2: jet.Int
-    internal abstract var c3: jet.Int
-    internal open var c: jet.Int
-    internal open val e1: jet.Int
-    internal abstract val e2: jet.Int
-    internal abstract val e3: jet.Int
-    internal open val e: jet.Int
-    internal abstract fun f(): jet.Tuple0
-    internal open fun g(): jet.Tuple0
-    internal abstract fun h(): jet.Tuple0
-    internal open var i1: jet.Int
-    internal abstract var i: jet.Int
-    internal abstract fun j(): jet.Tuple0
-    internal open var j1: jet.Int
-    internal open var j: jet.Int
-    internal open var k1: jet.Int
-    internal abstract var k: jet.Int
-    internal open var l1: jet.Int
-    internal abstract var l: jet.Int
-    internal open var n: jet.Int
-}
-// </namespace name="abstract">
diff --git a/compiler/testData/lazyResolve/diagnostics/AnonymousInitializerVarAndConstructor.txt b/compiler/testData/lazyResolve/diagnostics/AnonymousInitializerVarAndConstructor.txt
deleted file mode 100644
index 07b40dc4936..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/AnonymousInitializerVarAndConstructor.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace <root>
-
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ w: jet.Int): A
-    internal final var c: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/AnonymousInitializers.txt b/compiler/testData/lazyResolve/diagnostics/AnonymousInitializers.txt
deleted file mode 100644
index 98d253cb9d2..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/AnonymousInitializers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-internal abstract trait NoC : jet.Any {
-    internal open val a: jet.Int
-}
-internal final class WithC : jet.Any {
-    public final /*constructor*/ fun <init>(): WithC
-    internal final val a: jet.Int
-    internal final val x: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/AutoCreatedIt.txt b/compiler/testData/lazyResolve/diagnostics/AutoCreatedIt.txt
deleted file mode 100644
index 4a777dce0ac..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/AutoCreatedIt.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-internal final class URI : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ body: jet.Any): URI
-    internal final val body: jet.Any
-    internal final fun to(/*0*/ dest: jet.String): jet.Tuple0
-}
-internal final fun bar(/*0*/ f: jet.Function2<jet.Int, jet.Int, jet.Int>): jet.Tuple0
-internal final fun bar1(/*0*/ f: jet.Function1<jet.Int, jet.Int>): jet.Tuple0
-internal final fun bar2(/*0*/ f: jet.Function0<jet.Int>): jet.Tuple0
-internal final fun jet.String.on(/*0*/ predicate: jet.Function1<URI, jet.Boolean>): URI
-internal final fun text(): jet.Tuple0
-internal final fun jet.String.to(/*0*/ dest: jet.String): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/AutocastAmbiguitites.txt b/compiler/testData/lazyResolve/diagnostics/AutocastAmbiguitites.txt
deleted file mode 100644
index 39942834203..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/AutocastAmbiguitites.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-internal abstract trait B : jet.Any {
-    internal open fun bar(): jet.Tuple0
-}
-internal final class C : jet.Any {
-    public final /*constructor*/ fun <init>(): C
-    internal final fun bar(): jet.Tuple0
-}
-internal final fun test(/*0*/ a: jet.Any?): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/AutocastsForStableIdentifiers.txt b/compiler/testData/lazyResolve/diagnostics/AutocastsForStableIdentifiers.txt
deleted file mode 100644
index 87fc172f18f..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/AutocastsForStableIdentifiers.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace <root>
-
-// <namespace name="example">
-namespace example
-
-// <namespace name="ns">
-namespace ns
-
-internal final val y: jet.Any?
-// </namespace name="ns">
-internal final class example.AClass : jet.Any {
-    public final /*constructor*/ fun <init>(): example.AClass
-    internal final class object example.AClass.<no name provided> : jet.Any {
-        internal final /*constructor*/ fun <init>(): example.AClass.<no name provided>
-        internal final val y: jet.Any?
-    }
-}
-internal open class example.C : jet.Any {
-    public final /*constructor*/ fun <init>(): example.C
-    internal final fun foo(): jet.Tuple0
-}
-internal abstract trait example.T : jet.Any {
-}
-internal final val Obj: example.Obj
-internal final val x: jet.Any?
-internal final fun jet.Any?.foo(): jet.Int
-internal final fun jet.Any?.vars(/*0*/ a: jet.Any?): jet.Int
-// </namespace name="example">
diff --git a/compiler/testData/lazyResolve/diagnostics/Basic.txt b/compiler/testData/lazyResolve/diagnostics/Basic.txt
deleted file mode 100644
index 9462dd9d5a7..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/Basic.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal final val x: jet.Int
-}
-internal final fun foo(/*0*/ u: jet.Tuple0): jet.Int
-internal final fun foo1(): jet.Tuple0
-internal final fun test(): jet.Int
diff --git a/compiler/testData/lazyResolve/diagnostics/BinaryCallsOnNullableValues.txt b/compiler/testData/lazyResolve/diagnostics/BinaryCallsOnNullableValues.txt
deleted file mode 100644
index 106dc25fefc..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/BinaryCallsOnNullableValues.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace <root>
-
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal final fun equals(/*0*/ a: jet.Any?): jet.Boolean
-}
-internal final class B : jet.Any {
-    public final /*constructor*/ fun <init>(): B
-    internal final fun equals(/*0*/ a: jet.Any?): jet.Boolean?
-}
-internal final class C : jet.Any {
-    public final /*constructor*/ fun <init>(): C
-    internal final fun equals(/*0*/ a: jet.Any?): jet.Int
-}
-internal final fun f(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/Bounds.txt b/compiler/testData/lazyResolve/diagnostics/Bounds.txt
deleted file mode 100644
index 83f61dc3250..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/Bounds.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-namespace <root>
-
-// <namespace name="boundsWithSubstitutors">
-namespace boundsWithSubstitutors
-
-internal open class boundsWithSubstitutors.A</*0*/ T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): boundsWithSubstitutors.A<T>
-}
-internal final class boundsWithSubstitutors.B</*0*/ X : boundsWithSubstitutors.A<X>> : jet.Any {
-    public final /*constructor*/ fun </*0*/ X : boundsWithSubstitutors.A<X>><init>(): boundsWithSubstitutors.B<X>
-}
-internal final class boundsWithSubstitutors.C : boundsWithSubstitutors.A<boundsWithSubstitutors.C> {
-    public final /*constructor*/ fun <init>(): boundsWithSubstitutors.C
-}
-internal final class boundsWithSubstitutors.X</*0*/ A : jet.Any?, /*1*/ B : A> : jet.Any {
-    public final /*constructor*/ fun </*0*/ A : jet.Any?, /*1*/ B : A><init>(): boundsWithSubstitutors.X<A, B>
-}
-internal final val a: boundsWithSubstitutors.B<boundsWithSubstitutors.C>
-internal final val a1: boundsWithSubstitutors.B<jet.Int>
-internal final val b: boundsWithSubstitutors.X<jet.Any, boundsWithSubstitutors.X<boundsWithSubstitutors.A<boundsWithSubstitutors.C>, boundsWithSubstitutors.C>>
-internal final val b0: boundsWithSubstitutors.X<jet.Any, jet.Any?>
-internal final val b1: boundsWithSubstitutors.X<jet.Any, boundsWithSubstitutors.X<boundsWithSubstitutors.A<boundsWithSubstitutors.C>, jet.String>>
-// </namespace name="boundsWithSubstitutors">
-internal open class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-}
-internal open class B</*0*/ T : A> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : A><init>(): B<T>
-}
-internal abstract class C</*0*/ T : B<jet.Int>, /*1*/ X : jet.Function1<B<jet.Char>, jet.Tuple2<out B<jet.Any>, out B<A>>>> : B<jet.Any> {
-    public final /*constructor*/ fun </*0*/ T : B<jet.Int>, /*1*/ X : jet.Function1<B<jet.Char>, jet.Tuple2<out B<jet.Any>, out B<A>>>><init>(): C<T, X>
-    internal final val a: B<jet.Char>
-    internal abstract val x: jet.Function1<B<jet.Char>, B<jet.Any>>
-}
-internal final fun </*0*/ T : jet.Int?>bar(): jet.Tuple0
-internal final fun </*0*/ T : jet.Int>jet.Int.buzz(): jet.Tuple0
-internal final fun </*0*/ T : jet.Any>foo(): jet.Tuple0
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/BreakContinue.txt b/compiler/testData/lazyResolve/diagnostics/BreakContinue.txt
deleted file mode 100644
index fa81ecd84b4..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/BreakContinue.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-internal final class C : jet.Any {
-    public final /*constructor*/ fun <init>(): C
-    internal final fun containsBreak(/*0*/ a: jet.String?, /*1*/ b: jet.String?): jet.Tuple0
-    internal final fun containsBreakInsideLoopWithLabel(/*0*/ a: jet.String?, /*1*/ array: jet.Array<jet.Int>): jet.Tuple0
-    internal final fun containsBreakToOuterLoop(/*0*/ a: jet.String?, /*1*/ b: jet.String?): jet.Tuple0
-    internal final fun containsBreakWithLabel(/*0*/ a: jet.String?): jet.Tuple0
-    internal final fun containsIllegalBreak(/*0*/ a: jet.String?): jet.Tuple0
-    internal final fun f(/*0*/ a: jet.Boolean, /*1*/ b: jet.Boolean): jet.Tuple0
-    internal final fun notContainsBreak(/*0*/ a: jet.String?, /*1*/ b: jet.String?): jet.Tuple0
-    internal final fun unresolvedBreak(/*0*/ a: jet.String?, /*1*/ array: jet.Array<jet.Int>): jet.Tuple0
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/Builders.txt b/compiler/testData/lazyResolve/diagnostics/Builders.txt
deleted file mode 100644
index 07e7d2f6c33..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/Builders.txt
+++ /dev/null
@@ -1,208 +0,0 @@
-namespace <root>
-
-// <namespace name="html">
-namespace html
-
-internal final class html.A : html.BodyTag {
-    public final /*constructor*/ fun <init>(): html.A
-    internal final override /*1*/ fun a(/*0*/ href: jet.String, /*1*/ init: jet.ExtensionFunction0<html.A, jet.Tuple0>): jet.Tuple0
-    internal final override /*1*/ val attributes: java.util.HashMap<jet.String, jet.String>
-    internal final override /*1*/ fun b(/*0*/ init: jet.ExtensionFunction0<html.B, jet.Tuple0>): html.B
-    internal final override /*1*/ val children: java.util.ArrayList<html.Element>
-    internal final override /*1*/ fun h1(/*0*/ init: jet.ExtensionFunction0<html.H1, jet.Tuple0>): html.H1
-    public final var href: jet.String?
-    protected final override /*1*/ fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
-    internal final override /*1*/ val name: jet.String
-    internal final override /*1*/ fun p(/*0*/ init: jet.ExtensionFunction0<html.P, jet.Tuple0>): html.P
-    internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
-    invisible_fake abstract override /*1*/ fun renderAttributes(): jet.String?
-    internal open override /*1*/ fun toString(): jet.String?
-    internal final override /*1*/ fun ul(/*0*/ init: jet.ExtensionFunction0<html.UL, jet.Tuple0>): html.UL
-}
-internal final class html.B : html.BodyTag {
-    public final /*constructor*/ fun <init>(): html.B
-    internal final override /*1*/ fun a(/*0*/ href: jet.String, /*1*/ init: jet.ExtensionFunction0<html.A, jet.Tuple0>): jet.Tuple0
-    internal final override /*1*/ val attributes: java.util.HashMap<jet.String, jet.String>
-    internal final override /*1*/ fun b(/*0*/ init: jet.ExtensionFunction0<html.B, jet.Tuple0>): html.B
-    internal final override /*1*/ val children: java.util.ArrayList<html.Element>
-    internal final override /*1*/ fun h1(/*0*/ init: jet.ExtensionFunction0<html.H1, jet.Tuple0>): html.H1
-    protected final override /*1*/ fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
-    internal final override /*1*/ val name: jet.String
-    internal final override /*1*/ fun p(/*0*/ init: jet.ExtensionFunction0<html.P, jet.Tuple0>): html.P
-    internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
-    invisible_fake abstract override /*1*/ fun renderAttributes(): jet.String?
-    internal open override /*1*/ fun toString(): jet.String?
-    internal final override /*1*/ fun ul(/*0*/ init: jet.ExtensionFunction0<html.UL, jet.Tuple0>): html.UL
-}
-internal final class html.Body : html.BodyTag {
-    public final /*constructor*/ fun <init>(): html.Body
-    internal final override /*1*/ fun a(/*0*/ href: jet.String, /*1*/ init: jet.ExtensionFunction0<html.A, jet.Tuple0>): jet.Tuple0
-    internal final override /*1*/ val attributes: java.util.HashMap<jet.String, jet.String>
-    internal final override /*1*/ fun b(/*0*/ init: jet.ExtensionFunction0<html.B, jet.Tuple0>): html.B
-    internal final override /*1*/ val children: java.util.ArrayList<html.Element>
-    internal final override /*1*/ fun h1(/*0*/ init: jet.ExtensionFunction0<html.H1, jet.Tuple0>): html.H1
-    protected final override /*1*/ fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
-    internal final override /*1*/ val name: jet.String
-    internal final override /*1*/ fun p(/*0*/ init: jet.ExtensionFunction0<html.P, jet.Tuple0>): html.P
-    internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
-    invisible_fake abstract override /*1*/ fun renderAttributes(): jet.String?
-    internal open override /*1*/ fun toString(): jet.String?
-    internal final override /*1*/ fun ul(/*0*/ init: jet.ExtensionFunction0<html.UL, jet.Tuple0>): html.UL
-}
-internal abstract class html.BodyTag : html.TagWithText {
-    public final /*constructor*/ fun <init>(/*0*/ name: jet.String): html.BodyTag
-    internal final fun a(/*0*/ href: jet.String, /*1*/ init: jet.ExtensionFunction0<html.A, jet.Tuple0>): jet.Tuple0
-    internal final override /*1*/ val attributes: java.util.HashMap<jet.String, jet.String>
-    internal final fun b(/*0*/ init: jet.ExtensionFunction0<html.B, jet.Tuple0>): html.B
-    internal final override /*1*/ val children: java.util.ArrayList<html.Element>
-    internal final fun h1(/*0*/ init: jet.ExtensionFunction0<html.H1, jet.Tuple0>): html.H1
-    protected final override /*1*/ fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
-    internal final override /*1*/ val name: jet.String
-    internal final fun p(/*0*/ init: jet.ExtensionFunction0<html.P, jet.Tuple0>): html.P
-    internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
-    invisible_fake abstract override /*1*/ fun renderAttributes(): jet.String?
-    internal open override /*1*/ fun toString(): jet.String?
-    internal final fun ul(/*0*/ init: jet.ExtensionFunction0<html.UL, jet.Tuple0>): html.UL
-}
-internal abstract trait html.Element : jet.Any {
-    internal abstract fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
-    internal open fun toString(): jet.String?
-}
-internal final class html.H1 : html.BodyTag {
-    public final /*constructor*/ fun <init>(): html.H1
-    internal final override /*1*/ fun a(/*0*/ href: jet.String, /*1*/ init: jet.ExtensionFunction0<html.A, jet.Tuple0>): jet.Tuple0
-    internal final override /*1*/ val attributes: java.util.HashMap<jet.String, jet.String>
-    internal final override /*1*/ fun b(/*0*/ init: jet.ExtensionFunction0<html.B, jet.Tuple0>): html.B
-    internal final override /*1*/ val children: java.util.ArrayList<html.Element>
-    internal final override /*1*/ fun h1(/*0*/ init: jet.ExtensionFunction0<html.H1, jet.Tuple0>): html.H1
-    protected final override /*1*/ fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
-    internal final override /*1*/ val name: jet.String
-    internal final override /*1*/ fun p(/*0*/ init: jet.ExtensionFunction0<html.P, jet.Tuple0>): html.P
-    internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
-    invisible_fake abstract override /*1*/ fun renderAttributes(): jet.String?
-    internal open override /*1*/ fun toString(): jet.String?
-    internal final override /*1*/ fun ul(/*0*/ init: jet.ExtensionFunction0<html.UL, jet.Tuple0>): html.UL
-}
-internal final class html.HTML : html.TagWithText {
-    public final /*constructor*/ fun <init>(): html.HTML
-    internal final override /*1*/ val attributes: java.util.HashMap<jet.String, jet.String>
-    internal final fun body(/*0*/ init: jet.ExtensionFunction0<html.Body, jet.Tuple0>): html.Body
-    internal final override /*1*/ val children: java.util.ArrayList<html.Element>
-    internal final fun head(/*0*/ init: jet.ExtensionFunction0<html.Head, jet.Tuple0>): html.Head
-    protected final override /*1*/ fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
-    internal final override /*1*/ val name: jet.String
-    internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
-    invisible_fake abstract override /*1*/ fun renderAttributes(): jet.String?
-    internal open override /*1*/ fun toString(): jet.String?
-}
-internal final class html.Head : html.TagWithText {
-    public final /*constructor*/ fun <init>(): html.Head
-    internal final override /*1*/ val attributes: java.util.HashMap<jet.String, jet.String>
-    internal final override /*1*/ val children: java.util.ArrayList<html.Element>
-    protected final override /*1*/ fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
-    internal final override /*1*/ val name: jet.String
-    internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
-    invisible_fake abstract override /*1*/ fun renderAttributes(): jet.String?
-    internal final fun title(/*0*/ init: jet.ExtensionFunction0<html.Title, jet.Tuple0>): html.Title
-    internal open override /*1*/ fun toString(): jet.String?
-}
-internal final class html.LI : html.BodyTag {
-    public final /*constructor*/ fun <init>(): html.LI
-    internal final override /*1*/ fun a(/*0*/ href: jet.String, /*1*/ init: jet.ExtensionFunction0<html.A, jet.Tuple0>): jet.Tuple0
-    internal final override /*1*/ val attributes: java.util.HashMap<jet.String, jet.String>
-    internal final override /*1*/ fun b(/*0*/ init: jet.ExtensionFunction0<html.B, jet.Tuple0>): html.B
-    internal final override /*1*/ val children: java.util.ArrayList<html.Element>
-    internal final override /*1*/ fun h1(/*0*/ init: jet.ExtensionFunction0<html.H1, jet.Tuple0>): html.H1
-    protected final override /*1*/ fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
-    internal final override /*1*/ val name: jet.String
-    internal final override /*1*/ fun p(/*0*/ init: jet.ExtensionFunction0<html.P, jet.Tuple0>): html.P
-    internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
-    invisible_fake abstract override /*1*/ fun renderAttributes(): jet.String?
-    internal open override /*1*/ fun toString(): jet.String?
-    internal final override /*1*/ fun ul(/*0*/ init: jet.ExtensionFunction0<html.UL, jet.Tuple0>): html.UL
-}
-internal final class html.P : html.BodyTag {
-    public final /*constructor*/ fun <init>(): html.P
-    internal final override /*1*/ fun a(/*0*/ href: jet.String, /*1*/ init: jet.ExtensionFunction0<html.A, jet.Tuple0>): jet.Tuple0
-    internal final override /*1*/ val attributes: java.util.HashMap<jet.String, jet.String>
-    internal final override /*1*/ fun b(/*0*/ init: jet.ExtensionFunction0<html.B, jet.Tuple0>): html.B
-    internal final override /*1*/ val children: java.util.ArrayList<html.Element>
-    internal final override /*1*/ fun h1(/*0*/ init: jet.ExtensionFunction0<html.H1, jet.Tuple0>): html.H1
-    protected final override /*1*/ fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
-    internal final override /*1*/ val name: jet.String
-    internal final override /*1*/ fun p(/*0*/ init: jet.ExtensionFunction0<html.P, jet.Tuple0>): html.P
-    internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
-    invisible_fake abstract override /*1*/ fun renderAttributes(): jet.String?
-    internal open override /*1*/ fun toString(): jet.String?
-    internal final override /*1*/ fun ul(/*0*/ init: jet.ExtensionFunction0<html.UL, jet.Tuple0>): html.UL
-}
-internal abstract class html.Tag : html.Element {
-    public final /*constructor*/ fun <init>(/*0*/ name: jet.String): html.Tag
-    internal final val attributes: java.util.HashMap<jet.String, jet.String>
-    internal final val children: java.util.ArrayList<html.Element>
-    protected final fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    internal final val name: jet.String
-    internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
-    private final fun renderAttributes(): jet.String?
-    internal open override /*1*/ fun toString(): jet.String?
-}
-internal abstract class html.TagWithText : html.Tag {
-    public final /*constructor*/ fun <init>(/*0*/ name: jet.String): html.TagWithText
-    internal final override /*1*/ val attributes: java.util.HashMap<jet.String, jet.String>
-    internal final override /*1*/ val children: java.util.ArrayList<html.Element>
-    protected final override /*1*/ fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    internal final fun jet.String.plus(): jet.Tuple0
-    internal final override /*1*/ val name: jet.String
-    internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
-    invisible_fake abstract override /*1*/ fun renderAttributes(): jet.String?
-    internal open override /*1*/ fun toString(): jet.String?
-}
-internal final class html.TextElement : html.Element {
-    public final /*constructor*/ fun <init>(/*0*/ text: jet.String): html.TextElement
-    internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
-    internal final val text: jet.String
-    internal open override /*1*/ fun toString(): jet.String?
-}
-internal final class html.Title : html.TagWithText {
-    public final /*constructor*/ fun <init>(): html.Title
-    internal final override /*1*/ val attributes: java.util.HashMap<jet.String, jet.String>
-    internal final override /*1*/ val children: java.util.ArrayList<html.Element>
-    protected final override /*1*/ fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
-    internal final override /*1*/ val name: jet.String
-    internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
-    invisible_fake abstract override /*1*/ fun renderAttributes(): jet.String?
-    internal open override /*1*/ fun toString(): jet.String?
-}
-internal final class html.UL : html.BodyTag {
-    public final /*constructor*/ fun <init>(): html.UL
-    internal final override /*1*/ fun a(/*0*/ href: jet.String, /*1*/ init: jet.ExtensionFunction0<html.A, jet.Tuple0>): jet.Tuple0
-    internal final override /*1*/ val attributes: java.util.HashMap<jet.String, jet.String>
-    internal final override /*1*/ fun b(/*0*/ init: jet.ExtensionFunction0<html.B, jet.Tuple0>): html.B
-    internal final override /*1*/ val children: java.util.ArrayList<html.Element>
-    internal final override /*1*/ fun h1(/*0*/ init: jet.ExtensionFunction0<html.H1, jet.Tuple0>): html.H1
-    protected final override /*1*/ fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
-    internal final fun li(/*0*/ init: jet.ExtensionFunction0<html.LI, jet.Tuple0>): html.LI
-    internal final override /*1*/ val name: jet.String
-    internal final override /*1*/ fun p(/*0*/ init: jet.ExtensionFunction0<html.P, jet.Tuple0>): html.P
-    internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
-    invisible_fake abstract override /*1*/ fun renderAttributes(): jet.String?
-    internal open override /*1*/ fun toString(): jet.String?
-    internal final override /*1*/ fun ul(/*0*/ init: jet.ExtensionFunction0<html.UL, jet.Tuple0>): html.UL
-}
-internal final fun html(/*0*/ init: jet.ExtensionFunction0<html.HTML, jet.Tuple0>): html.HTML
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-internal final fun print(/*0*/ message: jet.Any?): jet.Tuple0
-internal final fun println(/*0*/ message: jet.Any?): jet.Tuple0
-internal final fun </*0*/ K : jet.Any?, /*1*/ V : jet.Any?>java.util.Map<K, V>.set(/*0*/ key: K, /*1*/ value: V): V?
-// </namespace name="html">
diff --git a/compiler/testData/lazyResolve/diagnostics/Casts.txt b/compiler/testData/lazyResolve/diagnostics/Casts.txt
deleted file mode 100644
index 8a9f72ae986..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/Casts.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/CharacterLiterals.txt b/compiler/testData/lazyResolve/diagnostics/CharacterLiterals.txt
deleted file mode 100644
index e35be5298b9..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/CharacterLiterals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun test(/*0*/ c: jet.Char): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/ClassObjectCannotAccessClassFields.txt b/compiler/testData/lazyResolve/diagnostics/ClassObjectCannotAccessClassFields.txt
deleted file mode 100644
index bd839591af6..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/ClassObjectCannotAccessClassFields.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal final val x: jet.Int
-    internal final class object A.<no name provided> : jet.Any {
-        internal final /*constructor*/ fun <init>(): A.<no name provided>
-        internal final val y: [ERROR : Type for x]
-    }
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/ClassObjectVisibility.txt b/compiler/testData/lazyResolve/diagnostics/ClassObjectVisibility.txt
deleted file mode 100644
index 2deefa0d0e0..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/ClassObjectVisibility.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace <root>
-
-// <namespace name="foo">
-namespace foo
-
-internal final class foo.A : jet.Any {
-    public final /*constructor*/ fun <init>(): foo.A
-    public final class object foo.A.<no name provided> : jet.Any {
-        internal final /*constructor*/ fun <init>(): foo.A.<no name provided>
-        internal final val d: jet.Int
-        private final val f: foo.A.<no name provided>.f
-    }
-}
-internal final class foo.CCC : jet.Any {
-    public final /*constructor*/ fun <init>(): foo.CCC
-    private final class object foo.CCC.<no name provided> : jet.Any {
-        internal final /*constructor*/ fun <init>(): foo.CCC.<no name provided>
-        internal final val classObjectVar: jet.Int
-    }
-}
-internal final fun test(): jet.Tuple0
-// </namespace name="foo">
diff --git a/compiler/testData/lazyResolve/diagnostics/ClassObjects.txt b/compiler/testData/lazyResolve/diagnostics/ClassObjects.txt
deleted file mode 100644
index fae72f46adf..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/ClassObjects.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace <root>
-
-// <namespace name="Jet86">
-namespace Jet86
-
-internal final class Jet86.A : jet.Any {
-    public final /*constructor*/ fun <init>(): Jet86.A
-    internal final class object Jet86.A.<no name provided> : jet.Any {
-        internal final /*constructor*/ fun <init>(): Jet86.A.<no name provided>
-        internal final val x: jet.Int
-    }
-}
-internal final class Jet86.B : jet.Any {
-    public final /*constructor*/ fun <init>(): Jet86.B
-    internal final val x: jet.Int
-}
-internal final val a: jet.Int
-internal final val b: Jet86.b
-internal final val c: jet.Int
-internal final val d: [ERROR : Type for b.x]
-internal final val s: java.lang.System
-internal final fun test(): jet.Tuple0
-// </namespace name="Jet86">
diff --git a/compiler/testData/lazyResolve/diagnostics/Constants.txt b/compiler/testData/lazyResolve/diagnostics/Constants.txt
deleted file mode 100644
index 8a9f72ae986..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/Constants.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/Constructors.txt b/compiler/testData/lazyResolve/diagnostics/Constructors.txt
deleted file mode 100644
index 5fd8e62a67e..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/Constructors.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-namespace <root>
-
-internal final class Foo : WithPC0 {
-    public final /*constructor*/ fun <init>(): Foo
-}
-internal open class NoC : jet.Any {
-    public final /*constructor*/ fun <init>(): NoC
-}
-internal final class NoC1 : NoC {
-    public final /*constructor*/ fun <init>(): NoC1
-}
-internal final class NoC2 : WithC1 {
-    public final /*constructor*/ fun <init>(): NoC2
-}
-internal final class NoC3 : WithC1 {
-    public final /*constructor*/ fun <init>(): NoC3
-}
-internal final class NoCPI : jet.Any {
-    public final /*constructor*/ fun <init>(): NoCPI
-    internal final val a: jet.Int
-    internal final var ab: jet.Int
-}
-internal final class WithC0 : NoC {
-    public final /*constructor*/ fun <init>(): WithC0
-}
-internal open class WithC1 : NoC {
-    public final /*constructor*/ fun <init>(): WithC1
-}
-internal final class WithC2 : WithC1 {
-    public final /*constructor*/ fun <init>(): WithC2
-}
-internal final class WithCPI : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ x: jet.Int): WithCPI
-    internal final val a: jet.Int
-    internal final val b: jet.Int
-    internal final val xy: jet.Int
-}
-internal final class WithCPI_Dup : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ x: jet.Int): WithCPI_Dup
-    internal final var x: jet.Int
-}
-internal final class WithPC0 : jet.Any {
-    public final /*constructor*/ fun <init>(): WithPC0
-}
-internal final class WithPC1 : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ a: jet.Int): WithPC1
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/CovariantOverrideType.txt b/compiler/testData/lazyResolve/diagnostics/CovariantOverrideType.txt
deleted file mode 100644
index a8b2c6cd8ad..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/CovariantOverrideType.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace <root>
-
-internal abstract trait A : jet.Any {
-    internal abstract val a1: jet.Int
-    internal abstract val a: jet.Int
-    internal open fun foo(): jet.Int
-    internal open fun foo1(): jet.Int
-    internal open fun foo2(): jet.Int
-    internal abstract fun </*0*/ T : jet.Any?>g(): T
-    internal abstract fun </*0*/ T : jet.Any?>g1(): T
-    internal abstract val  </*0*/ T : jet.Any?> g: jet.Iterator<T>
-}
-internal abstract class B : A {
-    public final /*constructor*/ fun <init>(): B
-    internal open override /*1*/ val a1: jet.Double
-    internal open override /*1*/ val a: jet.Double
-    internal open override /*1*/ fun foo(): jet.Tuple0
-    internal open override /*1*/ fun foo1(): jet.Int
-    internal open override /*1*/ fun foo2(): jet.Tuple0
-    internal abstract override /*1*/ fun </*0*/ X : jet.Any?>g(): jet.Int
-    internal abstract override /*1*/ fun </*0*/ X : jet.Any?>g1(): java.util.List<X>
-    internal abstract override /*1*/ val  </*0*/ X : jet.Any?> g: jet.Iterator<jet.Int>
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/DanglingFunctionLiteral.txt b/compiler/testData/lazyResolve/diagnostics/DanglingFunctionLiteral.txt
deleted file mode 100644
index 1903119e889..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/DanglingFunctionLiteral.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace <root>
-
-internal final class Foo : jet.Any {
-    public final /*constructor*/ fun <init>(): Foo
-    private final val builder: java.lang.StringBuilder
-}
-internal final class Foo1 : jet.Any {
-    public final /*constructor*/ fun <init>(): Foo1
-    private final val builder: [ERROR : Type for StringBuilder("sdfsd")
-    
-            {
-            }]
-}
-internal final fun foo(): jet.Function0<[ERROR : <return type>]>
-internal final fun foo1(): jet.Function0<jet.Function0<jet.Tuple0>>
-internal final fun println(): jet.Tuple0
-internal final fun println(/*0*/ i: jet.Int): jet.Tuple0
-internal final fun println(/*0*/ s: jet.Byte): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/DefaultValuesTypechecking.txt b/compiler/testData/lazyResolve/diagnostics/DefaultValuesTypechecking.txt
deleted file mode 100644
index 22340720a93..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/DefaultValuesTypechecking.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ x: jet.Int = ?, /*1*/ y: jet.Int = ?): A
-    internal final fun foo(/*0*/ bool: jet.Boolean, /*1*/ a: jet.Int = ?, /*2*/ b: jet.String = ?): jet.Tuple0
-}
-internal final val x: jet.String
-internal final val z: jet.Int
-internal final fun bar(/*0*/ x: jet.Int = ?, /*1*/ y: jet.Int = ?, /*2*/ z: jet.String = ?): jet.Tuple0
-internal final fun foo(/*0*/ x: jet.Int = ?, /*1*/ y: jet.Int = ?, /*2*/ i: jet.Int = ?): jet.Int
diff --git a/compiler/testData/lazyResolve/diagnostics/DeferredTypes.txt b/compiler/testData/lazyResolve/diagnostics/DeferredTypes.txt
deleted file mode 100644
index ebfff80bc3a..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/DeferredTypes.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace <root>
-
-internal abstract trait T : jet.Any {
-    internal open val a: [ERROR : <ERROR FUNCTION RETURN TYPE>]
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/DelegationAndOverriding.txt b/compiler/testData/lazyResolve/diagnostics/DelegationAndOverriding.txt
deleted file mode 100644
index 949a0cc1e8d..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/DelegationAndOverriding.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-namespace <root>
-
-internal open class Br : T {
-    public final /*constructor*/ fun <init>(/*0*/ t: T): Br
-    internal abstract override /*1*/ fun foo(): jet.Tuple0
-    internal abstract override /*1*/ val v: jet.Int
-}
-internal open class Br1 : T {
-    public final /*constructor*/ fun <init>(/*0*/ t: T): Br1
-    internal open override /*1*/ fun foo(): jet.Tuple0
-    internal open override /*1*/ val v: jet.Int
-}
-internal final class Br2 : Br1 {
-    public final /*constructor*/ fun <init>(/*0*/ t: T): Br2
-    internal open override /*1*/ fun foo(): jet.Tuple0
-    internal open override /*1*/ val v: jet.Int
-}
-internal final class Br3 : Br {
-    public final /*constructor*/ fun <init>(/*0*/ t: T): Br3
-    internal abstract override /*1*/ fun foo(): jet.Tuple0
-    internal abstract override /*1*/ val v: jet.Int
-}
-internal abstract trait G</*0*/ T : jet.Any?> : jet.Any {
-    internal abstract fun foo(/*0*/ t: T): T
-}
-internal final class GC : G<jet.Int> {
-    public final /*constructor*/ fun <init>(): GC
-    internal abstract override /*1*/ fun foo(/*0*/ t: jet.Int): jet.Int
-}
-internal open class GC1 : G<jet.Int> {
-    public final /*constructor*/ fun <init>(/*0*/ g: G<jet.Int>): GC1
-    internal open override /*1*/ fun foo(/*0*/ t: jet.Int): jet.Int
-}
-internal open class GC2 : GC1 {
-    public final /*constructor*/ fun <init>(/*0*/ g: G<jet.Int>): GC2
-    internal open override /*1*/ fun foo(/*0*/ t: jet.Int): jet.Int
-}
-internal abstract trait T : jet.Any {
-    internal abstract fun foo(): jet.Tuple0
-    internal abstract val v: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/DelegationNotTotrait.txt b/compiler/testData/lazyResolve/diagnostics/DelegationNotTotrait.txt
deleted file mode 100644
index 4b15cafbf32..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/DelegationNotTotrait.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace <root>
-
-internal final class Barrr : Foo {
-    public final /*constructor*/ fun <init>(): Barrr
-}
-internal final class Br : T {
-    public final /*constructor*/ fun <init>(/*0*/ t: T): Br
-}
-internal open enum class E : jet.Any {
-    public final /*constructor*/ fun <init>(): E
-    internal final class object E.<class-object-for-E> {
-        internal final /*constructor*/ fun <init>(): E.<class-object-for-E>
-    }
-}
-internal open class Foo : jet.Any {
-    public final /*constructor*/ fun <init>(): Foo
-}
-internal abstract trait T : jet.Any {
-}
-internal final class Test2 : E {
-    public final /*constructor*/ fun <init>(/*0*/ e: E): Test2
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/DiamondFunction.txt b/compiler/testData/lazyResolve/diagnostics/DiamondFunction.txt
deleted file mode 100644
index 8dbb888ad89..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/DiamondFunction.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace <root>
-
-internal open class Base : jet.Any {
-    public final /*constructor*/ fun <init>(): Base
-    internal final fun f(): jet.Int
-}
-internal final class Diamond : Left, Right {
-    public final /*constructor*/ fun <init>(): Diamond
-    internal final override /*2*/ fun f(): jet.Int
-}
-internal open class Left : Base {
-    public final /*constructor*/ fun <init>(): Left
-    internal final override /*1*/ fun f(): jet.Int
-}
-internal abstract trait Right : Base {
-    internal final override /*1*/ fun f(): jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/DiamondFunctionGeneric.txt b/compiler/testData/lazyResolve/diagnostics/DiamondFunctionGeneric.txt
deleted file mode 100644
index 7bc103a2e3a..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/DiamondFunctionGeneric.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace <root>
-
-internal open class Base</*0*/ P : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): Base<P>
-    internal final fun f(): jet.Int
-}
-internal final class Diamond</*0*/ P : jet.Any?> : Left<P>, Right<P> {
-    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): Diamond<P>
-    internal final override /*2*/ fun f(): jet.Int
-}
-internal open class Left</*0*/ P : jet.Any?> : Base<P> {
-    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): Left<P>
-    internal final override /*1*/ fun f(): jet.Int
-}
-internal abstract trait Right</*0*/ P : jet.Any?> : Base<P> {
-    internal final override /*1*/ fun f(): jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/DiamondProperty.txt b/compiler/testData/lazyResolve/diagnostics/DiamondProperty.txt
deleted file mode 100644
index 9481d4cb5c3..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/DiamondProperty.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace <root>
-
-internal open class Base : jet.Any {
-    public final /*constructor*/ fun <init>(): Base
-    internal final var v: jet.Int
-}
-internal final class Diamond : Left, Right {
-    public final /*constructor*/ fun <init>(): Diamond
-    internal final override /*2*/ var v: jet.Int
-}
-internal open class Left : Base {
-    public final /*constructor*/ fun <init>(): Left
-    internal final override /*1*/ var v: jet.Int
-}
-internal abstract trait Right : Base {
-    internal final override /*1*/ var v: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/Dollar.txt b/compiler/testData/lazyResolve/diagnostics/Dollar.txt
deleted file mode 100644
index 4cd12fc808b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/Dollar.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace <root>
-
-// <namespace name="dollar">
-namespace dollar
-
-internal open class dollar.$ : jet.Any {
-    public final /*constructor*/ fun <init>(): dollar.$
-}
-internal open class dollar.$$ : dollar.$ {
-    public open fun $$$$$$(): dollar.$$$$$?
-    internal final val $$$: dollar.$$$$$?
-    public final /*constructor*/ fun <init>(/*0*/ $$$$: dollar.$$$$$?): dollar.$$
-}
-internal open class dollar.$$$$$ : jet.Any {
-    public final /*constructor*/ fun <init>(): dollar.$$$$$
-}
-// </namespace name="dollar">
diff --git a/compiler/testData/lazyResolve/diagnostics/Enums.txt b/compiler/testData/lazyResolve/diagnostics/Enums.txt
deleted file mode 100644
index 26438173e50..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/Enums.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-internal final enum class List</*0*/ out T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T : jet.Any?><init>(/*0*/ size: jet.Int): List<T>
-    internal final val size: jet.Int
-    internal final class object List.<class-object-for-List> {
-        internal final /*constructor*/ fun <init>(): List.<class-object-for-List>
-        internal final val Nil: List.<class-object-for-List>.Nil
-    }
-}
-internal final val foo: List.<class-object-for-List>.Nil
-internal final val foo1: jet.Int
diff --git a/compiler/testData/lazyResolve/diagnostics/ForRangeConventions.txt b/compiler/testData/lazyResolve/diagnostics/ForRangeConventions.txt
deleted file mode 100644
index e159db65aeb..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/ForRangeConventions.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-namespace <root>
-
-internal abstract class AmbiguousHasNextIterator : jet.Any {
-    public final /*constructor*/ fun <init>(): AmbiguousHasNextIterator
-    internal abstract fun hasNext(): jet.Boolean
-    internal final val hasNext: jet.Boolean
-    internal abstract fun next(): jet.Int
-}
-internal abstract class GoodIterator : jet.Any {
-    public final /*constructor*/ fun <init>(): GoodIterator
-    internal abstract fun hasNext(): jet.Boolean
-    internal abstract fun next(): jet.Int
-}
-internal abstract class ImproperIterator1 : jet.Any {
-    public final /*constructor*/ fun <init>(): ImproperIterator1
-    internal abstract fun hasNext(): jet.Boolean
-}
-internal abstract class ImproperIterator2 : jet.Any {
-    public final /*constructor*/ fun <init>(): ImproperIterator2
-    internal abstract fun next(): jet.Boolean
-}
-internal abstract class ImproperIterator3 : jet.Any {
-    public final /*constructor*/ fun <init>(): ImproperIterator3
-    internal abstract fun hasNext(): jet.Int
-    internal abstract fun next(): jet.Int
-}
-internal abstract class ImproperIterator4 : jet.Any {
-    public final /*constructor*/ fun <init>(): ImproperIterator4
-    internal final val hasNext: jet.Int
-    internal abstract fun next(): jet.Int
-}
-internal abstract class ImproperIterator5 : jet.Any {
-    public final /*constructor*/ fun <init>(): ImproperIterator5
-    internal abstract val jet.String.hasNext: jet.Boolean
-    internal abstract fun next(): jet.Int
-}
-internal final class NotRange1 : jet.Any {
-    public final /*constructor*/ fun <init>(): NotRange1
-}
-internal abstract class NotRange2 : jet.Any {
-    public final /*constructor*/ fun <init>(): NotRange2
-    internal abstract fun iterator(): jet.Tuple0
-}
-internal abstract class NotRange3 : jet.Any {
-    public final /*constructor*/ fun <init>(): NotRange3
-    internal abstract fun iterator(): ImproperIterator1
-}
-internal abstract class NotRange4 : jet.Any {
-    public final /*constructor*/ fun <init>(): NotRange4
-    internal abstract fun iterator(): ImproperIterator2
-}
-internal abstract class NotRange5 : jet.Any {
-    public final /*constructor*/ fun <init>(): NotRange5
-    internal abstract fun iterator(): ImproperIterator3
-}
-internal abstract class NotRange6 : jet.Any {
-    public final /*constructor*/ fun <init>(): NotRange6
-    internal abstract fun iterator(): AmbiguousHasNextIterator
-}
-internal abstract class NotRange7 : jet.Any {
-    public final /*constructor*/ fun <init>(): NotRange7
-    internal abstract fun iterator(): ImproperIterator3
-}
-internal abstract class NotRange8 : jet.Any {
-    public final /*constructor*/ fun <init>(): NotRange8
-    internal abstract fun iterator(): ImproperIterator5
-}
-internal abstract class Range0 : jet.Any {
-    public final /*constructor*/ fun <init>(): Range0
-    internal abstract fun iterator(): GoodIterator
-}
-internal abstract class Range1 : jet.Any {
-    public final /*constructor*/ fun <init>(): Range1
-    internal abstract fun iterator(): java.util.Iterator<jet.Int>
-}
-internal final fun test(/*0*/ notRange1: NotRange1, /*1*/ notRange2: NotRange2, /*2*/ notRange3: NotRange3, /*3*/ notRange4: NotRange4, /*4*/ notRange5: NotRange5, /*5*/ notRange6: NotRange6, /*6*/ notRange7: NotRange7, /*7*/ notRange8: NotRange8, /*8*/ range0: Range0, /*9*/ range1: Range1): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/FunctionCalleeExpressions.txt b/compiler/testData/lazyResolve/diagnostics/FunctionCalleeExpressions.txt
deleted file mode 100644
index b053169382c..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/FunctionCalleeExpressions.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace <root>
-
-// <namespace name="foo">
-namespace foo
-
-internal final fun f(): jet.ExtensionFunction0<jet.Int, jet.Tuple0>
-internal final fun jet.Any.foo(): jet.Function0<jet.Tuple0>
-internal final fun jet.Any.foo1(): jet.Function1<jet.Int, jet.Tuple0>
-internal final fun foo2(): jet.Function1<jet.Function0<jet.Tuple0>, jet.Tuple0>
-internal final fun </*0*/ T : jet.Any?>fooT1(/*0*/ t: T): jet.Function0<T>
-internal final fun </*0*/ T : jet.Any?>fooT2(): jet.Function1<T, T>
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-internal final fun main1(): jet.Tuple0
-internal final fun test(): jet.Tuple0
-// </namespace name="foo">
diff --git a/compiler/testData/lazyResolve/diagnostics/FunctionReturnTypes.txt b/compiler/testData/lazyResolve/diagnostics/FunctionReturnTypes.txt
deleted file mode 100644
index 2a425c0d7bc..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/FunctionReturnTypes.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-namespace <root>
-
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-}
-internal final class B : jet.Any {
-    public final /*constructor*/ fun <init>(): B
-    protected final fun f(): jet.String
-}
-internal final val a: jet.Nothing
-internal final fun bbb(): jet.Tuple0
-internal final fun blockAndAndMismatch(): jet.Int
-internal final fun blockAndAndMismatch1(): jet.Int
-internal final fun blockAndAndMismatch2(): jet.Int
-internal final fun blockAndAndMismatch3(): jet.Int
-internal final fun blockAndAndMismatch4(): jet.Int
-internal final fun blockAndAndMismatch5(): jet.Int
-internal final fun blockNoReturnIfEmptyIf(): jet.Int
-internal final fun blockNoReturnIfUnitInOneBranch(): jet.Int
-internal final fun blockNoReturnIfValDeclaration(): jet.Int
-internal final fun blockReturnUnitMismatch(): jet.Int
-internal final fun blockReturnValueTypeMatch(): jet.Int
-internal final fun blockReturnValueTypeMatch1(): jet.Int
-internal final fun blockReturnValueTypeMatch10(): jet.Int
-internal final fun blockReturnValueTypeMatch11(): jet.Int
-internal final fun blockReturnValueTypeMatch12(): jet.Int
-internal final fun blockReturnValueTypeMatch2(): jet.Int
-internal final fun blockReturnValueTypeMatch3(): jet.Int
-internal final fun blockReturnValueTypeMatch4(): jet.Int
-internal final fun blockReturnValueTypeMatch5(): jet.Int
-internal final fun blockReturnValueTypeMatch6(): jet.Int
-internal final fun blockReturnValueTypeMatch7(): jet.Int
-internal final fun blockReturnValueTypeMatch8(): jet.Int
-internal final fun blockReturnValueTypeMatch9(): jet.Int
-internal final fun blockReturnValueTypeMismatch(): jet.Int
-internal final fun blockReturnValueTypeMismatchUnit(): jet.Int
-internal final fun f(): jet.Int
-internal final fun f1(): jet.Int
-public final fun f2(): jet.Int
-internal final fun foo(/*0*/ expr: java.lang.StringBuilder): jet.Int
-internal final fun illegalConstantBlock(): jet.String
-internal final fun illegalConstantBody(): jet.Int
-internal final fun illegalIfBlock(): jet.Boolean
-internal final fun illegalIfBody(): jet.Int
-internal final fun illegalReturnIf(): jet.Char
-internal final fun intBlock(): jet.Int
-internal final fun intBlock1(): jet.Int
-internal final fun intEmpty(): jet.Int
-internal final fun intFunctionLiteral(): jet.Int
-internal final fun intShort(): jet.Int
-internal final fun intShortInfer(): jet.Int
-internal final fun intString(): jet.Int
-internal final fun nonBlockNoReturnIfUnitInOneBranch(): jet.Int
-internal final fun nonBlockReturnIfEmptyIf(): jet.Int
-internal final fun none(): jet.Tuple0
-internal final fun returnNothing(): jet.Nothing
-internal final fun test1(): jet.Any
-internal final fun test2(): jet.Any
-internal final fun test3(): jet.Any
-internal final fun test4(): jet.Function0<jet.Tuple0>
-internal final fun test5(): jet.Any
-internal final fun test6(): jet.Any
-internal final fun testFunctionLiterals(): jet.Tuple0
-internal final fun unitEmpty(): jet.Tuple0
-internal final fun unitEmptyInfer(): jet.Tuple0
-internal final fun unitEmptyReturn(): jet.Tuple0
-internal final fun unitIntReturn(): jet.Tuple0
-internal final fun unitShort(): jet.Tuple0
-internal final fun unitShortConv(): jet.Tuple0
-internal final fun unitShortNull(): jet.Tuple0
-internal final fun unitUnitReturn(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/GenericArgumentConsistency.txt b/compiler/testData/lazyResolve/diagnostics/GenericArgumentConsistency.txt
deleted file mode 100644
index d7b4f71d641..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/GenericArgumentConsistency.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-namespace <root>
-
-// <namespace name="x">
-namespace x
-
-internal abstract trait x.AA1</*0*/ out T : jet.Any?> : jet.Any {
-}
-internal abstract trait x.AB1 : x.AA1<jet.Int> {
-}
-internal abstract trait x.AB2 : x.AA1<jet.Number>, x.AB1, x.AB3 {
-}
-internal abstract trait x.AB3 : x.AA1<jet.Comparable<jet.Int>> {
-}
-// </namespace name="x">
-// <namespace name="x2">
-namespace x2
-
-internal abstract trait x2.AA1</*0*/ out T : jet.Any?> : jet.Any {
-}
-internal abstract trait x2.AB1 : x2.AA1<jet.Any> {
-}
-internal abstract trait x2.AB2 : x2.AA1<jet.Number>, x2.AB1, x2.AB3 {
-}
-internal abstract trait x2.AB3 : x2.AA1<jet.Comparable<jet.Int>> {
-}
-// </namespace name="x2">
-// <namespace name="x3">
-namespace x3
-
-internal abstract trait x3.AA1</*0*/ in T : jet.Any?> : jet.Any {
-}
-internal abstract trait x3.AB1 : x3.AA1<jet.Any> {
-}
-internal abstract trait x3.AB2 : x3.AA1<jet.Number>, x3.AB1, x3.AB3 {
-}
-internal abstract trait x3.AB3 : x3.AA1<jet.Comparable<jet.Int>> {
-}
-// </namespace name="x3">
-// <namespace name="sx2">
-namespace sx2
-
-internal abstract trait sx2.AA1</*0*/ in T : jet.Any?> : jet.Any {
-}
-internal abstract trait sx2.AB1 : sx2.AA1<jet.Int> {
-}
-internal abstract trait sx2.AB2 : sx2.AA1<jet.Number>, sx2.AB1, sx2.AB3 {
-}
-internal abstract trait sx2.AB3 : sx2.AA1<jet.Comparable<jet.Int>> {
-}
-// </namespace name="sx2">
-internal abstract trait A</*0*/ in T : jet.Any?> : jet.Any {
-}
-internal abstract trait A1</*0*/ out T : jet.Any?> : jet.Any {
-}
-internal abstract trait B</*0*/ T : jet.Any?> : A<jet.Int> {
-}
-internal abstract trait B1 : A1<jet.Int> {
-}
-internal abstract trait B2 : A1<jet.Any>, B1 {
-}
-internal abstract trait BA1</*0*/ T : jet.Any?> : jet.Any {
-}
-internal abstract trait BB1 : BA1<jet.Int> {
-}
-internal abstract trait BB2 : BA1<jet.Any>, BB1 {
-}
-internal abstract trait C</*0*/ T : jet.Any?> : B<T>, A<T> {
-}
-internal abstract trait C1</*0*/ T : jet.Any?> : B<T>, A<jet.Any> {
-}
-internal abstract trait D : C<jet.Boolean>, B<jet.Double> {
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/GenericFunctionIsLessSpecific.txt b/compiler/testData/lazyResolve/diagnostics/GenericFunctionIsLessSpecific.txt
deleted file mode 100644
index e33defc249c..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/GenericFunctionIsLessSpecific.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace <root>
-
-internal final fun foo(/*0*/ i: jet.Int): jet.Int
-internal final fun </*0*/ T : jet.Any?>foo(/*0*/ t: T): jet.Tuple0
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/IllegalModifiers.txt b/compiler/testData/lazyResolve/diagnostics/IllegalModifiers.txt
deleted file mode 100644
index cb266716a9b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/IllegalModifiers.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace <root>
-
-// <namespace name="illegal_modifiers">
-namespace illegal_modifiers
-
-internal abstract class illegal_modifiers.A : jet.Any {
-    public final /*constructor*/ fun <init>(): illegal_modifiers.A
-    internal abstract fun f(): jet.Tuple0
-    internal abstract fun g(): jet.Tuple0
-    internal open fun h(): jet.Tuple0
-    internal open var r: jet.String protected set
-}
-internal final class illegal_modifiers.FinalClass : jet.Any {
-    public final /*constructor*/ fun <init>(): illegal_modifiers.FinalClass
-    internal open fun foo(): jet.Tuple0
-    internal final val i: jet.Int
-    internal final var j: jet.Int
-}
-internal final trait illegal_modifiers.T : jet.Any {
-}
-// </namespace name="illegal_modifiers">
diff --git a/compiler/testData/lazyResolve/diagnostics/ImportResolutionOrder.txt b/compiler/testData/lazyResolve/diagnostics/ImportResolutionOrder.txt
deleted file mode 100644
index 0619174a86c..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/ImportResolutionOrder.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-internal final val x: b.X
-// </namespace name="a">
-// <namespace name="b">
-namespace b
-
-internal final class b.X : jet.Any {
-    public final /*constructor*/ fun <init>(): b.X
-}
-// </namespace name="b">
-// <namespace name="c">
-namespace c
-
-internal final val x: d.X
-// </namespace name="c">
-// <namespace name="d">
-namespace d
-
-internal final class d.X : jet.Any {
-    public final /*constructor*/ fun <init>(): d.X
-}
-// </namespace name="d">
diff --git a/compiler/testData/lazyResolve/diagnostics/IncDec.txt b/compiler/testData/lazyResolve/diagnostics/IncDec.txt
deleted file mode 100644
index 248cb16f4fd..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/IncDec.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace <root>
-
-internal final class IncDec : jet.Any {
-    public final /*constructor*/ fun <init>(): IncDec
-    internal final fun dec(): IncDec
-    internal final fun inc(): IncDec
-}
-internal final class UnitIncDec : jet.Any {
-    public final /*constructor*/ fun <init>(): UnitIncDec
-    internal final fun dec(): jet.Tuple0
-    internal final fun inc(): jet.Tuple0
-}
-internal final class WrongIncDec : jet.Any {
-    public final /*constructor*/ fun <init>(): WrongIncDec
-    internal final fun dec(): jet.Int
-    internal final fun inc(): jet.Int
-}
-internal final fun testIncDec(): jet.Tuple0
-internal final fun testUnitIncDec(): jet.Tuple0
-internal final fun testWrongIncDec(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/IncorrectCharacterLiterals.txt b/compiler/testData/lazyResolve/diagnostics/IncorrectCharacterLiterals.txt
deleted file mode 100644
index a951870ff4c..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/IncorrectCharacterLiterals.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun ff(): jet.Tuple0
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/InferNullabilityInThenBlock.txt b/compiler/testData/lazyResolve/diagnostics/InferNullabilityInThenBlock.txt
deleted file mode 100644
index 0c15629d47f..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/InferNullabilityInThenBlock.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun ff(/*0*/ a: jet.String): jet.Int
-internal final fun gg(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/InnerClassClassObject.txt b/compiler/testData/lazyResolve/diagnostics/InnerClassClassObject.txt
deleted file mode 100644
index ef308954e57..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/InnerClassClassObject.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace <root>
-
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal final class A.B : jet.Any {
-        public final /*constructor*/ fun <init>(): A.B
-    }
-}
-internal final class B : jet.Any {
-    public final /*constructor*/ fun <init>(): B
-    internal final class object B.<no name provided> : jet.Any {
-        internal final /*constructor*/ fun <init>(): B.<no name provided>
-        internal final class B.<no name provided>.B : jet.Any {
-            public final /*constructor*/ fun <init>(): B.<no name provided>.B
-            internal final class object B.<no name provided>.B.<no name provided> : jet.Any {
-                internal final /*constructor*/ fun <init>(): B.<no name provided>.B.<no name provided>
-                internal final class B.<no name provided>.B.<no name provided>.C : jet.Any {
-                    public final /*constructor*/ fun <init>(): B.<no name provided>.B.<no name provided>.C
-                    internal final class object B.<no name provided>.B.<no name provided>.C.<no name provided> : jet.Any {
-                        internal final /*constructor*/ fun <init>(): B.<no name provided>.B.<no name provided>.C.<no name provided>
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/IsExpressions.txt b/compiler/testData/lazyResolve/diagnostics/IsExpressions.txt
deleted file mode 100644
index 8a9f72ae986..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/IsExpressions.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/LValueAssignment.txt b/compiler/testData/lazyResolve/diagnostics/LValueAssignment.txt
deleted file mode 100644
index 8632f0617bc..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/LValueAssignment.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-namespace <root>
-
-// <namespace name="lvalue_assignment">
-namespace lvalue_assignment
-
-internal final class lvalue_assignment.A : jet.Any {
-    public final /*constructor*/ fun <init>(): lvalue_assignment.A
-    internal final var a: jet.Int
-}
-internal abstract class lvalue_assignment.Ab : jet.Any {
-    public final /*constructor*/ fun <init>(): lvalue_assignment.Ab
-    internal abstract fun getArray(): jet.Array<jet.Int>
-}
-internal open class lvalue_assignment.B : jet.Any {
-    public final /*constructor*/ fun <init>(): lvalue_assignment.B
-    internal final var b: jet.Int
-    internal final val c: jet.Int
-}
-internal final class lvalue_assignment.C : lvalue_assignment.B {
-    public final /*constructor*/ fun <init>(): lvalue_assignment.C
-    internal final override /*1*/ var b: jet.Int
-    internal final fun bar(/*0*/ c: lvalue_assignment.C): jet.Tuple0
-    internal final override /*1*/ val c: jet.Int
-    internal final fun foo(/*0*/ c: lvalue_assignment.C): jet.Tuple0
-    internal final fun foo1(/*0*/ c: lvalue_assignment.C): jet.Tuple0
-    internal final var x: jet.Int
-}
-internal final class lvalue_assignment.D : jet.Any {
-    public final /*constructor*/ fun <init>(): lvalue_assignment.D
-    internal final class lvalue_assignment.D.B : jet.Any {
-        public final /*constructor*/ fun <init>(): lvalue_assignment.D.B
-        internal final fun foo(): jet.Tuple0
-    }
-}
-internal final class lvalue_assignment.Test : jet.Any {
-    public final /*constructor*/ fun <init>(): lvalue_assignment.Test
-    internal final fun testArrays(/*0*/ a: jet.Array<jet.Int>, /*1*/ ab: lvalue_assignment.Ab): jet.Tuple0
-    internal final fun testIllegalValues(): jet.Tuple0
-    internal final fun testVariables(): jet.Tuple0
-    internal final fun testVariables1(): jet.Tuple0
-}
-internal final fun canBe(/*0*/ i: jet.Int, /*1*/ j: jet.Int): jet.Tuple0
-internal final fun canBe2(/*0*/ j: jet.Int): jet.Tuple0
-internal final fun cannotBe(/*0*/ i: jet.Int): jet.Tuple0
-internal final fun jet.Array<jet.Int>.checkThis(): jet.Tuple0
-internal final fun getInt(): jet.Int
-// </namespace name="lvalue_assignment">
diff --git a/compiler/testData/lazyResolve/diagnostics/MergePackagesWithJava.txt b/compiler/testData/lazyResolve/diagnostics/MergePackagesWithJava.txt
deleted file mode 100644
index 3c0a25e9c0e..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/MergePackagesWithJava.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="java">
-namespace java
-
-internal final val c: java.lang.Class<out jet.Any?>?
-internal final val  </*0*/ T : jet.Any?> jet.Array<T>?.length: jet.Int
-// </namespace name="java">
diff --git a/compiler/testData/lazyResolve/diagnostics/MultilineStringTemplates.txt b/compiler/testData/lazyResolve/diagnostics/MultilineStringTemplates.txt
deleted file mode 100644
index 00b44512421..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/MultilineStringTemplates.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun box(): jet.String
-internal final fun new(): jet.String
diff --git a/compiler/testData/lazyResolve/diagnostics/MultipleBounds.txt b/compiler/testData/lazyResolve/diagnostics/MultipleBounds.txt
deleted file mode 100644
index 351aace8a33..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/MultipleBounds.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-namespace <root>
-
-// <namespace name="Jet87">
-namespace Jet87
-
-internal open class Jet87.A : jet.Any {
-    public final /*constructor*/ fun <init>(): Jet87.A
-    internal final fun foo(): jet.Int
-}
-internal abstract trait Jet87.B : jet.Any {
-    internal open fun bar(): jet.Double
-}
-internal final class Jet87.Bar</*0*/ T : Jet87.Foo> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : Jet87.Foo><init>(): Jet87.Bar<T>
-}
-internal final class Jet87.Buzz</*0*/ T : Jet87.Bar<jet.Int> & [ERROR : nioho]> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : Jet87.Bar<jet.Int> & [ERROR : nioho]><init>(): Jet87.Buzz<T>
-}
-internal final class Jet87.C : Jet87.A, Jet87.B {
-    public final /*constructor*/ fun <init>(): Jet87.C
-    internal open override /*1*/ fun bar(): jet.Double
-    internal final override /*1*/ fun foo(): jet.Int
-}
-internal final class Jet87.D : jet.Any {
-    public final /*constructor*/ fun <init>(): Jet87.D
-    internal final class object Jet87.D.<no name provided> : Jet87.A, Jet87.B {
-        internal final /*constructor*/ fun <init>(): Jet87.D.<no name provided>
-        internal open override /*1*/ fun bar(): jet.Double
-        internal final override /*1*/ fun foo(): jet.Int
-    }
-}
-internal final class Jet87.Foo : jet.Any {
-    public final /*constructor*/ fun <init>(): Jet87.Foo
-}
-internal final class Jet87.Test</*0*/ T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): Jet87.Test<T>
-}
-internal final class Jet87.Test1</*0*/ T : Jet87.A & Jet87.B> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : Jet87.A & Jet87.B><init>(): Jet87.Test1<T>
-    internal final fun test(/*0*/ t: T): jet.Tuple0
-}
-internal final class Jet87.X</*0*/ T : Jet87.Foo> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : Jet87.Foo><init>(): Jet87.X<T>
-}
-internal final class Jet87.Y</*0*/ T : Jet87.Bar<Jet87.Foo> & Jet87.Foo> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : Jet87.Bar<Jet87.Foo> & Jet87.Foo><init>(): Jet87.Y<T>
-}
-internal final val t1: jet.Tuple0
-internal final val t2: jet.Tuple0
-internal final val t3: jet.Tuple0
-internal final val  </*0*/ T : jet.Any?, /*1*/ B : T> x: jet.Int
-internal final fun test(): jet.Tuple0
-internal final fun </*0*/ T : Jet87.A & Jet87.B>test2(/*0*/ t: T): jet.Tuple0
-// </namespace name="Jet87">
diff --git a/compiler/testData/lazyResolve/diagnostics/NamedArgumentsAndDefaultValues.txt b/compiler/testData/lazyResolve/diagnostics/NamedArgumentsAndDefaultValues.txt
deleted file mode 100644
index a69eda6ffd4..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/NamedArgumentsAndDefaultValues.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace <root>
-
-internal final fun bar(/*0*/ x: jet.Int = ?, /*1*/ y: jet.Int = ?, /*2*/ z: jet.String): jet.Tuple0
-internal final fun foo(/*0*/ a: jet.Int = ?, /*1*/ b: jet.String = ?): jet.Tuple0
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/NamespaceAsExpression.txt b/compiler/testData/lazyResolve/diagnostics/NamespaceAsExpression.txt
deleted file mode 100644
index 75b2efa1e19..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/NamespaceAsExpression.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-// <namespace name="root">
-namespace root
-
-// <namespace name="a">
-namespace a
-
-// </namespace name="a">
-internal final val x: [ERROR : Type for a]
-internal final val y2: [ERROR : Type for package]
-// </namespace name="root">
diff --git a/compiler/testData/lazyResolve/diagnostics/NamespaceInExpressionPosition.txt b/compiler/testData/lazyResolve/diagnostics/NamespaceInExpressionPosition.txt
deleted file mode 100644
index a4f7602345f..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/NamespaceInExpressionPosition.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace <root>
-
-// <namespace name="foo">
-namespace foo
-
-internal final class foo.X : jet.Any {
-    public final /*constructor*/ fun <init>(): foo.X
-}
-internal final val s: [ERROR : Type for java]
-internal final val ss: java.lang.System
-internal final val sss: foo.X
-internal final val xs: [ERROR : Type for lang]
-internal final val xss: java.lang.System
-internal final val xsss: foo.X
-internal final val xssss: [ERROR : Type for foo]
-// </namespace name="foo">
diff --git a/compiler/testData/lazyResolve/diagnostics/NamespaceQualified.txt b/compiler/testData/lazyResolve/diagnostics/NamespaceQualified.txt
deleted file mode 100644
index 933451333f8..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/NamespaceQualified.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-namespace <root>
-
-// <namespace name="foobar">
-namespace foobar
-
-// <namespace name="a">
-namespace a
-
-internal final val a: java.util.List<jet.Int>?
-internal final val a1: [ERROR : List<Int>]
-internal final val b: java.util.List<jet.Int>?
-internal final val b1: [ERROR : util.List<Int>]
-// </namespace name="a">
-internal abstract class foobar.Collection</*0*/ E : jet.Any?> : jet.Iterable<E> {
-    public final /*constructor*/ fun </*0*/ E : jet.Any?><init>(): foobar.Collection<E>
-    internal final fun </*0*/ O : jet.Any?>iterate(/*0*/ iteratee: foobar.Iteratee<E, O>): O
-    public abstract override /*1*/ fun iterator(): jet.Iterator<E>
-}
-internal abstract class foobar.Foo</*0*/ T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): foobar.Foo<T>
-    internal abstract val x: T
-}
-internal abstract class foobar.Iteratee</*0*/ in I : jet.Any?, /*1*/ out O : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in I : jet.Any?, /*1*/ out O : jet.Any?><init>(): foobar.Iteratee<I, O>
-    internal abstract fun done(): O
-    internal abstract val isDone: jet.Boolean
-    internal abstract fun process(/*0*/ item: I): foobar.Iteratee<I, O>
-    internal abstract val result: O
-}
-internal final class foobar.StrangeIterateeImpl</*0*/ in I : jet.Any?, /*1*/ out O : jet.Any?> : foobar.Iteratee<I, O> {
-    public final /*constructor*/ fun </*0*/ in I : jet.Any?, /*1*/ out O : jet.Any?><init>(/*0*/ obj: O): foobar.StrangeIterateeImpl<I, O>
-    internal open override /*1*/ fun done(): O
-    internal open override /*1*/ val isDone: jet.Boolean
-    internal final val obj: O
-    internal open override /*1*/ fun process(/*0*/ item: I): foobar.Iteratee<I, O>
-    internal open override /*1*/ val result: O
-}
-internal abstract class foobar.Sum : foobar.Iteratee<jet.Int, jet.Int> {
-    public final /*constructor*/ fun <init>(): foobar.Sum
-    internal abstract override /*1*/ fun done(): jet.Int
-    internal abstract override /*1*/ val isDone: jet.Boolean
-    internal open override /*1*/ fun process(/*0*/ item: jet.Int): foobar.Iteratee<jet.Int, jet.Int>
-    internal abstract override /*1*/ val result: jet.Int
-}
-internal final val x1: java.util.List<jet.Int>?
-internal final val y1: java.util.List<jet.Int>?
-internal final fun </*0*/ O : jet.Any?>done(/*0*/ result: O): foobar.Iteratee<jet.Any?, O>
-// </namespace name="foobar">
diff --git a/compiler/testData/lazyResolve/diagnostics/Nullability.txt b/compiler/testData/lazyResolve/diagnostics/Nullability.txt
deleted file mode 100644
index 3b056c1c633..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/Nullability.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-internal final fun f(/*0*/ out: jet.String?): jet.Tuple0
-internal final fun f1(/*0*/ out: jet.String?): jet.Tuple0
-internal final fun f2(/*0*/ out: jet.String?): jet.Tuple0
-internal final fun f3(/*0*/ out: jet.String?): jet.Tuple0
-internal final fun f4(/*0*/ s: jet.String?): jet.Tuple0
-internal final fun f5(/*0*/ s: jet.String?): jet.Tuple0
-internal final fun f6(/*0*/ s: jet.String?): jet.Tuple0
-internal final fun f7(/*0*/ s: jet.String?, /*1*/ t: jet.String?): jet.Tuple0
-internal final fun f8(/*0*/ b: jet.String?, /*1*/ a: jet.String): jet.Tuple0
-internal final fun f9(/*0*/ a: jet.Int?): jet.Int
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/OverrideFunctionWithParamDefaultValue.txt b/compiler/testData/lazyResolve/diagnostics/OverrideFunctionWithParamDefaultValue.txt
deleted file mode 100644
index 913fa03a234..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/OverrideFunctionWithParamDefaultValue.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace <root>
-
-internal abstract class B : jet.Any {
-    public final /*constructor*/ fun <init>(): B
-    internal abstract fun foo2(/*0*/ arg: jet.Int = ?): jet.Int
-}
-internal final class C : B {
-    public final /*constructor*/ fun <init>(): C
-    internal open override /*1*/ fun foo2(/*0*/ arg: jet.Int = ?): jet.Int
-}
-internal final fun invokeIt(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/OverridenFunctionAndSpecifiedTypeParameter.txt b/compiler/testData/lazyResolve/diagnostics/OverridenFunctionAndSpecifiedTypeParameter.txt
deleted file mode 100644
index 92342e41761..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/OverridenFunctionAndSpecifiedTypeParameter.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-internal abstract trait Aaa</*0*/ T : jet.Any?> : jet.Any {
-    internal abstract fun zzz(/*0*/ value: T): jet.Tuple0
-}
-internal final class Bbb</*0*/ T : jet.Any?> : Aaa<T> {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): Bbb<T>
-    internal open override /*1*/ fun zzz(/*0*/ value: T): jet.Tuple0
-}
-internal final fun foo(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/OverridingVarByVal.txt b/compiler/testData/lazyResolve/diagnostics/OverridingVarByVal.txt
deleted file mode 100644
index 0c5baea4d58..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/OverridingVarByVal.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace <root>
-
-internal final class Val : Var, VarT {
-    public final /*constructor*/ fun <init>(): Val
-    internal open override /*2*/ val v: jet.Int
-}
-internal open class Var : jet.Any {
-    public final /*constructor*/ fun <init>(): Var
-    internal open var v: jet.Int
-}
-internal final class Var2 : Var {
-    public final /*constructor*/ fun <init>(): Var2
-    internal open override /*1*/ var v: jet.Int
-}
-internal abstract trait VarT : jet.Any {
-    internal abstract var v: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/PrimaryConstructors.txt b/compiler/testData/lazyResolve/diagnostics/PrimaryConstructors.txt
deleted file mode 100644
index 2b0d8518cc1..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/PrimaryConstructors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-namespace <root>
-
-internal final class MyIterable</*0*/ T : jet.Any?> : jet.Iterable<T> {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): MyIterable<T>
-    internal final class MyIterable.MyIterator : jet.Iterator<T> {
-        public final /*constructor*/ fun <init>(): MyIterable.MyIterator
-        public open override /*1*/ val hasNext: jet.Boolean
-        public open override /*1*/ fun next(): T
-    }
-    public open override /*1*/ fun iterator(): jet.Iterator<T>
-}
-internal final class X : jet.Any {
-    public final /*constructor*/ fun <init>(): X
-    internal final val x: jet.Int
-}
-internal open class Y : jet.Any {
-    public final /*constructor*/ fun <init>(): Y
-    internal final val x: jet.Int
-}
-internal final class Y1 : jet.Any {
-    public final /*constructor*/ fun <init>(): Y1
-    internal final val x: jet.Int
-}
-internal final class Z : Y {
-    public final /*constructor*/ fun <init>(): Z
-    internal final override /*1*/ val x: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/ProcessingEmptyImport.txt b/compiler/testData/lazyResolve/diagnostics/ProcessingEmptyImport.txt
deleted file mode 100644
index e6dce1f6909..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/ProcessingEmptyImport.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun firstFun(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/ProjectionOnFunctionArgumentErrror.txt b/compiler/testData/lazyResolve/diagnostics/ProjectionOnFunctionArgumentErrror.txt
deleted file mode 100644
index 8a9f72ae986..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/ProjectionOnFunctionArgumentErrror.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/ProjectionsInSupertypes.txt b/compiler/testData/lazyResolve/diagnostics/ProjectionsInSupertypes.txt
deleted file mode 100644
index 9c693405742..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/ProjectionsInSupertypes.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-internal abstract trait A</*0*/ T : jet.Any?> : jet.Any {
-}
-internal abstract trait B</*0*/ T : jet.Any?> : jet.Any {
-}
-internal abstract trait C</*0*/ T : jet.Any?> : jet.Any {
-}
-internal abstract trait D</*0*/ T : jet.Any?> : jet.Any {
-}
-internal abstract trait Test : A<in jet.Int>, B<out jet.Int>, C<out jet.Any?>?, D<jet.Int> {
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/Properties.txt b/compiler/testData/lazyResolve/diagnostics/Properties.txt
deleted file mode 100644
index 76840f3e752..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/Properties.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-internal final class Test : jet.Any {
-    public final /*constructor*/ fun <init>(): Test
-    internal final var a: jet.Int
-    internal final var b: jet.Int
-    internal final fun f(): jet.Tuple0
-    public final val i: jet.Int
-}
-internal final val p: jet.Int
-internal final var x: jet.Int
-internal final val xx: jet.Int
diff --git a/compiler/testData/lazyResolve/diagnostics/QualifiedExpressions.txt b/compiler/testData/lazyResolve/diagnostics/QualifiedExpressions.txt
deleted file mode 100644
index d2f0498cb26..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/QualifiedExpressions.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="qualified_expressions">
-namespace qualified_expressions
-
-internal final fun jet.String.startsWith(/*0*/ s: jet.String): jet.Boolean
-internal final fun test(/*0*/ s: jet.String?): jet.Tuple0
-// </namespace name="qualified_expressions">
diff --git a/compiler/testData/lazyResolve/diagnostics/QualifiedThis.txt b/compiler/testData/lazyResolve/diagnostics/QualifiedThis.txt
deleted file mode 100644
index 3137f2fff19..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/QualifiedThis.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-namespace <root>
-
-// <namespace name="closures">
-namespace closures
-
-internal final class closures.A : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ a: jet.Int): closures.A
-    internal final val a: jet.Int
-    internal final class closures.A.B : jet.Any {
-        public final /*constructor*/ fun <init>(): closures.A.B
-        internal final fun jet.Char.xx(): jet.Any
-        internal final val jet.Int.xx: jet.Int
-        internal final val x: closures.A.B
-        internal final val y: closures.A
-        internal final val z: closures.A.B
-    }
-}
-// </namespace name="closures">
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal final fun foo(): jet.Tuple0
-    internal final val x: jet.Tuple0
-    internal final val y: jet.Tuple0
-    internal final val z: jet.Tuple0
-}
-internal final class Dup : jet.Any {
-    public final /*constructor*/ fun <init>(): Dup
-    internal final fun Dup(): jet.Tuple0
-}
-internal final fun foo1(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/RecursiveTypeInference.txt b/compiler/testData/lazyResolve/diagnostics/RecursiveTypeInference.txt
deleted file mode 100644
index 1553f6e4d52..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/RecursiveTypeInference.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-internal final val foo: [ERROR : Error function type]
-internal final fun bar(): [ERROR : Error function type]
-// </namespace name="a">
-// <namespace name="b">
-namespace b
-
-internal final fun bar(): [ERROR : Error function type]
-internal final fun foo(): [ERROR : Error function type]
-// </namespace name="b">
-// <namespace name="c">
-namespace c
-
-internal final fun bar(): [ERROR : Error function type]
-internal final fun bazz(): [ERROR : Error function type]
-internal final fun foo(): [ERROR : Error function type]
-// </namespace name="c">
-// <namespace name="ok">
-namespace ok
-
-// <namespace name="a">
-namespace a
-
-internal final val foo: jet.Int
-internal final fun bar(): jet.Int
-// </namespace name="a">
-// <namespace name="b">
-namespace b
-
-internal final fun bar(): jet.Int
-internal final fun foo(): jet.Int
-// </namespace name="b">
-// <namespace name="c">
-namespace c
-
-internal final fun bar(): jet.Int
-internal final fun bazz(): jet.Int
-internal final fun foo(): jet.Int
-// </namespace name="c">
-// </namespace name="ok">
diff --git a/compiler/testData/lazyResolve/diagnostics/ResolveOfJavaGenerics.txt b/compiler/testData/lazyResolve/diagnostics/ResolveOfJavaGenerics.txt
deleted file mode 100644
index bed0e4ddbd8..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/ResolveOfJavaGenerics.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final fun test(): jet.Tuple0
-internal final fun test(/*0*/ a: java.lang.Class<jet.Int>): jet.Tuple0
-internal final fun test(/*0*/ a: java.lang.Comparable<jet.Int>): jet.Tuple0
-internal final fun test(/*0*/ a: java.lang.annotation.RetentionPolicy): jet.Tuple0
-internal final fun test(/*0*/ a: java.util.ArrayList<jet.Int>): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/ResolveToJava.txt b/compiler/testData/lazyResolve/diagnostics/ResolveToJava.txt
deleted file mode 100644
index 88b5d35e9d2..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/ResolveToJava.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="xxx">
-namespace xxx
-
-// </namespace name="xxx">
-internal final val l: java.util.List<in jet.Int>
-internal final fun test(/*0*/ l: java.util.List<jet.Int>): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/Return.txt b/compiler/testData/lazyResolve/diagnostics/Return.txt
deleted file mode 100644
index efed81cc38c..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/Return.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace <root>
-
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal final fun outer(): jet.Tuple0
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/SafeCallNonNullReceiver.txt b/compiler/testData/lazyResolve/diagnostics/SafeCallNonNullReceiver.txt
deleted file mode 100644
index 4b34c64649a..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/SafeCallNonNullReceiver.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun ff(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/SafeCallNonNullReceiverReturnNull.txt b/compiler/testData/lazyResolve/diagnostics/SafeCallNonNullReceiverReturnNull.txt
deleted file mode 100644
index 110b47cb0c1..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/SafeCallNonNullReceiverReturnNull.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun ff(): jet.Tuple0
-internal final fun jet.Int.gg(): jet.Nothing?
diff --git a/compiler/testData/lazyResolve/diagnostics/ShiftFunctionTypes.txt b/compiler/testData/lazyResolve/diagnostics/ShiftFunctionTypes.txt
deleted file mode 100644
index 581d4dbd0e7..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/ShiftFunctionTypes.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-namespace <root>
-
-// <namespace name="n">
-namespace n
-
-internal final class n.B : jet.Any {
-    public final /*constructor*/ fun <init>(): n.B
-}
-// </namespace name="n">
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-}
-internal abstract class XXX : jet.Any {
-    public final /*constructor*/ fun <init>(): XXX
-    internal final val a11: jet.Function1<jet.Int, jet.Int>?
-    internal final val a12: jet.Function1<jet.Int, jet.Int>?
-    internal abstract val a13: jet.ExtensionFunction1<jet.Int, jet.Int, jet.Int>
-    internal abstract val a14: jet.ExtensionFunction1<n.B, jet.Int, jet.Int>
-    internal abstract val a152: jet.ExtensionFunction1<jet.Int?, jet.Int, jet.Int>
-    internal abstract val a15: jet.ExtensionFunction1<jet.Int?, jet.Int, jet.Int>
-    internal abstract val a16: jet.Function1<jet.Int, jet.Function1<jet.Int, jet.Int>>
-    internal abstract val a17: jet.ExtensionFunction1<jet.Function1<jet.Int, jet.Int>, jet.Int, jet.Int>
-    internal abstract val a18: jet.Function1<jet.Int, jet.Function1<jet.Int, jet.Int>>
-    internal abstract val a19: jet.Function1<jet.Function1<jet.Int, jet.Int>, jet.Int>
-    internal abstract val a1: [ERROR : package.Int]
-    internal abstract val a2: n.B
-    internal abstract val a31: n.B
-    internal abstract val a3: A
-    internal abstract val a4: A?
-    internal abstract val a5: A?
-    internal abstract val a6: A?
-    internal abstract val a7: jet.Function1<A, n.B>
-    internal abstract val a8: jet.Function2<A, n.B, n.B>
-    internal abstract val a: jet.Int
-}
-internal abstract class YYY : jet.Any {
-    public final /*constructor*/ fun <init>(): YYY
-    internal final val a11: jet.Function1<jet.Int, jet.Int>?
-    internal final val a12: jet.Function1<jet.Int, jet.Int>?
-    internal abstract val a13: jet.ExtensionFunction1<jet.Int, jet.Int, jet.Int>
-    internal abstract val a14: jet.ExtensionFunction1<n.B, jet.Int, jet.Int>
-    internal abstract val a152: jet.ExtensionFunction1<jet.Int?, jet.Int, jet.Int>
-    internal abstract val a15: jet.ExtensionFunction1<jet.Int?, jet.Int, jet.Int>
-    internal abstract val a16: jet.Function1<jet.Int, jet.Function1<jet.Int, jet.Int>>
-    internal abstract val a17: jet.ExtensionFunction1<jet.Function1<jet.Int, jet.Int>, jet.Int, jet.Int>
-    internal abstract val a18: jet.Function1<jet.Int, jet.Function1<jet.Int, jet.Int>>
-    internal abstract val a19: jet.Function1<jet.Function1<jet.Int, jet.Int>, jet.Int>
-    internal abstract val a7: jet.Function1<A, n.B>
-    internal abstract val a8: jet.Function2<A, n.B, n.B>
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/StarsInFunctionCalls.txt b/compiler/testData/lazyResolve/diagnostics/StarsInFunctionCalls.txt
deleted file mode 100644
index 4d09b4d1d98..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/StarsInFunctionCalls.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final fun foo(/*0*/ a: jet.Any?): jet.Tuple0
-internal final fun </*0*/ T : jet.Any?>getT(): jet.Tuple0
-internal final fun </*0*/ A : jet.Any?, /*1*/ B : jet.Any?>getTT(): jet.Tuple0
-internal final fun </*0*/ A : jet.Any?, /*1*/ B : jet.Any?, /*2*/ C : jet.Any?>getTTT(/*0*/ x: jet.Any): jet.Tuple0
-internal open fun main(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/StringTemplates.txt b/compiler/testData/lazyResolve/diagnostics/StringTemplates.txt
deleted file mode 100644
index 9649148c965..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/StringTemplates.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun demo(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/Super.txt b/compiler/testData/lazyResolve/diagnostics/Super.txt
deleted file mode 100644
index df3fcb4d8eb..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/Super.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-namespace <root>
-
-// <namespace name="example">
-namespace example
-
-internal final class example.A</*0*/ E : jet.Any?> : example.C, example.T {
-    public final /*constructor*/ fun </*0*/ E : jet.Any?><init>(): example.A<E>
-    internal final override /*1*/ fun bar(): jet.Tuple0
-    internal final class example.A.B : example.T {
-        public final /*constructor*/ fun <init>(): example.A.B
-        internal open override /*1*/ fun foo(): jet.Tuple0
-        internal final fun test(): jet.Tuple0
-    }
-    internal open override /*1*/ fun foo(): jet.Tuple0
-    internal final fun test(): jet.Tuple0
-}
-internal final class example.A1 : jet.Any {
-    public final /*constructor*/ fun <init>(): example.A1
-    internal final fun test(): jet.Tuple0
-}
-internal open class example.C : jet.Any {
-    public final /*constructor*/ fun <init>(): example.C
-    internal final fun bar(): jet.Tuple0
-}
-internal final class example.CG : example.G<jet.Int> {
-    public final /*constructor*/ fun <init>(): example.CG
-    internal open override /*1*/ fun foo(): jet.Tuple0
-    internal final fun test(): jet.Tuple0
-}
-internal final class example.ERROR</*0*/ E : jet.Any?> {
-    public final /*constructor*/ fun </*0*/ E : jet.Any?><init>(): example.ERROR<E>
-    internal final fun test(): jet.Tuple0
-}
-internal abstract trait example.G</*0*/ T : jet.Any?> : jet.Any {
-    internal open fun foo(): jet.Tuple0
-}
-internal abstract trait example.T : jet.Any {
-    internal open fun foo(): jet.Tuple0
-}
-internal final fun any(/*0*/ a: jet.Any): jet.Tuple0
-internal final fun foo(): jet.Tuple0
-internal final fun notAnExpression(): jet.Tuple0
-// </namespace name="example">
diff --git a/compiler/testData/lazyResolve/diagnostics/SupertypeListChecks.txt b/compiler/testData/lazyResolve/diagnostics/SupertypeListChecks.txt
deleted file mode 100644
index 0f5ef169cd4..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/SupertypeListChecks.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-namespace <root>
-
-internal final class C1 : jet.Any {
-    public final /*constructor*/ fun <init>(): C1
-}
-internal open class C2 : jet.Any {
-    public final /*constructor*/ fun <init>(): C2
-}
-internal open class C3 : jet.Any {
-    public final /*constructor*/ fun <init>(): C3
-}
-internal final class CTest1 : OC1 {
-    public final /*constructor*/ fun <init>(): CTest1
-}
-internal final class CTest2 : C2 {
-    public final /*constructor*/ fun <init>(): CTest2
-}
-internal final class CTest3 : C2, C3 {
-    public final /*constructor*/ fun <init>(): CTest3
-}
-internal final class CTest4 : T1 {
-    public final /*constructor*/ fun <init>(): CTest4
-}
-internal final class CTest5 : T1, T1 {
-    public final /*constructor*/ fun <init>(): CTest5
-}
-internal final class CTest6 : C1 {
-    public final /*constructor*/ fun <init>(): CTest6
-}
-internal open class OC1 : jet.Any {
-    public final /*constructor*/ fun <init>(): OC1
-}
-internal abstract trait T1 : jet.Any {
-}
-internal abstract trait T2</*0*/ T : jet.Any?> : jet.Any {
-}
-internal abstract trait Test : jet.Any {
-}
-internal abstract trait Test1 : C2 {
-}
-internal abstract trait Test2 : C2 {
-}
-internal abstract trait Test3 : C2, C3 {
-}
-internal abstract trait Test4 : T1 {
-}
-internal abstract trait Test5 : T1, T1 {
-}
-internal abstract trait Test6 : C1 {
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/SyntaxErrorInTestHighlighting.txt b/compiler/testData/lazyResolve/diagnostics/SyntaxErrorInTestHighlighting.txt
deleted file mode 100644
index 9e5beb4ac57..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/SyntaxErrorInTestHighlighting.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun get(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/SyntaxErrorInTestHighlightingEof.txt b/compiler/testData/lazyResolve/diagnostics/SyntaxErrorInTestHighlightingEof.txt
deleted file mode 100644
index 1604dc62142..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/SyntaxErrorInTestHighlightingEof.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun f(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/TraitSupertypeList.txt b/compiler/testData/lazyResolve/diagnostics/TraitSupertypeList.txt
deleted file mode 100644
index 3eefaa8cae9..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/TraitSupertypeList.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace <root>
-
-internal abstract trait Foo : bar, bar, bar {
-}
-internal open class Foo1 : bar, bar, Foo, Foo {
-    public final /*constructor*/ fun <init>(): Foo1
-}
-internal open class Foo12 : bar, bar {
-    public final /*constructor*/ fun <init>(): Foo12
-}
-internal abstract trait Foo2 : bar, Foo {
-}
-internal open class bar : jet.Any {
-    public final /*constructor*/ fun <init>(): bar
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/TypeInference.txt b/compiler/testData/lazyResolve/diagnostics/TypeInference.txt
deleted file mode 100644
index 14c7a9d2f89..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/TypeInference.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-internal final class C</*0*/ T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): C<T>
-    internal final fun foo(): T
-}
-internal final fun </*0*/ T : jet.Any?>bar(): C<T>
-internal final fun foo(/*0*/ c: C<jet.Int>): jet.Tuple0
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/UninitializedOrReassignedVariables.txt b/compiler/testData/lazyResolve/diagnostics/UninitializedOrReassignedVariables.txt
deleted file mode 100644
index b142f4db7cf..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/UninitializedOrReassignedVariables.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-namespace <root>
-
-// <namespace name="uninitialized_reassigned_variables">
-namespace uninitialized_reassigned_variables
-
-internal final class uninitialized_reassigned_variables.A : jet.Any {
-    public final /*constructor*/ fun <init>(): uninitialized_reassigned_variables.A
-}
-internal final class uninitialized_reassigned_variables.AnonymousInitializers : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ a: jet.String, /*1*/ b: jet.String): uninitialized_reassigned_variables.AnonymousInitializers
-    internal final var a: jet.String
-    internal final val b: jet.String
-    internal final val i: jet.Int
-    internal final val j: jet.Int
-    internal final val k: jet.String
-    internal final val l: jet.String
-    internal final var m: jet.Int
-    internal final val n: jet.Int
-    internal final val o: jet.String
-    internal final var p: jet.Int
-}
-internal final class uninitialized_reassigned_variables.ClassObject : jet.Any {
-    public final /*constructor*/ fun <init>(): uninitialized_reassigned_variables.ClassObject
-    internal final class object uninitialized_reassigned_variables.ClassObject.<no name provided> : jet.Any {
-        internal final /*constructor*/ fun <init>(): uninitialized_reassigned_variables.ClassObject.<no name provided>
-        internal final fun foo(): jet.Tuple0
-        internal final val x: jet.Int
-    }
-}
-internal final class uninitialized_reassigned_variables.ForwardAccessToBackingField : jet.Any {
-    public final /*constructor*/ fun <init>(): uninitialized_reassigned_variables.ForwardAccessToBackingField
-    internal final val a: [ERROR : Type for $a]
-    internal final val b: jet.Int
-    internal final val c: jet.Int
-}
-internal final class uninitialized_reassigned_variables.LocalValsVsProperties : uninitialized_reassigned_variables.Open {
-    public final /*constructor*/ fun <init>(/*0*/ a: jet.Int, /*1*/ w: jet.Int): uninitialized_reassigned_variables.LocalValsVsProperties
-    internal final val a: jet.Int
-    internal final val b: jet.Int
-    internal final fun foo(): jet.Tuple0
-    internal final val x: jet.Int
-    internal final var xx: jet.Int
-    internal final val y: jet.Int
-    internal final var yy: jet.Int
-}
-internal final class uninitialized_reassigned_variables.M : jet.Any {
-    public final /*constructor*/ fun <init>(): uninitialized_reassigned_variables.M
-    internal final val x: jet.Int
-    internal final var y: jet.Int
-}
-internal open class uninitialized_reassigned_variables.Open : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ a: jet.Int, /*1*/ w: jet.Int): uninitialized_reassigned_variables.Open
-}
-internal final class uninitialized_reassigned_variables.Outer : jet.Any {
-    public final /*constructor*/ fun <init>(): uninitialized_reassigned_variables.Outer
-    internal final val a: jet.Int
-    internal final var b: jet.Int
-    internal final fun foo(): jet.Tuple0
-    internal final class uninitialized_reassigned_variables.Outer.Inner : jet.Any {
-        public final /*constructor*/ fun <init>(): uninitialized_reassigned_variables.Outer.Inner
-    }
-}
-internal abstract enum class uninitialized_reassigned_variables.ProtocolState : jet.Any {
-    public final /*constructor*/ fun <init>(): uninitialized_reassigned_variables.ProtocolState
-    internal abstract fun signal(): uninitialized_reassigned_variables.ProtocolState
-    internal final class object uninitialized_reassigned_variables.ProtocolState.<class-object-for-ProtocolState> {
-        internal final /*constructor*/ fun <init>(): uninitialized_reassigned_variables.ProtocolState.<class-object-for-ProtocolState>
-        internal final val TALKING: uninitialized_reassigned_variables.ProtocolState.<class-object-for-ProtocolState>.TALKING
-        internal final val WAITING: uninitialized_reassigned_variables.ProtocolState.<class-object-for-ProtocolState>.WAITING
-    }
-}
-internal final class uninitialized_reassigned_variables.TestObjectExpression : jet.Any {
-    public final /*constructor*/ fun <init>(): uninitialized_reassigned_variables.TestObjectExpression
-    internal final val a: jet.Int
-    internal final fun foo(): jet.Tuple0
-}
-internal final val TestObjectDeclaration: uninitialized_reassigned_variables.TestObjectDeclaration
-internal final var x: jet.Int
-internal final val y: jet.Int
-internal final val z: jet.Int
-internal final fun doSmth(/*0*/ i: jet.Int): jet.Tuple0
-internal final fun doSmth(/*0*/ s: jet.String): jet.Tuple0
-internal final fun foo(): jet.Tuple0
-internal final fun func(): jet.Tuple0
-internal final fun reassignFunParams(/*0*/ a: jet.Int): jet.Tuple0
-internal final fun t1(): jet.Tuple0
-internal final fun t1(/*0*/ b: jet.Boolean): jet.Tuple0
-internal final fun t2(): jet.Tuple0
-internal final fun t3(): jet.Tuple0
-internal final fun t4(): jet.Tuple0
-internal final fun t4(/*0*/ a: uninitialized_reassigned_variables.A, /*1*/ b: uninitialized_reassigned_variables.A, /*2*/ c: uninitialized_reassigned_variables.A): jet.Tuple0
-internal final fun t5(): jet.Tuple0
-internal final fun test(/*0*/ m: uninitialized_reassigned_variables.M): jet.Tuple0
-internal final fun test1(/*0*/ m: uninitialized_reassigned_variables.M): jet.Tuple0
-// </namespace name="uninitialized_reassigned_variables">
diff --git a/compiler/testData/lazyResolve/diagnostics/UnitByDefaultForFunctionTypes.txt b/compiler/testData/lazyResolve/diagnostics/UnitByDefaultForFunctionTypes.txt
deleted file mode 100644
index bf498336f24..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/UnitByDefaultForFunctionTypes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun foo(/*0*/ f: jet.Function0<jet.Tuple0>): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/UnreachableCode.txt b/compiler/testData/lazyResolve/diagnostics/UnreachableCode.txt
deleted file mode 100644
index 75755fdd9b9..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/UnreachableCode.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-namespace <root>
-
-internal final fun blockAndAndMismatch(): jet.Boolean
-internal final fun fail(): jet.Nothing
-internal final fun failtest(/*0*/ a: jet.Int): jet.Int
-internal final fun foo(/*0*/ a: jet.Nothing): jet.Tuple0
-internal final fun nullIsNotNothing(): jet.Tuple0
-internal final fun returnInWhile(/*0*/ a: jet.Int): jet.Tuple0
-internal final fun t1(): jet.Int
-internal final fun t1a(): jet.Int
-internal final fun t1b(): jet.Int
-internal final fun t1c(): jet.Int
-internal final fun t2(): jet.Int
-internal final fun t2a(): jet.Int
-internal final fun t3(): jet.Any
-internal final fun t4(/*0*/ a: jet.Boolean): jet.Int
-internal final fun t4break(/*0*/ a: jet.Boolean): jet.Int
-internal final fun t5(): jet.Int
-internal final fun t6(): jet.Int
-internal final fun t6break(): jet.Int
-internal final fun t7(): jet.Int
-internal final fun t7(/*0*/ b: jet.Int): jet.Int
-internal final fun t7break(/*0*/ b: jet.Int): jet.Int
-internal final fun t8(): jet.Int
-internal final fun tf(): jet.Int
diff --git a/compiler/testData/lazyResolve/diagnostics/Unresolved.txt b/compiler/testData/lazyResolve/diagnostics/Unresolved.txt
deleted file mode 100644
index 321166bec27..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/Unresolved.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-// <namespace name="unresolved">
-namespace unresolved
-
-internal final fun foo1(/*0*/ i: jet.Int): jet.Tuple0
-internal final fun testGenericArgumentsCount(): jet.Tuple0
-internal final fun testUnresolved(): jet.Tuple0
-// </namespace name="unresolved">
diff --git a/compiler/testData/lazyResolve/diagnostics/UnusedVariables.txt b/compiler/testData/lazyResolve/diagnostics/UnusedVariables.txt
deleted file mode 100644
index 3a8d49385e4..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/UnusedVariables.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-namespace <root>
-
-// <namespace name="unused_variables">
-namespace unused_variables
-
-internal final class unused_variables.IncDec : jet.Any {
-    public final /*constructor*/ fun <init>(): unused_variables.IncDec
-    internal final fun dec(): unused_variables.IncDec
-    internal final fun inc(): unused_variables.IncDec
-}
-internal final class unused_variables.MyTest : jet.Any {
-    public final /*constructor*/ fun <init>(): unused_variables.MyTest
-    internal final var a: jet.String
-    internal final fun doSmth(/*0*/ a: jet.Any): jet.Tuple0
-    internal final fun doSmth(/*0*/ s: jet.String): jet.Tuple0
-    internal final fun testFor(): jet.Tuple0
-    internal final fun testIf(): jet.Tuple0
-    internal final fun testIncDec(): jet.Tuple0
-    internal final fun testSimple(): jet.Tuple0
-    internal final fun testWhile(): jet.Tuple0
-}
-internal abstract trait unused_variables.Trait : jet.Any {
-    internal abstract fun foo(): jet.Tuple0
-}
-internal final fun doSmth(/*0*/ i: jet.Int): jet.Tuple0
-internal final fun testBackingFieldsNotMarked(): jet.Tuple0
-internal final fun testFunctionLiterals(): jet.Tuple0
-internal final fun testInnerFunctions(): jet.Tuple0
-internal final fun testObject(): unused_variables.Trait
-internal final fun testSimpleCases(): jet.Tuple0
-// </namespace name="unused_variables">
diff --git a/compiler/testData/lazyResolve/diagnostics/ValAndFunOverrideCompatibilityClash.txt b/compiler/testData/lazyResolve/diagnostics/ValAndFunOverrideCompatibilityClash.txt
deleted file mode 100644
index b38bcf2e83f..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/ValAndFunOverrideCompatibilityClash.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-namespace <root>
-
-internal open class Bar : jet.Any {
-    public final /*constructor*/ fun <init>(): Bar
-    internal final fun v(): jet.Int
-    internal final val v: jet.Int
-}
-internal final class Barr : Bar {
-    public final /*constructor*/ fun <init>(): Barr
-    internal final override /*1*/ fun v(): jet.Int
-    internal final override /*1*/ val v: jet.Int
-}
-internal final class Foo1 : java.util.ArrayList<jet.Int> {
-    public final /*constructor*/ fun <init>(): Foo1
-    public open override /*1*/ fun add(/*0*/ p0: jet.Int): jet.Boolean
-    public open override /*1*/ fun add(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): jet.Tuple0
-    public open override /*1*/ fun addAll(/*0*/ p0: java.util.Collection<out jet.Int>): jet.Boolean
-    public open override /*1*/ fun addAll(/*0*/ p0: jet.Int, /*1*/ p1: java.util.Collection<out jet.Int>): jet.Boolean
-    public open override /*1*/ fun clear(): jet.Tuple0
-    public open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun contains(/*0*/ p0: jet.Any?): jet.Boolean
-    public open override /*1*/ fun containsAll(/*0*/ p0: java.util.Collection<out jet.Any?>): jet.Boolean
-    public open override /*1*/ fun ensureCapacity(/*0*/ p0: jet.Int): jet.Tuple0
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    public open override /*1*/ fun get(/*0*/ p0: jet.Int): jet.Int
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    public open override /*1*/ fun indexOf(/*0*/ p0: jet.Any?): jet.Int
-    public open override /*1*/ fun isEmpty(): jet.Boolean
-    public open override /*1*/ fun iterator(): java.util.Iterator<jet.Int>
-    public open override /*1*/ fun lastIndexOf(/*0*/ p0: jet.Any?): jet.Int
-    public open override /*1*/ fun listIterator(): java.util.ListIterator<jet.Int>
-    public open override /*1*/ fun listIterator(/*0*/ p0: jet.Int): java.util.ListIterator<jet.Int>
-    protected final override /*1*/ var modCount: jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    public open override /*1*/ fun remove(/*0*/ p0: jet.Any?): jet.Boolean
-    public open override /*1*/ fun remove(/*0*/ p0: jet.Int): jet.Int
-    public open override /*1*/ fun removeAll(/*0*/ p0: java.util.Collection<out jet.Any?>): jet.Boolean
-    protected open override /*1*/ fun removeRange(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): jet.Tuple0
-    public open override /*1*/ fun retainAll(/*0*/ p0: java.util.Collection<out jet.Any?>): jet.Boolean
-    public open override /*1*/ fun set(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): jet.Int
-    public open override /*1*/ fun size(): jet.Int
-    public open override /*1*/ fun subList(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): java.util.List<jet.Int>
-    public open override /*1*/ fun toArray(): jet.Array<jet.Any?>
-    public open override /*1*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ p0: jet.Array<T>): jet.Array<T>
-    public open override /*1*/ fun toString(): jet.String?
-    public open override /*1*/ fun trimToSize(): jet.Tuple0
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/VarargTypes.txt b/compiler/testData/lazyResolve/diagnostics/VarargTypes.txt
deleted file mode 100644
index d90e2180771..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/VarargTypes.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-internal final fun foob(/*0*/ vararg a: jet.Boolean /*jet.BooleanArray*/): jet.BooleanArray
-internal final fun foob(/*0*/ vararg a: jet.Byte /*jet.ByteArray*/): jet.ByteArray
-internal final fun fooc(/*0*/ vararg a: jet.Char /*jet.CharArray*/): jet.CharArray
-internal final fun food(/*0*/ vararg a: jet.Double /*jet.DoubleArray*/): jet.DoubleArray
-internal final fun foof(/*0*/ vararg a: jet.Float /*jet.FloatArray*/): jet.FloatArray
-internal final fun fooi(/*0*/ vararg a: jet.Int /*jet.IntArray*/): jet.IntArray
-internal final fun fool(/*0*/ vararg a: jet.Long /*jet.LongArray*/): jet.LongArray
-internal final fun foos(/*0*/ vararg a: jet.Short /*jet.ShortArray*/): jet.ShortArray
-internal final fun foos(/*0*/ vararg a: jet.String /*jet.Array<jet.String>*/): jet.Array<jet.String>
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/Varargs.txt b/compiler/testData/lazyResolve/diagnostics/Varargs.txt
deleted file mode 100644
index 457d4575615..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/Varargs.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace <root>
-
-internal final fun test(): jet.Tuple0
-internal final fun v(/*0*/ x: jet.Int, /*1*/ y: jet.String, /*2*/ vararg f: jet.Long /*jet.LongArray*/): jet.Tuple0
-internal final fun v1(/*0*/ vararg f: jet.Function1<jet.Int, jet.Tuple0> /*jet.Array<jet.Function1<jet.Int, jet.Tuple0>>*/): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/Variance.txt b/compiler/testData/lazyResolve/diagnostics/Variance.txt
deleted file mode 100644
index 95659be9215..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/Variance.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace <root>
-
-// <namespace name="variance">
-namespace variance
-
-internal final class variance.Array</*0*/ T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(/*0*/ length: jet.Int, /*1*/ t: T): variance.Array<T>
-    internal final fun get(/*0*/ index: jet.Int): T
-    internal final val length: jet.Int
-    internal final fun set(/*0*/ index: jet.Int, /*1*/ value: T): jet.Tuple0
-    internal final val t: T
-}
-internal abstract class variance.Consumer</*0*/ in T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?><init>(): variance.Consumer<T>
-}
-internal abstract class variance.Producer</*0*/ out T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T : jet.Any?><init>(): variance.Producer<T>
-}
-internal abstract class variance.Usual</*0*/ T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): variance.Usual<T>
-}
-internal final fun copy1(/*0*/ from: variance.Array<jet.Any>, /*1*/ to: variance.Array<jet.Any>): jet.Tuple0
-internal final fun copy2(/*0*/ from: variance.Array<out jet.Any>, /*1*/ to: variance.Array<in jet.Any>): jet.Tuple0
-internal final fun </*0*/ T : jet.Any?>copy3(/*0*/ from: variance.Array<out T>, /*1*/ to: variance.Array<in T>): jet.Tuple0
-internal final fun copy4(/*0*/ from: variance.Array<out jet.Number>, /*1*/ to: variance.Array<in jet.Int>): jet.Tuple0
-internal final fun f(/*0*/ ints: variance.Array<jet.Int>, /*1*/ any: variance.Array<jet.Any>, /*2*/ numbers: variance.Array<jet.Number>): jet.Tuple0
-internal final fun foo(/*0*/ c: variance.Consumer<jet.Int>, /*1*/ p: variance.Producer<jet.Int>, /*2*/ u: variance.Usual<jet.Int>): jet.Tuple0
-// </namespace name="variance">
diff --git a/compiler/testData/lazyResolve/diagnostics/When.txt b/compiler/testData/lazyResolve/diagnostics/When.txt
deleted file mode 100644
index a1ad99df2f4..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/When.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final val _type_test: jet.Int
-internal final val jet.Tuple2<out jet.Int, out jet.Int>.boo: jet.Tuple3<out jet.Int, out jet.Int, out jet.Int>
-internal final fun foo(): jet.Int
-internal final fun jet.Int.foo(): jet.Boolean
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/annotations/AnnotatedConstructorParams.txt b/compiler/testData/lazyResolve/diagnostics/annotations/AnnotatedConstructorParams.txt
deleted file mode 100644
index 83c777808a9..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/annotations/AnnotatedConstructorParams.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-internal final class a.Test : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ s: jet.String, /*1*/ x: jet.Int): a.Test
-    internal final java.lang.Deprecated() val s: jet.String
-    internal final java.lang.SuppressWarnings() val x: jet.Int
-}
-internal final java.lang.Deprecated() java.lang.SuppressWarnings() val s: jet.String
-internal final java.lang.Deprecated() java.lang.SuppressWarnings() fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-// </namespace name="a">
diff --git a/compiler/testData/lazyResolve/diagnostics/annotations/AnnotationsForClasses.txt b/compiler/testData/lazyResolve/diagnostics/annotations/AnnotationsForClasses.txt
deleted file mode 100644
index 18ad41ac195..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/annotations/AnnotationsForClasses.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-java.lang.Deprecated() internal final annotation class my : jet.Any {
-    public final /*constructor*/ fun <init>(): my
-}
-java.lang.Deprecated() internal final annotation class my1 : jet.Any {
-    public final /*constructor*/ fun <init>(): my1
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/annotations/Deprecated.txt b/compiler/testData/lazyResolve/diagnostics/annotations/Deprecated.txt
deleted file mode 100644
index 24000a5e055..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/annotations/Deprecated.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final java.lang.Deprecated() fun foo(): jet.Tuple0
-internal final java.lang.Deprecated() fun foo1(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/annotations/NonAnnotationClass.txt b/compiler/testData/lazyResolve/diagnostics/annotations/NonAnnotationClass.txt
deleted file mode 100644
index 8bca4d4d609..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/annotations/NonAnnotationClass.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-Foo() internal final class Bar : jet.Any {
-    public final /*constructor*/ fun <init>(): Bar
-}
-internal final class Foo : jet.Any {
-    public final /*constructor*/ fun <init>(): Foo
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/annotations/kt1860-negative.txt b/compiler/testData/lazyResolve/diagnostics/annotations/kt1860-negative.txt
deleted file mode 100644
index d2076c739d3..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/annotations/kt1860-negative.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-internal final class Hello : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ args: jet.Any): Hello
-}
-internal final var bar: jet.Int
-internal final val x: jet.Function1<jet.Int, jet.Int>
-internal final fun foo(/*0*/ f: jet.Int): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/annotations/kt1860-positive.txt b/compiler/testData/lazyResolve/diagnostics/annotations/kt1860-positive.txt
deleted file mode 100644
index dddd8b16fdf..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/annotations/kt1860-positive.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace <root>
-
-internal final class Hello : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ args: jet.Any): Hello
-}
-internal final annotation class test : jet.Any {
-    public final /*constructor*/ fun <init>(): test
-}
-internal final var bar: jet.Int
-internal final val x: jet.Function1<jet.Int, jet.Int>
-internal final fun foo(/*0*/ f: jet.Int): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/backingField/CustomGetSet.txt b/compiler/testData/lazyResolve/diagnostics/backingField/CustomGetSet.txt
deleted file mode 100644
index 025b5c56738..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/backingField/CustomGetSet.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace <root>
-
-internal final class Flower : jet.Any {
-    public final /*constructor*/ fun <init>(): Flower
-    internal final var minusOne: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/backingField/CustomGetVal.txt b/compiler/testData/lazyResolve/diagnostics/backingField/CustomGetVal.txt
deleted file mode 100644
index 52d4a9fa35e..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/backingField/CustomGetVal.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace <root>
-
-internal final class CustomGetVal : jet.Any {
-    public final /*constructor*/ fun <init>(): CustomGetVal
-    internal final val zz: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/backingField/CustomGetValGlobal.txt b/compiler/testData/lazyResolve/diagnostics/backingField/CustomGetValGlobal.txt
deleted file mode 100644
index 8ad18bb2c26..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/backingField/CustomGetValGlobal.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="customGetValGlobal">
-namespace customGetValGlobal
-
-internal final val zz: jet.Int
-// </namespace name="customGetValGlobal">
diff --git a/compiler/testData/lazyResolve/diagnostics/backingField/CustomGetVar.txt b/compiler/testData/lazyResolve/diagnostics/backingField/CustomGetVar.txt
deleted file mode 100644
index 17212ccffec..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/backingField/CustomGetVar.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace <root>
-
-internal final class Raise : jet.Any {
-    public final /*constructor*/ fun <init>(): Raise
-    internal final var zz: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/backingField/CustomSet.txt b/compiler/testData/lazyResolve/diagnostics/backingField/CustomSet.txt
deleted file mode 100644
index 17212ccffec..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/backingField/CustomSet.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace <root>
-
-internal final class Raise : jet.Any {
-    public final /*constructor*/ fun <init>(): Raise
-    internal final var zz: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/backingField/CyclicReferenceInitializer.txt b/compiler/testData/lazyResolve/diagnostics/backingField/CyclicReferenceInitializer.txt
deleted file mode 100644
index cb1b1edaa39..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/backingField/CyclicReferenceInitializer.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace <root>
-
-internal final class Cyclic : jet.Any {
-    public final /*constructor*/ fun <init>(): Cyclic
-    internal final val a: [ERROR : Type for $a]
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/backingField/ReadForwardInAnonymous.txt b/compiler/testData/lazyResolve/diagnostics/backingField/ReadForwardInAnonymous.txt
deleted file mode 100644
index 9c76cad0dbf..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/backingField/ReadForwardInAnonymous.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace <root>
-
-internal final class ReadForward : jet.Any {
-    public final /*constructor*/ fun <init>(): ReadForward
-    internal final val a: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/backingField/ReadForwardInPropertyInitializer.txt b/compiler/testData/lazyResolve/diagnostics/backingField/ReadForwardInPropertyInitializer.txt
deleted file mode 100644
index 65e929a8063..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/backingField/ReadForwardInPropertyInitializer.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final class ReadForward : jet.Any {
-    public final /*constructor*/ fun <init>(): ReadForward
-    internal final val a: jet.Int
-    internal final val b: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/backingField/ReadInAnonymous.txt b/compiler/testData/lazyResolve/diagnostics/backingField/ReadInAnonymous.txt
deleted file mode 100644
index a2ed75745f0..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/backingField/ReadInAnonymous.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace <root>
-
-internal final class ReadByAnotherPropertyInitializer : jet.Any {
-    public final /*constructor*/ fun <init>(): ReadByAnotherPropertyInitializer
-    internal final val a: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/backingField/ReadInAnotherPropertyIntializer.txt b/compiler/testData/lazyResolve/diagnostics/backingField/ReadInAnotherPropertyIntializer.txt
deleted file mode 100644
index 4b1223d1f7f..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/backingField/ReadInAnotherPropertyIntializer.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final class ReadByAnotherPropertyInitializer : jet.Any {
-    public final /*constructor*/ fun <init>(): ReadByAnotherPropertyInitializer
-    internal final val a: jet.Int
-    internal final val b: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/backingField/ReadInFunction.txt b/compiler/testData/lazyResolve/diagnostics/backingField/ReadInFunction.txt
deleted file mode 100644
index f87e66d9ed7..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/backingField/ReadInFunction.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final class ReadByAnotherPropertyInitializer : jet.Any {
-    public final /*constructor*/ fun <init>(): ReadByAnotherPropertyInitializer
-    internal final val a: jet.Int
-    internal final fun ff(): jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/backingField/ReadNonexistentAbstractPropertyInAnonymous.txt b/compiler/testData/lazyResolve/diagnostics/backingField/ReadNonexistentAbstractPropertyInAnonymous.txt
deleted file mode 100644
index c10d13a95d7..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/backingField/ReadNonexistentAbstractPropertyInAnonymous.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace <root>
-
-internal abstract class ReadNonexistent : jet.Any {
-    public final /*constructor*/ fun <init>(): ReadNonexistent
-    internal abstract val aa: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/backingField/ReadNonexistentAbstractPropertyInFunction.txt b/compiler/testData/lazyResolve/diagnostics/backingField/ReadNonexistentAbstractPropertyInFunction.txt
deleted file mode 100644
index 7e0c411af0c..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/backingField/ReadNonexistentAbstractPropertyInFunction.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal abstract class ReadNonexistent : jet.Any {
-    public final /*constructor*/ fun <init>(): ReadNonexistent
-    internal abstract val aa: jet.Int
-    internal final fun ff(): jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/backingField/ReadNonexistentCustomGetInAnonymous.txt b/compiler/testData/lazyResolve/diagnostics/backingField/ReadNonexistentCustomGetInAnonymous.txt
deleted file mode 100644
index 05b6b85d816..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/backingField/ReadNonexistentCustomGetInAnonymous.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace <root>
-
-internal final class ReadNonexistent : jet.Any {
-    public final /*constructor*/ fun <init>(): ReadNonexistent
-    internal final val a: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/backingField/ReadNonexistentCustomGetInAnotherInitializer.txt b/compiler/testData/lazyResolve/diagnostics/backingField/ReadNonexistentCustomGetInAnotherInitializer.txt
deleted file mode 100644
index 5ef8889422c..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/backingField/ReadNonexistentCustomGetInAnotherInitializer.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final class CustomValNoBackingField : jet.Any {
-    public final /*constructor*/ fun <init>(): CustomValNoBackingField
-    internal final val a: jet.Int
-    internal final val b: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/backingField/ReadNonexistentDeclaredInHigher.txt b/compiler/testData/lazyResolve/diagnostics/backingField/ReadNonexistentDeclaredInHigher.txt
deleted file mode 100644
index 5ef8889422c..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/backingField/ReadNonexistentDeclaredInHigher.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final class CustomValNoBackingField : jet.Any {
-    public final /*constructor*/ fun <init>(): CustomValNoBackingField
-    internal final val a: jet.Int
-    internal final val b: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/backingField/ReadNonexistentPropertyInAnonymous.txt b/compiler/testData/lazyResolve/diagnostics/backingField/ReadNonexistentPropertyInAnonymous.txt
deleted file mode 100644
index f5e51236dd1..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/backingField/ReadNonexistentPropertyInAnonymous.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace <root>
-
-internal final class Cl : jet.Any {
-    public final /*constructor*/ fun <init>(): Cl
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/backingField/WriteNonexistentDeclaredInHigher.txt b/compiler/testData/lazyResolve/diagnostics/backingField/WriteNonexistentDeclaredInHigher.txt
deleted file mode 100644
index a6ff6ca2ea4..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/backingField/WriteNonexistentDeclaredInHigher.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace <root>
-
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-}
-internal final val y: jet.Int
diff --git a/compiler/testData/lazyResolve/diagnostics/backingField/kt782namespaceLevel.txt b/compiler/testData/lazyResolve/diagnostics/backingField/kt782namespaceLevel.txt
deleted file mode 100644
index d9515e7f068..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/backingField/kt782namespaceLevel.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace <root>
-
-// <namespace name="kt782">
-namespace kt782
-
-internal final val w: jet.Int
-internal final val x: jet.Int
-internal final val y: jet.Int
-internal final val z: jet.Int
-internal final fun foo(): jet.Tuple0
-// </namespace name="kt782">
diff --git a/compiler/testData/lazyResolve/diagnostics/cast/AsErasedError.txt b/compiler/testData/lazyResolve/diagnostics/cast/AsErasedError.txt
deleted file mode 100644
index e233c5d1046..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/cast/AsErasedError.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun ff(/*0*/ c: java.util.Collection<jet.String>): java.util.List<jet.Int>
diff --git a/compiler/testData/lazyResolve/diagnostics/cast/AsErasedFine.txt b/compiler/testData/lazyResolve/diagnostics/cast/AsErasedFine.txt
deleted file mode 100644
index ee02aa3c317..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/cast/AsErasedFine.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun ff(/*0*/ c: java.util.Collection<jet.String>): java.util.List<jet.String>
diff --git a/compiler/testData/lazyResolve/diagnostics/cast/AsErasedStar.txt b/compiler/testData/lazyResolve/diagnostics/cast/AsErasedStar.txt
deleted file mode 100644
index d874bb393cb..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/cast/AsErasedStar.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun ff(/*0*/ l: jet.Any): java.util.List<out jet.Any?>
diff --git a/compiler/testData/lazyResolve/diagnostics/cast/AsErasedWarning.txt b/compiler/testData/lazyResolve/diagnostics/cast/AsErasedWarning.txt
deleted file mode 100644
index 1e2d05dd9b6..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/cast/AsErasedWarning.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun ff(/*0*/ a: jet.Any): java.util.List<jet.String>
diff --git a/compiler/testData/lazyResolve/diagnostics/cast/IsErasedAllowParameterSubtype.txt b/compiler/testData/lazyResolve/diagnostics/cast/IsErasedAllowParameterSubtype.txt
deleted file mode 100644
index f1bdab4041f..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/cast/IsErasedAllowParameterSubtype.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-internal open class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-}
-internal final class B : A {
-    public final /*constructor*/ fun <init>(): B
-}
-internal final fun ff(/*0*/ l: java.util.Collection<B>): jet.Boolean
diff --git a/compiler/testData/lazyResolve/diagnostics/cast/IsErasedAllowSameClassParameter.txt b/compiler/testData/lazyResolve/diagnostics/cast/IsErasedAllowSameClassParameter.txt
deleted file mode 100644
index 7b4c0b36f09..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/cast/IsErasedAllowSameClassParameter.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun ff(/*0*/ l: java.util.Collection<jet.String>): jet.Boolean
diff --git a/compiler/testData/lazyResolve/diagnostics/cast/IsErasedAllowSameParameterParameter.txt b/compiler/testData/lazyResolve/diagnostics/cast/IsErasedAllowSameParameterParameter.txt
deleted file mode 100644
index ba3c7fcfdbb..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/cast/IsErasedAllowSameParameterParameter.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun </*0*/ T : jet.Any?>ff(/*0*/ l: java.util.Collection<T>): jet.Boolean
diff --git a/compiler/testData/lazyResolve/diagnostics/cast/IsErasedDisallowFromAny.txt b/compiler/testData/lazyResolve/diagnostics/cast/IsErasedDisallowFromAny.txt
deleted file mode 100644
index 4341165e10b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/cast/IsErasedDisallowFromAny.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun ff(/*0*/ l: jet.Any): jet.Boolean
diff --git a/compiler/testData/lazyResolve/diagnostics/cast/IsErasedDisallowFromOut.txt b/compiler/testData/lazyResolve/diagnostics/cast/IsErasedDisallowFromOut.txt
deleted file mode 100644
index 3f948ac7806..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/cast/IsErasedDisallowFromOut.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun f(/*0*/ a: java.util.List<out jet.Any>): jet.Boolean
diff --git a/compiler/testData/lazyResolve/diagnostics/cast/IsErasedStar.txt b/compiler/testData/lazyResolve/diagnostics/cast/IsErasedStar.txt
deleted file mode 100644
index 4341165e10b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/cast/IsErasedStar.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun ff(/*0*/ l: jet.Any): jet.Boolean
diff --git a/compiler/testData/lazyResolve/diagnostics/cast/IsReified.txt b/compiler/testData/lazyResolve/diagnostics/cast/IsReified.txt
deleted file mode 100644
index 2eb32c27524..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/cast/IsReified.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace <root>
-
-internal final class MyList</*0*/ T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): MyList<T>
-}
-internal final fun ff(/*0*/ a: jet.Any): jet.Boolean
diff --git a/compiler/testData/lazyResolve/diagnostics/cast/IsTraits.txt b/compiler/testData/lazyResolve/diagnostics/cast/IsTraits.txt
deleted file mode 100644
index cfc744366f7..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/cast/IsTraits.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal abstract trait Aaa : jet.Any {
-}
-internal abstract trait Bbb : jet.Any {
-}
-internal final fun f(/*0*/ a: Aaa): jet.Boolean
diff --git a/compiler/testData/lazyResolve/diagnostics/cast/WhenErasedDisallowFromAny.txt b/compiler/testData/lazyResolve/diagnostics/cast/WhenErasedDisallowFromAny.txt
deleted file mode 100644
index 41ac5a97918..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/cast/WhenErasedDisallowFromAny.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun ff(/*0*/ l: jet.Any): jet.Int
diff --git a/compiler/testData/lazyResolve/diagnostics/checkArguments/SpreadVarargs.txt b/compiler/testData/lazyResolve/diagnostics/checkArguments/SpreadVarargs.txt
deleted file mode 100644
index 2aede08d6c1..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/checkArguments/SpreadVarargs.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final fun </*0*/ T : jet.Any?>array1(/*0*/ vararg a: T /*jet.Array<T>*/): jet.Array<T>
-internal final fun join(/*0*/ x: jet.Int, /*1*/ vararg a: jet.String /*jet.Array<jet.String>*/): jet.String
-internal final fun </*0*/ T : jet.Any?>joinG(/*0*/ x: jet.Int, /*1*/ vararg a: T /*jet.Array<T>*/): jet.String
-internal final fun </*0*/ T : jet.Any?>joinT(/*0*/ x: jet.Int, /*1*/ vararg a: T /*jet.Array<T>*/): T?
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/checkArguments/kt1897_diagnostic_part.txt b/compiler/testData/lazyResolve/diagnostics/checkArguments/kt1897_diagnostic_part.txt
deleted file mode 100644
index 4dfebf0a558..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/checkArguments/kt1897_diagnostic_part.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-internal final fun bar(): jet.Tuple0
-internal final fun foo(/*0*/ i: jet.Int, /*1*/ s: jet.String): jet.Tuple0
-internal final fun test(): jet.Tuple0
-// </namespace name="a">
diff --git a/compiler/testData/lazyResolve/diagnostics/checkArguments/kt1940.txt b/compiler/testData/lazyResolve/diagnostics/checkArguments/kt1940.txt
deleted file mode 100644
index 15fdda13490..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/checkArguments/kt1940.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1940">
-namespace kt1940
-
-internal final fun foo(/*0*/ i: jet.Int): jet.Tuple0
-internal final fun test(): jet.Tuple0
-// </namespace name="kt1940">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/checkInnerLocalDeclarations.txt b/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/checkInnerLocalDeclarations.txt
deleted file mode 100644
index d80464c4c00..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/checkInnerLocalDeclarations.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="c">
-namespace c
-
-internal final fun test(): jet.Tuple0
-// </namespace name="c">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1001.txt b/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1001.txt
deleted file mode 100644
index 9e3be45470a..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1001.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1001">
-namespace kt1001
-
-internal final fun doSmth(): jet.Tuple0
-internal final fun foo(/*0*/ c: jet.Array<jet.Int>): jet.Tuple0
-internal final fun t1(): jet.Int
-internal final fun t2(): jet.Int
-// </namespace name="kt1001">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1027.txt b/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1027.txt
deleted file mode 100644
index 19eaec93e3f..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1027.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1027">
-namespace kt1027
-
-internal final fun doSmth(): jet.Tuple0
-internal final fun foo(/*0*/ c: java.util.List<jet.Int>): jet.Tuple0
-internal final fun t1(): jet.Tuple0
-internal final fun t2(): jet.Tuple0
-internal final fun t3(): jet.Tuple0
-internal final fun t4(): jet.Tuple0
-// </namespace name="kt1027">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1066.txt b/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1066.txt
deleted file mode 100644
index 48d46dc1062..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1066.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1066">
-namespace kt1066
-
-internal final fun foo(/*0*/ excluded: java.util.Set<jet.Char>): jet.Tuple0
-internal final fun randomDigit(): jet.Char
-internal final fun test(): jet.Tuple0
-// </namespace name="kt1066">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1156.txt b/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1156.txt
deleted file mode 100644
index 126bba5106d..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1156.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun foo(/*0*/ maybe: jet.Int?): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1185enums.txt b/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1185enums.txt
deleted file mode 100644
index 2557adb922f..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1185enums.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1185">
-namespace kt1185
-
-internal final enum class kt1185.Color : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ rgb: jet.Int): kt1185.Color
-    internal final val rgb: jet.Int
-    internal final class object kt1185.Color.<class-object-for-Color> {
-        internal final /*constructor*/ fun <init>(): kt1185.Color.<class-object-for-Color>
-        internal final val BLUE: kt1185.Color.<class-object-for-Color>.BLUE
-        internal final val GREEN: kt1185.Color.<class-object-for-Color>.GREEN
-        internal final val RED: kt1185.Color.<class-object-for-Color>.RED
-    }
-}
-internal final enum class kt1185.Direction : jet.Any {
-    public final /*constructor*/ fun <init>(): kt1185.Direction
-    internal final class object kt1185.Direction.<class-object-for-Direction> {
-        internal final /*constructor*/ fun <init>(): kt1185.Direction.<class-object-for-Direction>
-        internal final val EAST: kt1185.Direction.<class-object-for-Direction>.EAST
-        internal final val NORTH: kt1185.Direction.<class-object-for-Direction>.NORTH
-        internal final val SOUTH: kt1185.Direction.<class-object-for-Direction>.SOUTH
-        internal final val WEST: kt1185.Direction.<class-object-for-Direction>.WEST
-    }
-}
-internal final enum class kt1185.MyEnum : kt1185.SomeEnum {
-    public final /*constructor*/ fun <init>(): kt1185.MyEnum
-    internal final class object kt1185.MyEnum.<class-object-for-MyEnum> {
-        internal final /*constructor*/ fun <init>(): kt1185.MyEnum.<class-object-for-MyEnum>
-        internal final val A: kt1185.MyEnum.<class-object-for-MyEnum>.A
-        internal final val B: kt1185.MyEnum.<class-object-for-MyEnum>.B
-    }
-}
-internal open enum class kt1185.SomeEnum : jet.Any {
-    public final /*constructor*/ fun <init>(): kt1185.SomeEnum
-    internal final class object kt1185.SomeEnum.<class-object-for-SomeEnum> {
-        internal final /*constructor*/ fun <init>(): kt1185.SomeEnum.<class-object-for-SomeEnum>
-    }
-}
-internal final fun bar(/*0*/ c: kt1185.Color): jet.Int
-internal final fun bar1(/*0*/ c: kt1185.Color): jet.Int
-internal final fun foo(/*0*/ d: kt1185.Direction): jet.Int
-internal final fun foo1(/*0*/ d: kt1185.Direction): jet.Int
-internal final fun g(/*0*/ me: kt1185.SomeEnum): jet.Int
-internal final fun t2(/*0*/ me: kt1185.MyEnum): jet.Int
-// </namespace name="kt1185">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1189.txt b/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1189.txt
deleted file mode 100644
index 9b42c984fac..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1189.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1189">
-namespace kt1189
-
-internal final fun foo(): jet.Tuple0
-internal final fun </*0*/ T : jet.Any?>java.util.concurrent.locks.ReentrantReadWriteLock.write(/*0*/ action: jet.Function0<T>): T
-// </namespace name="kt1189">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1191.txt b/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1191.txt
deleted file mode 100644
index a2866ed58eb..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1191.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1191">
-namespace kt1191
-
-internal abstract trait kt1191.FunctionalList</*0*/ T : jet.Any?> : jet.Any {
-    internal abstract val head: T
-    internal abstract val size: jet.Int
-    internal abstract val tail: kt1191.FunctionalList<T>
-}
-internal final fun foo(/*0*/ unused: jet.Int): kt1191.foo.<no name provided>
-internal final fun </*0*/ T : jet.Any?>kt1191.FunctionalList<T>.plus(/*0*/ element: T): kt1191.FunctionalList<T>
-// </namespace name="kt1191">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1219.1301.txt b/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1219.1301.txt
deleted file mode 100644
index c31ca127afc..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1219.1301.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1219">
-namespace kt1219
-
-internal final fun </*0*/ T : jet.Any?, /*1*/ R : jet.Any?>jet.Iterable<T>.fold(/*0*/ r: R, /*1*/ op: jet.Function2<T, R, R>): R
-internal final fun foo(): jet.Tuple0
-internal final fun </*0*/ T : jet.Any?>jet.Iterable<T>.foreach(/*0*/ operation: jet.Function1<T, jet.Tuple0>): jet.Tuple0
-// </namespace name="kt1219">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1571.txt b/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1571.txt
deleted file mode 100644
index 6692c4cefc9..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1571.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1571">
-namespace kt1571
-
-internal final class kt1571.A : jet.Any {
-    public final /*constructor*/ fun <init>(): kt1571.A
-    internal final fun divAssign(/*0*/ a: jet.Int): jet.Tuple0
-    internal final var p: jet.Int
-    internal final fun times(/*0*/ a: jet.Int): kt1571.A
-}
-internal final val a: kt1571.A
-internal final var c0: jet.Int
-internal final var c1: jet.Int
-internal final var c2: jet.Int
-internal final fun box(): jet.String
-// </namespace name="kt1571">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1977.txt b/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1977.txt
deleted file mode 100644
index 83e25d8c5b4..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt1977.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1977">
-namespace kt1977
-
-internal final fun bar(): jet.Tuple0
-internal final fun foo(): jet.Tuple0
-internal final fun strToInt(/*0*/ s: jet.String): jet.Int?
-internal final fun test1(/*0*/ s: jet.String): jet.Int?
-internal final fun test2(/*0*/ s: jet.String): jet.Int?
-// </namespace name="kt1977">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt2166_kt2103.txt b/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt2166_kt2103.txt
deleted file mode 100644
index 7fa5bdcf469..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt2166_kt2103.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-internal final fun bar(): jet.Boolean
-internal final fun foo(): jet.Int
-internal final fun foo1(): jet.Boolean
-// </namespace name="a">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt2226.txt b/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt2226.txt
deleted file mode 100644
index 8bb79a4d58f..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt2226.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-internal abstract trait a.A : jet.Any {
-    internal abstract fun foo(): jet.Int
-}
-internal final class a.B : a.A {
-    public final /*constructor*/ fun <init>(): a.B
-    internal open override /*1*/ fun foo(): jet.Int
-}
-internal final fun foo(/*0*/ b: a.B): jet.Int
-// </namespace name="a">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt510.txt b/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt510.txt
deleted file mode 100644
index fb0fa3888bc..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt510.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace <root>
-
-// <namespace name="kt510">
-namespace kt510
-
-public open class kt510.Identifier1 : jet.Any {
-    public final /*constructor*/ fun <init>(): kt510.Identifier1
-    internal final var field: jet.Boolean
-}
-public open class kt510.Identifier2 : jet.Any {
-    public final /*constructor*/ fun <init>(): kt510.Identifier2
-    internal final var field: jet.Boolean
-}
-// </namespace name="kt510">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt607.txt b/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt607.txt
deleted file mode 100644
index 9515d48ad61..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt607.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace <root>
-
-// <namespace name="kt607">
-namespace kt607
-
-internal final class kt607.A : jet.Any {
-    public final /*constructor*/ fun <init>(): kt607.A
-    internal final val z: jet.Int
-}
-internal final fun foo(/*0*/ a: kt607.A): jet.Tuple0
-// </namespace name="kt607">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt609.txt b/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt609.txt
deleted file mode 100644
index 1b4744bef68..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt609.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace <root>
-
-// <namespace name="kt609">
-namespace kt609
-
-internal open class kt609.A : jet.Any {
-    public final /*constructor*/ fun <init>(): kt609.A
-    internal open fun foo(/*0*/ s: jet.String): jet.Tuple0
-}
-internal final class kt609.B : kt609.A {
-    public final /*constructor*/ fun <init>(): kt609.B
-    internal final override /*1*/ fun foo(/*0*/ s: jet.String): jet.Tuple0
-}
-internal final class kt609.C : jet.Any {
-    public final /*constructor*/ fun <init>(): kt609.C
-    internal final fun foo(/*0*/ s: jet.String): jet.Tuple0
-}
-internal final fun test(/*0*/ a: jet.Int): jet.Tuple0
-// </namespace name="kt609">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt610.txt b/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt610.txt
deleted file mode 100644
index 7a6b92e126d..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt610.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="kt610">
-namespace kt610
-
-internal final fun foo(): jet.Tuple0
-// </namespace name="kt610">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt776.txt b/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt776.txt
deleted file mode 100644
index 71633ff4143..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt776.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-// <namespace name="kt776">
-namespace kt776
-
-internal final fun doSmth(): jet.Tuple0
-internal final fun test1(): jet.Int
-internal final fun test5(): jet.Int
-// </namespace name="kt776">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt843.txt b/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt843.txt
deleted file mode 100644
index 87c51c79675..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt843.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="kt843">
-namespace kt843
-
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-// </namespace name="kt843">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt897.txt b/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt897.txt
deleted file mode 100644
index 1976dac959d..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlFlowAnalysis/kt897.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-// <namespace name="kt897">
-namespace kt897
-
-internal final class kt897.A : jet.Any {
-    public final /*constructor*/ fun <init>(): kt897.A
-    internal final val i: jet.Int?
-    internal final var j: jet.Int
-    internal final val k: jet.Int
-}
-// </namespace name="kt897">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlStructures/ForWithoutBraces.txt b/compiler/testData/lazyResolve/diagnostics/controlStructures/ForWithoutBraces.txt
deleted file mode 100644
index 4b34c64649a..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlStructures/ForWithoutBraces.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun ff(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/controlStructures/kt1075.txt b/compiler/testData/lazyResolve/diagnostics/controlStructures/kt1075.txt
deleted file mode 100644
index c2f1c60e224..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlStructures/kt1075.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1075">
-namespace kt1075
-
-internal final fun foo(/*0*/ b: jet.String): jet.Tuple0
-// </namespace name="kt1075">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlStructures/kt657.txt b/compiler/testData/lazyResolve/diagnostics/controlStructures/kt657.txt
deleted file mode 100644
index c6f81f06bd6..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlStructures/kt657.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-// <namespace name="kt657">
-namespace kt657
-
-internal final fun cond1(): jet.Boolean
-internal final fun cond2(): jet.Boolean
-internal final fun foo(): jet.Int
-// </namespace name="kt657">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlStructures/kt770.kt351.kt735_StatementType.txt b/compiler/testData/lazyResolve/diagnostics/controlStructures/kt770.kt351.kt735_StatementType.txt
deleted file mode 100644
index 7558477069c..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlStructures/kt770.kt351.kt735_StatementType.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace <root>
-
-// <namespace name="kt770_351_735">
-namespace kt770_351_735
-
-internal final val w: [ERROR : Type for while (true) {}]
-internal final fun bar(/*0*/ a: jet.Tuple0): jet.Tuple0
-internal final fun box(): jet.Int
-internal final fun doSmth(/*0*/ i: jet.Int): jet.Tuple0
-internal final fun foo(): jet.Tuple0
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-internal final fun test1(): jet.Tuple0
-internal final fun test2(): jet.Tuple0
-internal final fun testCoercionToUnit(): jet.Tuple0
-internal final fun testImplicitCoercion(): jet.Tuple0
-internal final fun testStatementInExpressionContext(): jet.Tuple0
-internal final fun testStatementInExpressionContext2(): jet.Tuple0
-// </namespace name="kt770_351_735">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlStructures/kt786.txt b/compiler/testData/lazyResolve/diagnostics/controlStructures/kt786.txt
deleted file mode 100644
index d8b1d7b1252..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlStructures/kt786.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-// <namespace name="kt786">
-namespace kt786
-
-internal final fun bar(): jet.Int
-internal final fun fff(): jet.Int
-internal final fun foo(): jet.Int
-// </namespace name="kt786">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlStructures/kt799.txt b/compiler/testData/lazyResolve/diagnostics/controlStructures/kt799.txt
deleted file mode 100644
index 5fc1c2a661e..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlStructures/kt799.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-// <namespace name="kt799">
-namespace kt799
-
-internal final val a: jet.Nothing
-internal final val b: jet.Nothing
-internal final val c: jet.Tuple0
-internal final fun doSmth(/*0*/ i: jet.Int): jet.Tuple0
-internal final fun f(/*0*/ mi: jet.Int = ?): jet.Tuple0
-internal final fun test(): jet.Tuple0
-// </namespace name="kt799">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlStructures/tryReturnType.txt b/compiler/testData/lazyResolve/diagnostics/controlStructures/tryReturnType.txt
deleted file mode 100644
index a251051b5f2..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlStructures/tryReturnType.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-internal final fun bar(): jet.Int
-internal final fun doSmth(): jet.Tuple0
-internal final fun foo(): jet.Int
-// </namespace name="a">
diff --git a/compiler/testData/lazyResolve/diagnostics/controlStructures/when.kt234.kt973.txt b/compiler/testData/lazyResolve/diagnostics/controlStructures/when.kt234.kt973.txt
deleted file mode 100644
index ee3bfcd0837..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/controlStructures/when.kt234.kt973.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace <root>
-
-// <namespace name="kt234_kt973">
-namespace kt234_kt973
-
-internal final fun foo3(/*0*/ x: jet.Int): jet.Int
-internal final fun foo4(/*0*/ x: jet.Int): jet.Int
-internal final fun t1(/*0*/ x: jet.Int): jet.Int
-internal final fun t2(/*0*/ x: jet.Int): jet.Int
-internal final fun t3(/*0*/ x: jet.Int): jet.Int
-internal final fun t4(/*0*/ x: jet.Int): jet.Int
-internal final fun t5(/*0*/ x: jet.Int): jet.Int
-internal final fun test(/*0*/ t: jet.Tuple2<out jet.Int, out jet.Int>): jet.Int
-internal final fun test1(/*0*/ t: jet.Tuple2<out jet.Int, out jet.Int>): jet.Int
-// </namespace name="kt234_kt973">
diff --git a/compiler/testData/lazyResolve/diagnostics/dataFlow/CalleeExpression.txt b/compiler/testData/lazyResolve/diagnostics/dataFlow/CalleeExpression.txt
deleted file mode 100644
index ce49ca5e9f8..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/dataFlow/CalleeExpression.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final class C : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ f: jet.Function0<jet.Tuple0>): C
-    internal final val f: jet.Function0<jet.Tuple0>
-}
-internal final fun test(/*0*/ e: jet.Any): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/dataFlow/TupleExpression.txt b/compiler/testData/lazyResolve/diagnostics/dataFlow/TupleExpression.txt
deleted file mode 100644
index 793a6551f3e..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/dataFlow/TupleExpression.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final class C : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ f: jet.Int): C
-    internal final val f: jet.Int
-}
-internal final fun test(/*0*/ e: jet.Any): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/dataFlow/WhenSubject.txt b/compiler/testData/lazyResolve/diagnostics/dataFlow/WhenSubject.txt
deleted file mode 100644
index 1f96cc7fb1d..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/dataFlow/WhenSubject.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-internal final class BinOp : Expr {
-    public final /*constructor*/ fun <init>(/*0*/ operator: jet.String): BinOp
-    internal final val operator: jet.String
-}
-internal abstract trait Expr : jet.Any {
-}
-internal final fun test(/*0*/ e: Expr): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/AndOr.txt b/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/AndOr.txt
deleted file mode 100644
index d9da81d482b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/AndOr.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun bar(/*0*/ x: jet.Int): jet.Int
-internal final fun foo(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/ArrayAccess.txt b/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/ArrayAccess.txt
deleted file mode 100644
index d9da81d482b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/ArrayAccess.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun bar(/*0*/ x: jet.Int): jet.Int
-internal final fun foo(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/BinaryExpression.txt b/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/BinaryExpression.txt
deleted file mode 100644
index d9da81d482b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/BinaryExpression.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun bar(/*0*/ x: jet.Int): jet.Int
-internal final fun foo(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/DeepIf.txt b/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/DeepIf.txt
deleted file mode 100644
index d9da81d482b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/DeepIf.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun bar(/*0*/ x: jet.Int): jet.Int
-internal final fun foo(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/DoWhile.txt b/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/DoWhile.txt
deleted file mode 100644
index d9da81d482b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/DoWhile.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun bar(/*0*/ x: jet.Int): jet.Int
-internal final fun foo(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/Elvis.txt b/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/Elvis.txt
deleted file mode 100644
index d9da81d482b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/Elvis.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun bar(/*0*/ x: jet.Int): jet.Int
-internal final fun foo(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/ExclExcl.txt b/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/ExclExcl.txt
deleted file mode 100644
index 9af818d6760..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/ExclExcl.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-internal final fun bar(/*0*/ x: jet.Int): jet.Int
-internal final fun f1(/*0*/ x: jet.Int?): jet.Tuple0
-internal final fun f2(/*0*/ x: jet.Int?): jet.Tuple0
-internal final fun f3(/*0*/ x: jet.Int?): jet.Tuple0
-internal final fun f4(/*0*/ x: jet.Int?): jet.Tuple0
-internal final fun f5(/*0*/ x: jet.Int?): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/For.txt b/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/For.txt
deleted file mode 100644
index d9da81d482b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/For.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun bar(/*0*/ x: jet.Int): jet.Int
-internal final fun foo(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/FunctionLiteral.txt b/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/FunctionLiteral.txt
deleted file mode 100644
index d9da81d482b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/FunctionLiteral.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun bar(/*0*/ x: jet.Int): jet.Int
-internal final fun foo(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/IfThenElse.txt b/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/IfThenElse.txt
deleted file mode 100644
index d9da81d482b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/IfThenElse.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun bar(/*0*/ x: jet.Int): jet.Int
-internal final fun foo(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/IfThenElseBothInvalid.txt b/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/IfThenElseBothInvalid.txt
deleted file mode 100644
index d9da81d482b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/IfThenElseBothInvalid.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun bar(/*0*/ x: jet.Int): jet.Int
-internal final fun foo(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/ObjectExpression.txt b/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/ObjectExpression.txt
deleted file mode 100644
index d9da81d482b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/ObjectExpression.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun bar(/*0*/ x: jet.Int): jet.Int
-internal final fun foo(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/QualifiedExpression.txt b/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/QualifiedExpression.txt
deleted file mode 100644
index 1794133d266..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/QualifiedExpression.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal final fun bar(/*0*/ x: jet.Int): jet.Int
-}
-internal final fun baz(/*0*/ x: jet.Int): jet.Int
-internal final fun foo(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/Return.txt b/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/Return.txt
deleted file mode 100644
index b1c73ed1c32..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/Return.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun bar(/*0*/ x: jet.Int): jet.Int
-internal final fun foo(): jet.Int
diff --git a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/ThisSuper.txt b/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/ThisSuper.txt
deleted file mode 100644
index 314550ba790..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/ThisSuper.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-internal open class Base : jet.Any {
-    public final /*constructor*/ fun <init>(): Base
-    internal final fun bar(/*0*/ x: jet.Int): jet.Int
-}
-internal final class Derived : Base {
-    public final /*constructor*/ fun <init>(): Derived
-    internal final override /*1*/ fun bar(/*0*/ x: jet.Int): jet.Int
-    internal final fun baz(/*0*/ x: jet.Int): jet.Int
-    internal final fun foo(): jet.Tuple0
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/Throw.txt b/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/Throw.txt
deleted file mode 100644
index 12260238f47..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/Throw.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun bar(/*0*/ x: jet.Int): java.lang.RuntimeException
-internal final fun foo(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/TryCatch.txt b/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/TryCatch.txt
deleted file mode 100644
index d9da81d482b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/TryCatch.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun bar(/*0*/ x: jet.Int): jet.Int
-internal final fun foo(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/UnaryExpression.txt b/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/UnaryExpression.txt
deleted file mode 100644
index 11a348b2d01..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/UnaryExpression.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace <root>
-
-internal final fun bar(/*0*/ x: jet.Int): jet.Int
-internal final fun baz(/*0*/ b: jet.Boolean): jet.Boolean
-internal final fun foo(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/When.txt b/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/When.txt
deleted file mode 100644
index d9da81d482b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/When.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun bar(/*0*/ x: jet.Int): jet.Int
-internal final fun foo(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/While.txt b/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/While.txt
deleted file mode 100644
index d9da81d482b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/dataFlowInfoTraversal/While.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun bar(/*0*/ x: jet.Int): jet.Int
-internal final fun foo(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/declarationChecks/kt1141.txt b/compiler/testData/lazyResolve/diagnostics/declarationChecks/kt1141.txt
deleted file mode 100644
index ac30d568214..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/declarationChecks/kt1141.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1141">
-namespace kt1141
-
-internal final class kt1141.C : kt1141.SomeTrait {
-    public final /*constructor*/ fun <init>(): kt1141.C
-    internal abstract override /*1*/ fun foo(): jet.Tuple0
-}
-public abstract trait kt1141.SomeTrait : jet.Any {
-    internal abstract fun foo(): jet.Tuple0
-}
-internal final val Rr: kt1141.Rr
-internal final fun foo(): jet.Tuple0
-internal final fun foo2(): jet.Tuple0
-// </namespace name="kt1141">
diff --git a/compiler/testData/lazyResolve/diagnostics/declarationChecks/kt1193.txt b/compiler/testData/lazyResolve/diagnostics/declarationChecks/kt1193.txt
deleted file mode 100644
index d17ac7a0a7d..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/declarationChecks/kt1193.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1193">
-namespace kt1193
-
-internal final enum class kt1193.MyChildEnum : kt1193.MyEnum {
-    public final /*constructor*/ fun <init>(/*0*/ i: jet.Int, /*1*/ s: jet.String): kt1193.MyChildEnum
-    internal final override /*1*/ val i: jet.Int
-    internal final val s: jet.String
-    internal final class object kt1193.MyChildEnum.<class-object-for-MyChildEnum> {
-        internal final /*constructor*/ fun <init>(): kt1193.MyChildEnum.<class-object-for-MyChildEnum>
-        internal final val C: kt1193.MyChildEnum.<class-object-for-MyChildEnum>.C
-    }
-}
-internal open enum class kt1193.MyEnum : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ i: jet.Int): kt1193.MyEnum
-    internal final val i: jet.Int
-    internal final class object kt1193.MyEnum.<class-object-for-MyEnum> {
-        internal final /*constructor*/ fun <init>(): kt1193.MyEnum.<class-object-for-MyEnum>
-        internal final val A: kt1193.MyEnum.<class-object-for-MyEnum>.A
-        internal final val B: kt1193.MyEnum.<class-object-for-MyEnum>.B
-    }
-}
-// </namespace name="kt1193">
diff --git a/compiler/testData/lazyResolve/diagnostics/declarationChecks/kt2096.txt b/compiler/testData/lazyResolve/diagnostics/declarationChecks/kt2096.txt
deleted file mode 100644
index ad7d211adaa..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/declarationChecks/kt2096.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-// <namespace name="c">
-namespace c
-
-internal abstract class c.Foo : jet.Any {
-    public final /*constructor*/ fun <init>(): c.Foo
-    protected abstract val prop: [ERROR : No type, no body]
-}
-// </namespace name="c">
diff --git a/compiler/testData/lazyResolve/diagnostics/declarationChecks/kt2142.txt b/compiler/testData/lazyResolve/diagnostics/declarationChecks/kt2142.txt
deleted file mode 100644
index f09c4dce1a2..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/declarationChecks/kt2142.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-internal final fun foo(): jet.Tuple0
-// </namespace name="a">
diff --git a/compiler/testData/lazyResolve/diagnostics/declarationChecks/kt559.txt b/compiler/testData/lazyResolve/diagnostics/declarationChecks/kt559.txt
deleted file mode 100644
index 0426640aa16..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/declarationChecks/kt559.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-namespace <root>
-
-// <namespace name="kt559">
-namespace kt559
-
-internal abstract class kt559.A : jet.Any {
-    public final /*constructor*/ fun <init>(): kt559.A
-    internal final fun fff(): jet.Tuple0
-    internal abstract fun foo(): jet.Int
-    internal abstract val i: jet.Int
-}
-internal final class kt559.B : kt559.A {
-    public final /*constructor*/ fun <init>(): kt559.B
-    internal final override /*1*/ fun fff(): jet.Tuple0
-    internal open override /*1*/ fun foo(): jet.Int
-    internal abstract override /*1*/ val i: jet.Int
-}
-internal final class kt559.C : kt559.D {
-    public final /*constructor*/ fun <init>(): kt559.C
-    internal final override /*1*/ fun fff(): jet.Tuple0
-    internal abstract override /*1*/ fun foo(): jet.Int
-    internal open override /*1*/ val i: jet.Int
-    internal final fun test(): jet.Tuple0
-}
-internal abstract class kt559.D : kt559.A {
-    public final /*constructor*/ fun <init>(): kt559.D
-    internal final override /*1*/ fun fff(): jet.Tuple0
-    internal abstract override /*1*/ fun foo(): jet.Int
-    internal open override /*1*/ val i: jet.Int
-}
-// </namespace name="kt559">
diff --git a/compiler/testData/lazyResolve/diagnostics/extensions/ExtensionFunctions.txt b/compiler/testData/lazyResolve/diagnostics/extensions/ExtensionFunctions.txt
deleted file mode 100644
index d65323c7760..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/extensions/ExtensionFunctions.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace <root>
-
-// <namespace name="outer">
-namespace outer
-
-internal final class outer.A : jet.Any {
-    public final /*constructor*/ fun <init>(): outer.A
-}
-internal final val jet.Int.abs: jet.Int
-internal final val  </*0*/ T : jet.Any?> T.foo: T
-internal final val jet.Int?.optval: jet.Tuple0
-internal final fun </*0*/ T : jet.Any?, /*1*/ E : jet.Any?>T.foo(/*0*/ x: E, /*1*/ y: outer.A): T
-internal final fun jet.Int.foo(): jet.Int
-internal final fun </*0*/ T : jet.Any?>T.minus(/*0*/ t: T): jet.Int
-internal final fun jet.Int?.optint(): jet.Tuple0
-internal final fun outer.A.plus(/*0*/ a: jet.Any): jet.Tuple0
-internal final fun outer.A.plus(/*0*/ a: jet.Int): jet.Tuple0
-internal final fun test(): jet.Tuple0
-// </namespace name="outer">
-// <namespace name="null_safety">
-namespace null_safety
-
-internal final class null_safety.Command : jet.Any {
-    public final /*constructor*/ fun <init>(): null_safety.Command
-    internal final val foo: jet.Int
-}
-internal final fun jet.Any.equals(/*0*/ other: jet.Any?): jet.Boolean
-internal final fun jet.Any?.equals1(/*0*/ other: jet.Any?): jet.Boolean
-internal final fun jet.Any.equals2(/*0*/ other: jet.Any?): jet.Boolean
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-internal final fun parse(/*0*/ cmd: jet.String): null_safety.Command?
-// </namespace name="null_safety">
diff --git a/compiler/testData/lazyResolve/diagnostics/extensions/ExtensionsCalledOnSuper.txt b/compiler/testData/lazyResolve/diagnostics/extensions/ExtensionsCalledOnSuper.txt
deleted file mode 100644
index 3650673a33a..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/extensions/ExtensionsCalledOnSuper.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace <root>
-
-internal final class C : T {
-    public final /*constructor*/ fun <init>(): C
-    internal open override /*1*/ fun buzz(): jet.Tuple0
-    internal open override /*1*/ fun buzz1(/*0*/ i: jet.Int): jet.Tuple0
-    internal open override /*1*/ fun foo(): jet.Tuple0
-    internal final fun test(): jet.Tuple0
-}
-internal abstract trait T : jet.Any {
-    internal open fun buzz(): jet.Tuple0
-    internal open fun buzz1(/*0*/ i: jet.Int): jet.Tuple0
-    internal open fun foo(): jet.Tuple0
-}
-internal final fun T.bar(): jet.Tuple0
-internal final fun T.buzz(): jet.Tuple0
-internal final fun T.buzz1(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/extensions/GenericIterator.txt b/compiler/testData/lazyResolve/diagnostics/extensions/GenericIterator.txt
deleted file mode 100644
index f173ad02b8f..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/extensions/GenericIterator.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace <root>
-
-internal final fun </*0*/ T : jet.Any>T?.iterator(): iterator.<no name provided>
-internal final fun </*0*/ T : jet.Any?>java.util.Enumeration<T>.iterator(): iterator.<no name provided>
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/extensions/GenericIterator2.txt b/compiler/testData/lazyResolve/diagnostics/extensions/GenericIterator2.txt
deleted file mode 100644
index b4ec6b67f35..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/extensions/GenericIterator2.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun a(/*0*/ e: java.util.Enumeration<jet.Int>): jet.Tuple0
-internal final fun </*0*/ T : jet.Any?>java.util.Enumeration<T>.iterator(): iterator.<no name provided>
diff --git a/compiler/testData/lazyResolve/diagnostics/extensions/kt1875.txt b/compiler/testData/lazyResolve/diagnostics/extensions/kt1875.txt
deleted file mode 100644
index 2e03bdb4152..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/extensions/kt1875.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1875">
-namespace kt1875
-
-internal abstract trait kt1875.T : jet.Any {
-    internal abstract val f: jet.Function1<jet.Int, jet.Tuple0>?
-}
-internal final fun f(/*0*/ a: jet.Int?, /*1*/ b: jet.ExtensionFunction1<jet.Int, jet.Int, jet.Int>): jet.Int?
-internal final fun test(/*0*/ t: kt1875.T): jet.Tuple0
-internal final fun test1(/*0*/ t: kt1875.T?): jet.Tuple0
-// </namespace name="kt1875">
diff --git a/compiler/testData/lazyResolve/diagnostics/extensions/kt2317.txt b/compiler/testData/lazyResolve/diagnostics/extensions/kt2317.txt
deleted file mode 100644
index f73a9f2c24f..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/extensions/kt2317.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-// <namespace name="kt2317">
-namespace kt2317
-
-internal final fun jet.Any?.bar(): jet.Tuple0
-internal final fun jet.Any?.baz(): jet.Int
-internal final fun foo(/*0*/ l: jet.Long?): jet.Int?
-internal final fun quux(/*0*/ x: jet.Int?): jet.Tuple0
-// </namespace name="kt2317">
diff --git a/compiler/testData/lazyResolve/diagnostics/extensions/kt819ExtensionProperties.txt b/compiler/testData/lazyResolve/diagnostics/extensions/kt819ExtensionProperties.txt
deleted file mode 100644
index 877ed049f4d..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/extensions/kt819ExtensionProperties.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace <root>
-
-internal open class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal open fun jet.Int.foo(): jet.Tuple0
-    internal open val jet.Int.foo: jet.Int
-    internal open fun jet.String.foo(): jet.Tuple0
-    internal open val jet.String.foo: jet.Int
-}
-internal final class B : A {
-    public final /*constructor*/ fun <init>(): B
-    internal open override /*1*/ fun jet.Int.foo(): jet.Tuple0
-    internal open override /*1*/ val jet.Int.foo: jet.Int
-    internal open override /*1*/ fun jet.String.foo(): jet.Tuple0
-    internal open override /*1*/ val jet.String.foo: jet.Int
-    internal final fun use(/*0*/ s: jet.String): jet.Tuple0
-}
-internal final val java.io.InputStream.buffered: java.io.BufferedInputStream
-internal final val java.io.Reader.buffered: java.io.BufferedReader
diff --git a/compiler/testData/lazyResolve/diagnostics/generics/Projections.txt b/compiler/testData/lazyResolve/diagnostics/generics/Projections.txt
deleted file mode 100644
index a323465fdb0..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/generics/Projections.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace <root>
-
-internal final class In</*0*/ in T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ in T : jet.Any?><init>(): In<T>
-    internal final fun f(/*0*/ t: T): jet.Tuple0
-    internal final fun f(/*0*/ t: jet.Int): jet.Int
-    internal final fun f1(/*0*/ t: T): jet.Tuple0
-}
-internal final class Inv</*0*/ T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): Inv<T>
-    internal final fun f(/*0*/ t: T): T
-    internal final fun inf(/*0*/ t: T): jet.Tuple0
-    internal final fun outf(): T
-}
-internal final class Out</*0*/ out T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T : jet.Any?><init>(): Out<T>
-    internal final fun f(): T
-    internal final fun f(/*0*/ a: jet.Int): jet.Int
-}
-internal final fun testInOut(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/generics/RecursiveUpperBoundCheck.txt b/compiler/testData/lazyResolve/diagnostics/generics/RecursiveUpperBoundCheck.txt
deleted file mode 100644
index a6c9123ef91..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/generics/RecursiveUpperBoundCheck.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace <root>
-
-internal open class C</*0*/ T : C<T>> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : C<T>><init>(): C<T>
-}
-internal final class TestFail : C<C<TestFail>> {
-    public final /*constructor*/ fun <init>(): TestFail
-}
-internal final class TestOK : C<TestOK> {
-    public final /*constructor*/ fun <init>(): TestOK
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/generics/RecursiveUpperBoundWithTwoArguments.txt b/compiler/testData/lazyResolve/diagnostics/generics/RecursiveUpperBoundWithTwoArguments.txt
deleted file mode 100644
index 94876dfa4ca..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/generics/RecursiveUpperBoundWithTwoArguments.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace <root>
-
-internal final class D</*0*/ A : D<A, jet.String>, /*1*/ B : D<A, B>> : jet.Any {
-    public final /*constructor*/ fun </*0*/ A : D<A, jet.String>, /*1*/ B : D<A, B>><init>(): D<A, B>
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/generics/kt1575-Class.txt b/compiler/testData/lazyResolve/diagnostics/generics/kt1575-Class.txt
deleted file mode 100644
index f6f869157ef..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/generics/kt1575-Class.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace <root>
-
-internal final class C</*0*/ T : C<T>> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : C<T>><init>(): C<T>
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/generics/kt1575-ClassObject.txt b/compiler/testData/lazyResolve/diagnostics/generics/kt1575-ClassObject.txt
deleted file mode 100644
index 5afc6944ac6..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/generics/kt1575-ClassObject.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace <root>
-
-internal final class CO</*0*/ T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): CO<T>
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/generics/kt1575-Function.txt b/compiler/testData/lazyResolve/diagnostics/generics/kt1575-Function.txt
deleted file mode 100644
index 42516ea3bdc..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/generics/kt1575-Function.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace <root>
-
-internal final class C</*0*/ T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): C<T>
-}
-internal final fun </*0*/ T : C<T>>foo(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/incompleteCode/arrayBracketsRange.txt b/compiler/testData/lazyResolve/diagnostics/incompleteCode/arrayBracketsRange.txt
deleted file mode 100644
index 95c1f1a60ff..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/incompleteCode/arrayBracketsRange.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="b">
-namespace b
-
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-// </namespace name="b">
diff --git a/compiler/testData/lazyResolve/diagnostics/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.txt b/compiler/testData/lazyResolve/diagnostics/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.txt
deleted file mode 100644
index 267fa8fd9bc..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-// <namespace name="h">
-namespace h
-
-internal final class h.Square : jet.Any {
-    public final /*constructor*/ fun <init>(): h.Square
-    internal final var area: jet.Double private set
-    internal final var size: jet.Double
-}
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-// </namespace name="h">
diff --git a/compiler/testData/lazyResolve/diagnostics/incompleteCode/diagnosticWithSyntaxError/funEquals.txt b/compiler/testData/lazyResolve/diagnostics/incompleteCode/diagnosticWithSyntaxError/funEquals.txt
deleted file mode 100644
index 3ed5be51eb5..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/incompleteCode/diagnosticWithSyntaxError/funEquals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun foo(): [ERROR : No type, no body]
diff --git a/compiler/testData/lazyResolve/diagnostics/incompleteCode/diagnosticWithSyntaxError/incompleteVal.txt b/compiler/testData/lazyResolve/diagnostics/incompleteCode/diagnosticWithSyntaxError/incompleteVal.txt
deleted file mode 100644
index e0371f27491..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/incompleteCode/diagnosticWithSyntaxError/incompleteVal.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="c">
-namespace c
-
-internal final val i: [ERROR : No type, no body]
-// </namespace name="c">
diff --git a/compiler/testData/lazyResolve/diagnostics/incompleteCode/diagnosticWithSyntaxError/incompleteValWithAccessor.txt b/compiler/testData/lazyResolve/diagnostics/incompleteCode/diagnosticWithSyntaxError/incompleteValWithAccessor.txt
deleted file mode 100644
index 151368993ca..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/incompleteCode/diagnosticWithSyntaxError/incompleteValWithAccessor.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="c">
-namespace c
-
-internal final val i: jet.String
-// </namespace name="c">
diff --git a/compiler/testData/lazyResolve/diagnostics/incompleteCode/diagnosticWithSyntaxError/incompleteWhen.txt b/compiler/testData/lazyResolve/diagnostics/incompleteCode/diagnosticWithSyntaxError/incompleteWhen.txt
deleted file mode 100644
index bc2eac646d4..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/incompleteCode/diagnosticWithSyntaxError/incompleteWhen.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun test(/*0*/ a: jet.Any): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/incompleteCode/diagnosticWithSyntaxError/namedFun.txt b/compiler/testData/lazyResolve/diagnostics/incompleteCode/diagnosticWithSyntaxError/namedFun.txt
deleted file mode 100644
index 6789f8ae8f8..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/incompleteCode/diagnosticWithSyntaxError/namedFun.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun bar(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/incompleteCode/incompleteAssignment.txt b/compiler/testData/lazyResolve/diagnostics/incompleteCode/incompleteAssignment.txt
deleted file mode 100644
index 07e455fd78a..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/incompleteCode/incompleteAssignment.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-// <namespace name="sum">
-namespace sum
-
-internal final fun </*0*/ T : jet.Any?>assertEquals(/*0*/ actual: T?, /*1*/ expected: T?, /*2*/ message: jet.Any? = ?): jet.Tuple0
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-internal final fun sum(/*0*/ a: jet.IntArray): jet.Int
-internal final fun test(/*0*/ expectedSum: jet.Int, /*1*/ vararg data: jet.Int /*jet.IntArray*/): jet.Tuple0
-// </namespace name="sum">
diff --git a/compiler/testData/lazyResolve/diagnostics/incompleteCode/kt1955.txt b/compiler/testData/lazyResolve/diagnostics/incompleteCode/kt1955.txt
deleted file mode 100644
index ca6901ec7cb..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/incompleteCode/kt1955.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="b">
-namespace b
-
-internal final fun foo(): jet.Tuple0
-// </namespace name="b">
diff --git a/compiler/testData/lazyResolve/diagnostics/incompleteCode/kt2014.txt b/compiler/testData/lazyResolve/diagnostics/incompleteCode/kt2014.txt
deleted file mode 100644
index 3b79ea2e6dc..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/incompleteCode/kt2014.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace <root>
-
-// <namespace name="c">
-namespace c
-
-internal final class c.Foo : jet.Any {
-    public final /*constructor*/ fun <init>(): c.Foo
-    internal final val a: jet.Int
-    internal final fun bar(/*0*/ i: jet.Int): jet.Int
-    internal final fun prop(): jet.Int
-}
-internal final val R: c.R
-internal final fun x(/*0*/ f: c.Foo): jet.Tuple0
-// </namespace name="c">
diff --git a/compiler/testData/lazyResolve/diagnostics/incompleteCode/plusOnTheRight.txt b/compiler/testData/lazyResolve/diagnostics/incompleteCode/plusOnTheRight.txt
deleted file mode 100644
index 3a36d192732..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/incompleteCode/plusOnTheRight.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-internal final class a.MyClass1 : jet.Any {
-    public final /*constructor*/ fun <init>(): a.MyClass1
-    public final fun plus(): jet.Tuple0
-}
-internal final fun main(/*0*/ arg: a.MyClass1): jet.Tuple0
-// </namespace name="a">
diff --git a/compiler/testData/lazyResolve/diagnostics/incompleteCode/pseudocodeTraverseNextInstructions.txt b/compiler/testData/lazyResolve/diagnostics/incompleteCode/pseudocodeTraverseNextInstructions.txt
deleted file mode 100644
index ca6901ec7cb..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/incompleteCode/pseudocodeTraverseNextInstructions.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="b">
-namespace b
-
-internal final fun foo(): jet.Tuple0
-// </namespace name="b">
diff --git a/compiler/testData/lazyResolve/diagnostics/incompleteCode/senselessComparisonWithNull.txt b/compiler/testData/lazyResolve/diagnostics/incompleteCode/senselessComparisonWithNull.txt
deleted file mode 100644
index 0bcc99a0c81..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/incompleteCode/senselessComparisonWithNull.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="d">
-namespace d
-
-internal final fun foo(/*0*/ a: jet.IntArray): jet.Tuple0
-// </namespace name="d">
diff --git a/compiler/testData/lazyResolve/diagnostics/inference/NoInferenceFromDeclaredBounds.txt b/compiler/testData/lazyResolve/diagnostics/inference/NoInferenceFromDeclaredBounds.txt
deleted file mode 100644
index 3ee17563fd3..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/inference/NoInferenceFromDeclaredBounds.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace <root>
-
-internal final val n: jet.Nothing
-internal final fun foo1(): jet.Tuple0
-internal final fun </*0*/ T : jet.Any?>fooT22(): T?
diff --git a/compiler/testData/lazyResolve/diagnostics/inference/arrayConstructor.txt b/compiler/testData/lazyResolve/diagnostics/inference/arrayConstructor.txt
deleted file mode 100644
index 4d60f5d34e7..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/inference/arrayConstructor.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="b">
-namespace b
-
-internal final fun bar(): jet.Tuple0
-// </namespace name="b">
diff --git a/compiler/testData/lazyResolve/diagnostics/inference/conflictingSubstitutions.txt b/compiler/testData/lazyResolve/diagnostics/inference/conflictingSubstitutions.txt
deleted file mode 100644
index 6b6b9a37ca7..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/inference/conflictingSubstitutions.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-// <namespace name="conflictingSubstitutions">
-namespace conflictingSubstitutions
-
-internal final fun </*0*/ R : jet.Any?>elemAndList(/*0*/ r: R, /*1*/ t: java.util.List<R>): R
-internal final fun </*0*/ R : jet.Any?>R.elemAndListWithReceiver(/*0*/ r: R, /*1*/ t: java.util.List<R>): R
-internal final fun </*0*/ T : jet.Any?>list(/*0*/ value: T): java.util.ArrayList<T>
-internal final fun test(): jet.Tuple0
-// </namespace name="conflictingSubstitutions">
diff --git a/compiler/testData/lazyResolve/diagnostics/inference/dependOnExpectedType.txt b/compiler/testData/lazyResolve/diagnostics/inference/dependOnExpectedType.txt
deleted file mode 100644
index a333ef63741..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/inference/dependOnExpectedType.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace <root>
-
-// <namespace name="h">
-namespace h
-
-internal final fun </*0*/ T : jet.Any?>both(/*0*/ t1: T, /*1*/ t2: T): T
-internal final fun </*0*/ R : jet.Any?>elem(/*0*/ t: java.util.List<R>): R
-internal final fun </*0*/ R : jet.Any?>elemAndList(/*0*/ r: R, /*1*/ t: java.util.List<R>): R
-internal final fun </*0*/ T : jet.Any?>id(/*0*/ t: T): T
-internal final fun </*0*/ T : jet.Any?>id1(/*0*/ t: T): T
-internal final fun </*0*/ T : jet.Any?>list(/*0*/ value: T): java.util.ArrayList<T>
-internal final fun </*0*/ S : jet.Any?>newList(): java.util.ArrayList<S>
-internal final fun test1(): jet.Tuple0
-// </namespace name="h">
diff --git a/compiler/testData/lazyResolve/diagnostics/inference/hasErrorInConstrainingTypes.txt b/compiler/testData/lazyResolve/diagnostics/inference/hasErrorInConstrainingTypes.txt
deleted file mode 100644
index 7a1aaffc491..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/inference/hasErrorInConstrainingTypes.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="n">
-namespace n
-
-internal final fun </*0*/ T : jet.Any?>foo(/*0*/ t: T, /*1*/ t1: T): jet.Tuple0
-internal final fun test(): jet.Tuple0
-// </namespace name="n">
diff --git a/compiler/testData/lazyResolve/diagnostics/inference/inferInFunctionLiterals.txt b/compiler/testData/lazyResolve/diagnostics/inference/inferInFunctionLiterals.txt
deleted file mode 100644
index bfecfa2486f..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/inference/inferInFunctionLiterals.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-// <namespace name="n">
-namespace n
-
-internal final fun </*0*/ T : jet.Any?>expected(/*0*/ t: T, /*1*/ f: jet.Function0<T>): T
-internal final fun </*0*/ T : jet.Any?>java.util.List<T>.reverse(): java.util.List<T>
-internal final fun test(/*0*/ arrayList: java.util.ArrayList<jet.Int>, /*1*/ list: java.util.List<jet.Int>): jet.Tuple0
-// </namespace name="n">
diff --git a/compiler/testData/lazyResolve/diagnostics/inference/kt1293.txt b/compiler/testData/lazyResolve/diagnostics/inference/kt1293.txt
deleted file mode 100644
index 53a80612617..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/inference/kt1293.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1293">
-namespace kt1293
-
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-internal final fun requiresInt(/*0*/ i: jet.Int): jet.Tuple0
-// </namespace name="kt1293">
diff --git a/compiler/testData/lazyResolve/diagnostics/inference/kt619.txt b/compiler/testData/lazyResolve/diagnostics/inference/kt619.txt
deleted file mode 100644
index 0c886274c8f..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/inference/kt619.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final class A : jet.Comparable<A> {
-    public final /*constructor*/ fun <init>(/*0*/ t: jet.Int): A
-    public open override /*1*/ fun compareTo(/*0*/ other: A): jet.Int
-    internal final var i: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/inference/listConstructor.txt b/compiler/testData/lazyResolve/diagnostics/inference/listConstructor.txt
deleted file mode 100644
index c6304699af6..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/inference/listConstructor.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-internal final fun </*0*/ T : jet.Any?>arrayList(/*0*/ vararg values: T /*jet.Array<T>*/): java.util.ArrayList<T>
-internal final fun </*0*/ A : jet.Any?>cons(/*0*/ x: A, /*1*/ xs: java.util.List<A>): java.util.List<A>
-internal final fun </*0*/ B : jet.Any?>nil(): java.util.List<B>
-internal final fun test(): jet.Tuple0
-internal final fun </*0*/ in T : jet.Any?, /*1*/ C : java.util.Collection<in T>>jet.Array<T>.toCollection(/*0*/ result: C): C
-// </namespace name="a">
diff --git a/compiler/testData/lazyResolve/diagnostics/inference/mapFunction.txt b/compiler/testData/lazyResolve/diagnostics/inference/mapFunction.txt
deleted file mode 100644
index d3651603969..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/inference/mapFunction.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-internal final fun </*0*/ T : jet.Any?>array(/*0*/ vararg t: T /*jet.Array<T>*/): jet.Array<T>
-internal final fun foo(): jet.Tuple0
-internal final fun </*0*/ T : jet.Any?, /*1*/ R : jet.Any?>jet.Array<T>.map(/*0*/ transform: jet.Function1<T, R>): java.util.List<R>
-internal final fun </*0*/ T : jet.Any?, /*1*/ R : jet.Any?, /*2*/ C : java.util.Collection<in R>>jet.Array<T>.mapTo(/*0*/ result: C, /*1*/ transform: jet.Function1<T, R>): C
-// </namespace name="a">
diff --git a/compiler/testData/lazyResolve/diagnostics/inference/noInformationForParameter.txt b/compiler/testData/lazyResolve/diagnostics/inference/noInformationForParameter.txt
deleted file mode 100644
index 66ce475d6e2..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/inference/noInformationForParameter.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="noInformationForParameter">
-namespace noInformationForParameter
-
-internal final fun </*0*/ S : jet.Any?>newList(): java.util.ArrayList<S>
-internal final fun test(): jet.Tuple0
-// </namespace name="noInformationForParameter">
diff --git a/compiler/testData/lazyResolve/diagnostics/inference/regressions/kt1029.txt b/compiler/testData/lazyResolve/diagnostics/inference/regressions/kt1029.txt
deleted file mode 100644
index 10075b87a47..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/inference/regressions/kt1029.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-// <namespace name="i">
-namespace i
-
-internal final fun a(): jet.Tuple0
-public final fun </*0*/ T : jet.Any?>from(/*0*/ yielder: jet.Function0<jet.Iterable<T>>): jet.Iterable<T>
-public final fun </*0*/ T : jet.Any?>jet.Iterable<T>.where(/*0*/ predicate: jet.Function1<T, jet.Boolean>): jet.Function0<jet.Iterable<T>>
-// </namespace name="i">
diff --git a/compiler/testData/lazyResolve/diagnostics/inference/regressions/kt1031.txt b/compiler/testData/lazyResolve/diagnostics/inference/regressions/kt1031.txt
deleted file mode 100644
index d6e50340391..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/inference/regressions/kt1031.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-// <namespace name="i">
-namespace i
-
-internal final fun a(): jet.Tuple0
-public final fun </*0*/ TItem : jet.Any?, /*1*/ TResult : jet.Any?>select(/*0*/ yielder: jet.Function0<jet.Iterable<TItem>>, /*1*/ selector: jet.Function1<TItem, TResult>): jet.Function0<jet.Iterable<TResult>>
-public final fun </*0*/ TItem : jet.Any?>jet.Iterable<TItem>.where(/*0*/ predicate: jet.Function1<TItem, jet.Boolean>): jet.Function0<jet.Iterable<TItem>>
-// </namespace name="i">
diff --git a/compiler/testData/lazyResolve/diagnostics/inference/regressions/kt1558.txt b/compiler/testData/lazyResolve/diagnostics/inference/regressions/kt1558.txt
deleted file mode 100644
index cc4c96b8e70..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/inference/regressions/kt1558.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="j">
-namespace j
-
-internal final fun testArrays(/*0*/ ci: java.util.List<jet.Int?>, /*1*/ cii: java.util.List<jet.Int?>): jet.Tuple0
-// </namespace name="j">
diff --git a/compiler/testData/lazyResolve/diagnostics/inference/regressions/kt1944.txt b/compiler/testData/lazyResolve/diagnostics/inference/regressions/kt1944.txt
deleted file mode 100644
index 679a551affd..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/inference/regressions/kt1944.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-// <namespace name="j">
-namespace j
-
-internal final class j.P : jet.Any {
-    public final /*constructor*/ fun <init>(): j.P
-    internal final fun foo(): jet.Tuple0
-    internal final var x: jet.Int private set
-}
-internal final fun </*0*/ T : jet.Any?>run(/*0*/ f: jet.Function0<T>): T
-// </namespace name="j">
diff --git a/compiler/testData/lazyResolve/diagnostics/inference/regressions/kt2179.txt b/compiler/testData/lazyResolve/diagnostics/inference/regressions/kt2179.txt
deleted file mode 100644
index af4d5d2d1ad..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/inference/regressions/kt2179.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-// <namespace name="i">
-namespace i
-
-internal final val java.util.Collection<out jet.Any?>.size: jet.Int
-internal final fun </*0*/ T : jet.Any?>arrayList(/*0*/ vararg values: T /*jet.Array<T>*/): java.util.ArrayList<T>
-internal final fun </*0*/ T : jet.Any?, /*1*/ R : jet.Any?>java.util.Collection<T>.map(/*0*/ transform: jet.Function1<T, R>): java.util.List<R>
-internal final fun </*0*/ T : jet.Any?, /*1*/ R : jet.Any?, /*2*/ C : java.util.Collection<in R>>java.util.Collection<T>.mapTo(/*0*/ result: C, /*1*/ transform: jet.Function1<T, R>): C
-internal final fun test(): jet.Tuple0
-internal final fun </*0*/ in T : jet.Any?, /*1*/ C : java.util.Collection<in T>>jet.Array<T>.toCollection(/*0*/ result: C): C
-// </namespace name="i">
diff --git a/compiler/testData/lazyResolve/diagnostics/inference/regressions/kt2294.txt b/compiler/testData/lazyResolve/diagnostics/inference/regressions/kt2294.txt
deleted file mode 100644
index 54abbabfb66..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/inference/regressions/kt2294.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-internal final fun </*0*/ T : jet.Any?>array(/*0*/ vararg t: T /*jet.Array<T>*/): jet.Array<T>
-public final fun </*0*/ E : jet.Any?>foo(/*0*/ array: jet.Array<E>): jet.Array<E>
-public final fun test(): jet.Tuple0
-// </namespace name="a">
diff --git a/compiler/testData/lazyResolve/diagnostics/inference/regressions/kt2320.txt b/compiler/testData/lazyResolve/diagnostics/inference/regressions/kt2320.txt
deleted file mode 100644
index a2c6daa97bf..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/inference/regressions/kt2320.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-// <namespace name="i">
-namespace i
-
-internal abstract trait i.Entry</*0*/ B : jet.Any?> : jet.Any {
-    internal abstract fun getValue(): B
-}
-internal abstract trait i.NotMap</*0*/ B : jet.Any?> : jet.Any {
-}
-internal final fun </*0*/ B : jet.Any?, /*1*/ C : jet.Any?>i.NotMap<B>.mapValuesOnly(/*0*/ f: jet.Function1<B, C>): i.NotMap<C>
-internal final fun </*0*/ V : jet.Any?, /*1*/ R : jet.Any?>i.NotMap<V>.mapValuesOriginal(/*0*/ ff: jet.Function1<i.Entry<V>, R>): i.NotMap<R>
-// </namespace name="i">
diff --git a/compiler/testData/lazyResolve/diagnostics/inference/regressions/kt2324.txt b/compiler/testData/lazyResolve/diagnostics/inference/regressions/kt2324.txt
deleted file mode 100644
index 7e2d2afeca9..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/inference/regressions/kt2324.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace <root>
-
-// <namespace name="i">
-namespace i
-
-internal final fun </*0*/ T : jet.Any?>arrayList(/*0*/ vararg values: T /*jet.Array<T>*/): java.util.ArrayList<T>
-internal final fun assertEquals(/*0*/ expected: jet.Any?, /*1*/ actual: jet.Any?, /*2*/ message: jet.String = ?): jet.Tuple0
-internal final fun </*0*/ T : jet.Any?, /*1*/ K : jet.Any?>someFunction(/*0*/ list: java.util.List<T>, /*1*/ transform: jet.Function1<T, K>): java.util.List<K>
-internal final fun testSomeFunction(): jet.Tuple0
-internal final fun </*0*/ in T : jet.Any?, /*1*/ C : java.util.Collection<in T>>jet.Array<T>.toCollection(/*0*/ result: C): C
-// </namespace name="i">
diff --git a/compiler/testData/lazyResolve/diagnostics/inference/typeConstructorMismatch.txt b/compiler/testData/lazyResolve/diagnostics/inference/typeConstructorMismatch.txt
deleted file mode 100644
index b46ef39a726..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/inference/typeConstructorMismatch.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-// <namespace name="typeConstructorMismatch">
-namespace typeConstructorMismatch
-
-internal final fun </*0*/ R : jet.Any?>elemAndList(/*0*/ r: R, /*1*/ t: java.util.List<R>): R
-internal final fun </*0*/ R : jet.Any?>R.elemAndListWithReceiver(/*0*/ r: R, /*1*/ t: java.util.List<R>): R
-internal final fun test(/*0*/ set: java.util.Set<jet.String>): jet.Tuple0
-// </namespace name="typeConstructorMismatch">
diff --git a/compiler/testData/lazyResolve/diagnostics/inference/typeInferenceExpectedTypeMismatch.txt b/compiler/testData/lazyResolve/diagnostics/inference/typeInferenceExpectedTypeMismatch.txt
deleted file mode 100644
index 435d562bf65..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/inference/typeInferenceExpectedTypeMismatch.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="typeInferenceExpectedTypeMismatch">
-namespace typeInferenceExpectedTypeMismatch
-
-internal final fun </*0*/ S : jet.Any?>newList(): java.util.ArrayList<S>
-internal final fun test(): jet.Tuple0
-// </namespace name="typeInferenceExpectedTypeMismatch">
diff --git a/compiler/testData/lazyResolve/diagnostics/infos/Autocasts.txt b/compiler/testData/lazyResolve/diagnostics/infos/Autocasts.txt
deleted file mode 100644
index cb71a027ad8..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/infos/Autocasts.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-namespace <root>
-
-internal open class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal final fun foo(): jet.Tuple0
-}
-internal final class B : A {
-    public final /*constructor*/ fun <init>(): B
-    internal final fun bar(): jet.Tuple0
-    internal final override /*1*/ fun foo(): jet.Tuple0
-}
-internal final class C : A {
-    public final /*constructor*/ fun <init>(): C
-    internal final fun bar(): jet.Tuple0
-    internal final override /*1*/ fun foo(): jet.Tuple0
-}
-internal final fun declarationInsidePattern(/*0*/ x: jet.Tuple2<out jet.Any, out jet.Any>): jet.String
-internal final fun declarations(/*0*/ a: jet.Any?): jet.Tuple0
-internal final fun f(): jet.String
-internal final fun f10(/*0*/ init: A?): jet.Tuple0
-internal final fun f101(/*0*/ a: A?): jet.Tuple0
-internal final fun f11(/*0*/ a: A?): jet.Tuple0
-internal final fun f12(/*0*/ a: A?): jet.Tuple0
-internal final fun f13(/*0*/ a: A?): jet.Tuple0
-internal final fun f14(/*0*/ a: A?): jet.Tuple0
-internal final fun f15(/*0*/ a: A?): jet.Tuple0
-internal final fun f9(/*0*/ init: A?): jet.Tuple0
-internal final fun foo(/*0*/ a: jet.Any): jet.Int
-internal final fun getStringLength(/*0*/ obj: jet.Any): jet.Char?
-internal final fun illegalTupleReturnType(/*0*/ a: jet.Any): jet.Tuple2<out jet.Any, out jet.String>
-internal final fun illegalWhenBlock(/*0*/ a: jet.Any): jet.Int
-internal final fun illegalWhenBody(/*0*/ a: jet.Any): jet.Int
-internal final fun mergeAutocasts(/*0*/ a: jet.Any?): jet.Tuple0
-internal final fun returnFunctionLiteral(/*0*/ a: jet.Any?): jet.Function0<jet.Int>
-internal final fun returnFunctionLiteralBlock(/*0*/ a: jet.Any?): jet.Function0<jet.Int>
-internal final fun toInt(/*0*/ i: jet.Int?): jet.Int
-internal final fun tuples(/*0*/ a: jet.Any?): jet.Tuple0
-internal final fun vars(/*0*/ a: jet.Any?): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/infos/PropertiesWithBackingFields.txt b/compiler/testData/lazyResolve/diagnostics/infos/PropertiesWithBackingFields.txt
deleted file mode 100644
index d1c732f4f13..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/infos/PropertiesWithBackingFields.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-namespace <root>
-
-internal open class Super : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ i: jet.Int): Super
-}
-internal abstract class Test : jet.Any {
-    public final /*constructor*/ fun <init>(): Test
-    internal final val a: jet.Int
-    internal final val b: jet.Int
-    internal final val c1: jet.Int
-    internal final val c2: jet.Int
-    internal final val c3: jet.Int
-    internal final val c4: jet.Int
-    internal final val c5: jet.Int
-    internal final val c: jet.Int
-    internal final var v10: jet.Int
-    internal abstract val v11: jet.Int
-    internal abstract var v12: jet.Int
-    internal final var v1: jet.Int
-    internal final var v2: jet.Int
-    internal final var v3: jet.Int
-    internal final var v4: jet.Int
-    internal final var v5: jet.Int
-    internal final var v6: jet.Int
-    internal abstract val v7: jet.Int
-    internal abstract var v8: jet.Int
-    internal final var v9: jet.Int
-    internal final var v: jet.Int
-    internal abstract val x1: jet.Int
-    internal abstract val x2: jet.Int
-    internal abstract val x: jet.Int
-    internal abstract var y1: jet.Int
-    internal abstract var y2: jet.Int
-    internal abstract var y3: jet.Int
-    internal abstract var y4: jet.Int
-    internal abstract var y5: jet.Int
-    internal abstract var y6: jet.Int
-    internal abstract var y: jet.Int
-}
-internal final class TestPCParameters : Super {
-    public final /*constructor*/ fun <init>(/*0*/ w: jet.Int, /*1*/ x: jet.Int, /*2*/ y: jet.Int, /*3*/ z: jet.Int): TestPCParameters
-    internal final fun foo(): [ERROR : Error function type]
-    internal final val xx: jet.Int
-    internal final val y: jet.Int
-    internal final var z: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/j+k/OverrideVararg.txt b/compiler/testData/lazyResolve/diagnostics/j+k/OverrideVararg.txt
deleted file mode 100644
index 312b83028b0..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/j+k/OverrideVararg.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace <root>
-
-public abstract class Aaa : java.lang.Object {
-    public final /*constructor*/ fun <init>(): Aaa
-    protected open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    public abstract fun foo(/*0*/ vararg args: jet.String? /*jet.Array<jet.String?>*/): jet.Tuple0
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    public open override /*1*/ fun toString(): jet.String?
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
-internal final class Bbb : Aaa {
-    public final /*constructor*/ fun <init>(): Bbb
-    protected open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    public open override /*1*/ fun foo(/*0*/ vararg args: jet.String? /*jet.Array<jet.String?>*/): jet.Tuple0
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    public open override /*1*/ fun toString(): jet.String?
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/j+k/Simple.txt b/compiler/testData/lazyResolve/diagnostics/j+k/Simple.txt
deleted file mode 100644
index 758c1a2fb3d..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/j+k/Simple.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun foo(/*0*/ a: aa.A): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/j+k/StaticMembersFromSuperclasses.txt b/compiler/testData/lazyResolve/diagnostics/j+k/StaticMembersFromSuperclasses.txt
deleted file mode 100644
index 9631d7df31a..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/j+k/StaticMembersFromSuperclasses.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-namespace <root>
-
-public open class Aaa : java.lang.Object {
-    public final /*constructor*/ fun <init>(): Aaa
-    protected open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    public open override /*1*/ fun toString(): jet.String?
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
-public open class Bbb : Aaa {
-    public final /*constructor*/ fun <init>(): Bbb
-    protected open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    public open override /*1*/ fun toString(): jet.String?
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
-internal final fun foo(): jet.String
diff --git a/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.txt b/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.txt
deleted file mode 100644
index f439ed7f3dc..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-namespace <root>
-
-public open class A : java.lang.Object {
-    public final /*constructor*/ fun <init>(): A
-    protected open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    public open override /*1*/ fun toString(): jet.String?
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
-public open class X</*0*/ T : jet.Any?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): X<T>
-    package open fun barN(/*0*/ a: T): jet.Tuple0
-    protected open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    package open fun fooN(): T
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    public open override /*1*/ fun toString(): jet.String?
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
-public open class Y : X<jet.String> {
-    public final /*constructor*/ fun <init>(): Y
-    package open override /*1*/ fun barN(/*0*/ a: jet.String): jet.Tuple0
-    protected open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    package open override /*1*/ fun fooN(): jet.String
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    public open override /*1*/ fun toString(): jet.String?
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
-internal final fun main(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.txt b/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.txt
deleted file mode 100644
index 2c3b85726ca..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-namespace <root>
-
-public open class A : java.lang.Object {
-    public final /*constructor*/ fun <init>(): A
-    protected open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    public open override /*1*/ fun toString(): jet.String?
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
-public open class X</*0*/ T : jet.Any?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): X<T>
-    package open fun barN(/*0*/ a: T): jet.Tuple0
-    protected open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    package open fun fooN(): T
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    public open override /*1*/ fun toString(): jet.String?
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
-public open class Y : X<A> {
-    public final /*constructor*/ fun <init>(): Y
-    package open override /*1*/ fun barN(/*0*/ a: A): jet.Tuple0
-    protected open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    package open override /*1*/ fun fooN(): A
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    public open override /*1*/ fun toString(): jet.String?
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
-internal final fun main(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-SpecialTypes.txt b/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-SpecialTypes.txt
deleted file mode 100644
index 686fb31841a..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-SpecialTypes.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-namespace <root>
-
-public open class A : java.lang.Object {
-    public final /*constructor*/ fun <init>(): A
-    protected open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    public open override /*1*/ fun toString(): jet.String?
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
-public open class X</*0*/ T : jet.Any?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): X<T>
-    package open fun bar(/*0*/ a: T?): jet.Tuple0
-    protected open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    package open fun foo(): T?
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    public open override /*1*/ fun toString(): jet.String?
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
-public open class Y : X<jet.String> {
-    public final /*constructor*/ fun <init>(): Y
-    package open override /*1*/ fun bar(/*0*/ a: jet.String?): jet.Tuple0
-    protected open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    package open override /*1*/ fun foo(): jet.String?
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    public open override /*1*/ fun toString(): jet.String?
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
-internal final fun main(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-UserTypes.txt b/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-UserTypes.txt
deleted file mode 100644
index 32ebabf1d90..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-UserTypes.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-namespace <root>
-
-public open class A : java.lang.Object {
-    public final /*constructor*/ fun <init>(): A
-    protected open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    public open override /*1*/ fun toString(): jet.String?
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
-public open class X</*0*/ T : jet.Any?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): X<T>
-    package open fun bar(/*0*/ a: T?): jet.Tuple0
-    protected open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    package open fun foo(): T?
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    public open override /*1*/ fun toString(): jet.String?
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
-public open class Y : X<A> {
-    public final /*constructor*/ fun <init>(): Y
-    package open override /*1*/ fun bar(/*0*/ a: A?): jet.Tuple0
-    protected open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    package open override /*1*/ fun foo(): A?
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    public open override /*1*/ fun toString(): jet.String?
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
-internal final fun main(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/j+k/UnboxingNulls.txt b/compiler/testData/lazyResolve/diagnostics/j+k/UnboxingNulls.txt
deleted file mode 100644
index 9669497788a..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/j+k/UnboxingNulls.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-public open class a.Test</*0*/ T : jet.Any?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): a.Test<T>
-    protected open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    package open fun t(): T?
-    public open override /*1*/ fun toString(): jet.String?
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
-internal final fun foo(): jet.Tuple0
-// </namespace name="a">
diff --git a/compiler/testData/lazyResolve/diagnostics/j+k/kt1402.txt b/compiler/testData/lazyResolve/diagnostics/j+k/kt1402.txt
deleted file mode 100644
index 615312d56ef..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/j+k/kt1402.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="b">
-namespace b
-
-internal final fun doSmth(/*0*/ b: a.M.Inner): a.M.Inner
-internal final fun foo(): jet.Tuple0
-// </namespace name="b">
diff --git a/compiler/testData/lazyResolve/diagnostics/j+k/packageVisibility.txt b/compiler/testData/lazyResolve/diagnostics/j+k/packageVisibility.txt
deleted file mode 100644
index 6d3f989d476..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/j+k/packageVisibility.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-// <namespace name="c">
-namespace c
-
-internal final val mc1: a.MyJavaClass
-// </namespace name="c">
-internal final val mc: a.MyJavaClass
-// </namespace name="a">
-// <namespace name="b">
-namespace b
-
-internal final val mc1: a.MyJavaClass
-// </namespace name="b">
diff --git a/compiler/testData/lazyResolve/diagnostics/jdk-annotations/ArrayListAndMap.txt b/compiler/testData/lazyResolve/diagnostics/jdk-annotations/ArrayListAndMap.txt
deleted file mode 100644
index 0aad809dfb8..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/jdk-annotations/ArrayListAndMap.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="kotlin1">
-namespace kotlin1
-
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-internal final fun test(/*0*/ a: java.util.List<jet.Int>, /*1*/ m: java.util.Map<jet.String, jet.Int>): jet.Tuple0
-// </namespace name="kotlin1">
diff --git a/compiler/testData/lazyResolve/diagnostics/jdk-annotations/ArrayListClone.txt b/compiler/testData/lazyResolve/diagnostics/jdk-annotations/ArrayListClone.txt
deleted file mode 100644
index 1bc597a31a8..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/jdk-annotations/ArrayListClone.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="kotlin1">
-namespace kotlin1
-
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-// </namespace name="kotlin1">
diff --git a/compiler/testData/lazyResolve/diagnostics/jdk-annotations/ArrayListToArray.txt b/compiler/testData/lazyResolve/diagnostics/jdk-annotations/ArrayListToArray.txt
deleted file mode 100644
index 1bc597a31a8..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/jdk-annotations/ArrayListToArray.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="kotlin1">
-namespace kotlin1
-
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-// </namespace name="kotlin1">
diff --git a/compiler/testData/lazyResolve/diagnostics/kt310.txt b/compiler/testData/lazyResolve/diagnostics/kt310.txt
deleted file mode 100644
index 14f0e7383b7..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/kt310.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun f(/*0*/ c: jet.Array<jet.Int>): jet.Int
diff --git a/compiler/testData/lazyResolve/diagnostics/kt53.txt b/compiler/testData/lazyResolve/diagnostics/kt53.txt
deleted file mode 100644
index 3e08087a9cc..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/kt53.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final val  </*0*/ T : jet.Any?, /*1*/ E : jet.Any?> T.foo: E?
-internal final fun test(): jet.Int?
diff --git a/compiler/testData/lazyResolve/diagnostics/library/kt828.txt b/compiler/testData/lazyResolve/diagnostics/library/kt828.txt
deleted file mode 100644
index 8a9f72ae986..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/library/kt828.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/AssertNotNull.txt b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/AssertNotNull.txt
deleted file mode 100644
index dc622bf14c5..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/AssertNotNull.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/InfixCallNullability.txt b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/InfixCallNullability.txt
deleted file mode 100644
index 8e877cf97c3..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/InfixCallNullability.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace <root>
-
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal final fun contains(/*0*/ a: jet.Any?): jet.Boolean
-    internal final fun minus(): jet.Tuple0
-    internal final fun plus(/*0*/ i: jet.Int): jet.Tuple0
-}
-internal final fun A.div(/*0*/ i: jet.Int): jet.Tuple0
-internal final fun test(/*0*/ x: jet.Int?, /*1*/ a: A?): jet.Tuple0
-internal final fun A?.times(/*0*/ i: jet.Int): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/NullableNothingIsExactlyNull.txt b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/NullableNothingIsExactlyNull.txt
deleted file mode 100644
index 8a9f72ae986..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/NullableNothingIsExactlyNull.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/PreferExtensionsOnNullableReceiver.txt b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/PreferExtensionsOnNullableReceiver.txt
deleted file mode 100644
index fbae1cecec9..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/PreferExtensionsOnNullableReceiver.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-internal final class Foo : jet.Any {
-    public final /*constructor*/ fun <init>(): Foo
-    internal final fun foo(): jet.Tuple0
-}
-internal final fun jet.Any?.foo(): jet.Tuple0
-internal final fun test(/*0*/ f: Foo?): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/QualifiedExpressionNullability.txt b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/QualifiedExpressionNullability.txt
deleted file mode 100644
index 6eb0e520c46..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/QualifiedExpressionNullability.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final class Foo : jet.Any {
-    public final /*constructor*/ fun <init>(): Foo
-    internal final fun foo(/*0*/ a: Foo): Foo
-}
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/ReceiverNullability.txt b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/ReceiverNullability.txt
deleted file mode 100644
index 1e7b0cb1676..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/ReceiverNullability.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace <root>
-
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal final fun foo(): jet.Tuple0
-}
-internal final fun A.bar(): jet.Tuple0
-internal final fun A?.buzz(): jet.Tuple0
-internal final fun test(/*0*/ a: A?): jet.Tuple0
-internal final fun A.test2(): jet.Tuple0
-internal final fun A?.test3(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/SenselessNullInWhen.txt b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/SenselessNullInWhen.txt
deleted file mode 100644
index 7247d94fdd7..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/SenselessNullInWhen.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="kt2457">
-namespace kt2457
-
-internal final fun foo(/*0*/ i: jet.Int): jet.Int
-// </namespace name="kt2457">
diff --git a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/funcLiteralArgsInsideUnresolvedFunction.txt b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/funcLiteralArgsInsideUnresolvedFunction.txt
deleted file mode 100644
index f09c4dce1a2..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/funcLiteralArgsInsideUnresolvedFunction.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-internal final fun foo(): jet.Tuple0
-// </namespace name="a">
diff --git a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt1270.txt b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt1270.txt
deleted file mode 100644
index 0987b0c6178..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt1270.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1270">
-namespace kt1270
-
-private final class kt1270.SomeClass : jet.Any {
-    public final /*constructor*/ fun <init>(): kt1270.SomeClass
-    internal final val value: jet.Int
-}
-internal final fun foo(): jet.Tuple0
-// </namespace name="kt1270">
diff --git a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt1680.txt b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt1680.txt
deleted file mode 100644
index c02b697d9c7..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt1680.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1680">
-namespace kt1680
-
-internal final fun foo(): jet.Tuple0
-// </namespace name="kt1680">
diff --git a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt1778.txt b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt1778.txt
deleted file mode 100644
index 0051c85e829..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt1778.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1778">
-namespace kt1778
-
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-// </namespace name="kt1778">
diff --git a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2109.txt b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2109.txt
deleted file mode 100644
index fbd0b523434..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2109.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-// <namespace name="kt2109">
-namespace kt2109
-
-internal final class kt2109.A : jet.Any {
-    public final /*constructor*/ fun <init>(): kt2109.A
-    internal final fun foo(): jet.Tuple0
-}
-internal final fun kt2109.A?.bar(): jet.Tuple0
-internal final fun kt2109.A.baz(): jet.Tuple0
-// </namespace name="kt2109">
diff --git a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2125.txt b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2125.txt
deleted file mode 100644
index 517ad563608..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2125.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="e">
-namespace e
-
-internal final fun main(): jet.Tuple0
-// </namespace name="e">
diff --git a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2146.txt b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2146.txt
deleted file mode 100644
index c23acec5508..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2146.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-// <namespace name="kt2146">
-namespace kt2146
-
-internal final fun f1(/*0*/ s: jet.Int?): jet.Int
-internal final fun f2(/*0*/ s: jet.Int?): jet.Int
-internal final fun f3(/*0*/ s: jet.Int?): jet.Int
-internal final fun f4(/*0*/ s: jet.Int?): jet.Int
-internal final fun f5(/*0*/ s: jet.Int?): jet.Int
-internal final fun f6(/*0*/ s: jet.Int?): jet.Int
-internal final fun f7(/*0*/ s: jet.Int?): jet.Int
-// </namespace name="kt2146">
diff --git a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2164.txt b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2164.txt
deleted file mode 100644
index 781130097a8..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2164.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="kt2164">
-namespace kt2164
-
-internal final fun foo(/*0*/ x: jet.Int): jet.Int
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-// </namespace name="kt2164">
diff --git a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2176.txt b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2176.txt
deleted file mode 100644
index 7ec2e1d1bd4..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2176.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace <root>
-
-// <namespace name="kt2176">
-namespace kt2176
-
-internal final fun f1(/*0*/ a: jet.String?): jet.Tuple0
-internal final fun f2(/*0*/ a: jet.String): jet.Tuple0
-internal final fun f3(/*0*/ a: jet.Any?): jet.Tuple0
-internal final fun f4(/*0*/ a: jet.Any): jet.Tuple0
-internal final fun f5(/*0*/ a: jet.String): jet.Tuple0
-// </namespace name="kt2176">
diff --git a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2195.txt b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2195.txt
deleted file mode 100644
index ff237fac1cf..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2195.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="foo">
-namespace foo
-
-private final fun </*0*/ T : jet.Any?>sendCommand(/*0*/ errorCallback: jet.Function0<jet.Tuple0>? = ?): jet.Tuple0
-// </namespace name="foo">
diff --git a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2212.txt b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2212.txt
deleted file mode 100644
index 5f80ce6a9e5..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2212.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="kt2212">
-namespace kt2212
-
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-// </namespace name="kt2212">
diff --git a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2216.txt b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2216.txt
deleted file mode 100644
index cd5bbc37a1c..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2216.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-// <namespace name="kt2216">
-namespace kt2216
-
-internal final fun bar(/*0*/ y: jet.Int, /*1*/ z: jet.Int): jet.Int
-internal final fun baz(/*0*/ a: jet.Int, /*1*/ b: jet.Int, /*2*/ c: jet.Int, /*3*/ d: jet.Int): jet.Int
-internal final fun foo(): jet.Tuple0
-// </namespace name="kt2216">
diff --git a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2223.txt b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2223.txt
deleted file mode 100644
index 4064d3443d8..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2223.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="kt2223">
-namespace kt2223
-
-internal final fun foo(): jet.Tuple0
-// </namespace name="kt2223">
diff --git a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2234.txt b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2234.txt
deleted file mode 100644
index bd37813b099..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt2234.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-internal final fun foo(): jet.Tuple0
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-// </namespace name="a">
diff --git a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt244.txt b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt244.txt
deleted file mode 100644
index 5934e1aa9b4..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt244.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-// <namespace name="kt244">
-namespace kt244
-
-internal final class kt244.A : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ a: jet.String?): kt244.A
-    internal final val b: jet.Int
-    internal final val i: jet.Int
-}
-internal final fun f(/*0*/ s: jet.String?): jet.Tuple0
-// </namespace name="kt244">
diff --git a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt362.txt b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt362.txt
deleted file mode 100644
index 645f10b299c..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt362.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace <root>
-
-// <namespace name="example">
-namespace example
-
-internal final fun test(): jet.Tuple0
-// </namespace name="example">
-// <namespace name="test">
-namespace test
-
-internal final class test.Internal : jet.Any {
-    public final /*constructor*/ fun <init>(): test.Internal
-    internal final val internal: jet.Int?
-    protected final val protected: jet.Int?
-    public final val public: jet.Int?
-}
-public final class test.Public : jet.Any {
-    public final /*constructor*/ fun <init>(): test.Public
-    internal final val internal: jet.Int?
-    protected final val protected: jet.Int?
-    public final val public: jet.Int?
-}
-// </namespace name="test">
diff --git a/compiler/testData/lazyResolve/diagnostics/objects/Objects.txt b/compiler/testData/lazyResolve/diagnostics/objects/Objects.txt
deleted file mode 100644
index 4439d3ed6cd..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/objects/Objects.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace <root>
-
-// <namespace name="toplevelObjectDeclarations">
-namespace toplevelObjectDeclarations
-
-internal open class toplevelObjectDeclarations.Foo : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ y: jet.Int): toplevelObjectDeclarations.Foo
-    internal open fun foo(): jet.Int
-}
-internal final class toplevelObjectDeclarations.T : toplevelObjectDeclarations.Foo {
-    public final /*constructor*/ fun <init>(): toplevelObjectDeclarations.T
-    internal open override /*1*/ fun foo(): jet.Int
-}
-internal final val A: toplevelObjectDeclarations.A
-internal final val B: toplevelObjectDeclarations.B
-internal final val x: jet.Int
-internal final val y: toplevelObjectDeclarations.<no name provided>
-internal final val z: jet.Int
-// </namespace name="toplevelObjectDeclarations">
diff --git a/compiler/testData/lazyResolve/diagnostics/objects/ObjectsInheritance.txt b/compiler/testData/lazyResolve/diagnostics/objects/ObjectsInheritance.txt
deleted file mode 100644
index 55f2510996f..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/objects/ObjectsInheritance.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="toplevelObjectDeclarations">
-namespace toplevelObjectDeclarations
-
-internal final val CObj: toplevelObjectDeclarations.CObj
-internal final val DOjb: toplevelObjectDeclarations.DOjb
-// </namespace name="toplevelObjectDeclarations">
diff --git a/compiler/testData/lazyResolve/diagnostics/objects/ObjectsLocal.txt b/compiler/testData/lazyResolve/diagnostics/objects/ObjectsLocal.txt
deleted file mode 100644
index a3d8c4efaf4..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/objects/ObjectsLocal.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-// <namespace name="localObjects">
-namespace localObjects
-
-internal open class localObjects.Foo : jet.Any {
-    public final /*constructor*/ fun <init>(): localObjects.Foo
-    internal final fun foo(): jet.Int
-}
-internal final val A: localObjects.A
-internal final val bb: [ERROR : <ERROR FUNCTION RETURN TYPE>]
-internal final fun test(): jet.Tuple0
-// </namespace name="localObjects">
diff --git a/compiler/testData/lazyResolve/diagnostics/objects/ObjectsNested.txt b/compiler/testData/lazyResolve/diagnostics/objects/ObjectsNested.txt
deleted file mode 100644
index 8bbf7d09cd8..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/objects/ObjectsNested.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-// <namespace name="nestedObejcts">
-namespace nestedObejcts
-
-internal final val A: nestedObejcts.A
-internal final val B: nestedObejcts.B
-internal final val a: nestedObejcts.A
-internal final val b: nestedObejcts.B
-internal final val c: nestedObejcts.A.B
-internal final val d: nestedObejcts.A.B.A
-internal final val e: [ERROR : <ERROR PROPERTY TYPE>]
-// </namespace name="nestedObejcts">
diff --git a/compiler/testData/lazyResolve/diagnostics/objects/kt2240.txt b/compiler/testData/lazyResolve/diagnostics/objects/kt2240.txt
deleted file mode 100644
index 880ac59f2ce..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/objects/kt2240.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-internal final class a.A : jet.Any {
-    public final /*constructor*/ fun <init>(): a.A
-}
-internal final val o: a.<no name provided>
-internal final fun </*0*/ T : jet.Any?>a.A.foo(/*0*/ f: T): jet.Tuple0
-// </namespace name="a">
diff --git a/compiler/testData/lazyResolve/diagnostics/operatorsOverloading/AssignOperatorAmbiguity.txt b/compiler/testData/lazyResolve/diagnostics/operatorsOverloading/AssignOperatorAmbiguity.txt
deleted file mode 100644
index 7ad0e047ef8..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/operatorsOverloading/AssignOperatorAmbiguity.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1820">
-namespace kt1820
-
-internal final class kt1820.MyInt : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ i: jet.Int): kt1820.MyInt
-    internal final val i: jet.Int
-    internal final fun plus(/*0*/ m: kt1820.MyInt): kt1820.MyInt
-}
-internal final fun jet.Any.plusAssign(/*0*/ a: jet.Any): jet.Tuple0
-internal final fun test(/*0*/ m: kt1820.MyInt): jet.Tuple0
-// </namespace name="kt1820">
diff --git a/compiler/testData/lazyResolve/diagnostics/operatorsOverloading/IteratorAmbiguity.txt b/compiler/testData/lazyResolve/diagnostics/operatorsOverloading/IteratorAmbiguity.txt
deleted file mode 100644
index c6615a95f13..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/operatorsOverloading/IteratorAmbiguity.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace <root>
-
-internal abstract trait MyAnotherCollectionInterface : jet.Any {
-}
-internal final class MyCollection : MyCollectionInterface, MyAnotherCollectionInterface {
-    public final /*constructor*/ fun <init>(): MyCollection
-}
-internal abstract trait MyCollectionInterface : jet.Any {
-}
-internal final class MyElement : jet.Any {
-    public final /*constructor*/ fun <init>(): MyElement
-}
-internal final class MyIterator : jet.Any {
-    public final /*constructor*/ fun <init>(): MyIterator
-    internal final fun hasNext(): jet.Boolean
-    internal final fun next(): MyElement
-}
-internal final fun MyAnotherCollectionInterface.iterator(): MyIterator
-internal final fun MyCollectionInterface.iterator(): MyIterator
-internal final fun test1(/*0*/ collection: MyCollection): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/operatorsOverloading/kt1028.txt b/compiler/testData/lazyResolve/diagnostics/operatorsOverloading/kt1028.txt
deleted file mode 100644
index c0d78048d77..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/operatorsOverloading/kt1028.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1028">
-namespace kt1028
-
-internal final class kt1028.Control : jet.Any {
-    public final /*constructor*/ fun <init>(): kt1028.Control
-    public final val MouseMoved: kt1028.event<kt1028.MouseMovedEventArgs>
-    internal final fun MoveMouse(): jet.Tuple0
-}
-internal final class kt1028.MouseMovedEventArgs : jet.Any {
-    public final /*constructor*/ fun <init>(): kt1028.MouseMovedEventArgs
-    public final val X: jet.Int
-}
-internal final class kt1028.Test : jet.Any {
-    public final /*constructor*/ fun <init>(): kt1028.Test
-    internal final fun test(): jet.Tuple0
-}
-internal final class kt1028.event</*0*/ T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): kt1028.event<T>
-    internal final fun call(/*0*/ value: T): jet.Tuple0
-    internal final val callbacks: java.util.ArrayList<jet.Function1<T, jet.Tuple0>>
-    internal final fun minusAssign(/*0*/ f: jet.Function1<T, jet.Tuple0>): jet.Boolean
-    internal final fun plusAssign(/*0*/ f: jet.Function1<T, jet.Tuple0>): jet.Boolean
-}
-// </namespace name="kt1028">
diff --git a/compiler/testData/lazyResolve/diagnostics/overload/AmbiguityBetweenRootAndPackage.txt b/compiler/testData/lazyResolve/diagnostics/overload/AmbiguityBetweenRootAndPackage.txt
deleted file mode 100644
index 95a3b32216c..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/overload/AmbiguityBetweenRootAndPackage.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-// <namespace name="test">
-namespace test
-
-internal final val t: [ERROR : Type for testFun()]
-internal final fun testFun(): jet.Int
-// </namespace name="test">
-internal final fun testFun(): jet.Int
diff --git a/compiler/testData/lazyResolve/diagnostics/overload/ConflictingOverloadsFunsDifferentReturnInClass.txt b/compiler/testData/lazyResolve/diagnostics/overload/ConflictingOverloadsFunsDifferentReturnInClass.txt
deleted file mode 100644
index 7023b439ed1..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/overload/ConflictingOverloadsFunsDifferentReturnInClass.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal final fun a(/*0*/ a: jet.Int): jet.Int
-    internal final fun a(/*0*/ a: jet.Int): jet.Tuple0
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/overload/ConflictingOverloadsFunsDifferentReturnInPackage.txt b/compiler/testData/lazyResolve/diagnostics/overload/ConflictingOverloadsFunsDifferentReturnInPackage.txt
deleted file mode 100644
index b0f26b10ac7..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/overload/ConflictingOverloadsFunsDifferentReturnInPackage.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="qwertyuiop">
-namespace qwertyuiop
-
-internal final fun c(/*0*/ s: jet.String): jet.Tuple0
-internal final fun c(/*0*/ s: jet.String): jet.Tuple0
-// </namespace name="qwertyuiop">
diff --git a/compiler/testData/lazyResolve/diagnostics/overload/ConflictingOverloadsIdenticalExtFunsInPackage.txt b/compiler/testData/lazyResolve/diagnostics/overload/ConflictingOverloadsIdenticalExtFunsInPackage.txt
deleted file mode 100644
index 2bee10793dd..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/overload/ConflictingOverloadsIdenticalExtFunsInPackage.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="extensionFunctions">
-namespace extensionFunctions
-
-internal final fun jet.Int.qwe(/*0*/ a: jet.Float): jet.Int
-internal final fun jet.Int.qwe(/*0*/ a: jet.Float): jet.Int
-// </namespace name="extensionFunctions">
diff --git a/compiler/testData/lazyResolve/diagnostics/overload/ConflictingOverloadsIdenticalFunsInClass.txt b/compiler/testData/lazyResolve/diagnostics/overload/ConflictingOverloadsIdenticalFunsInClass.txt
deleted file mode 100644
index fe0cebc9750..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/overload/ConflictingOverloadsIdenticalFunsInClass.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal final fun b(): jet.Tuple0
-    internal final fun b(): jet.Tuple0
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/overload/ConflictingOverloadsIdenticalFunsTPInClass.txt b/compiler/testData/lazyResolve/diagnostics/overload/ConflictingOverloadsIdenticalFunsTPInClass.txt
deleted file mode 100644
index 8e73952ae45..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/overload/ConflictingOverloadsIdenticalFunsTPInClass.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final class Aaa : jet.Any {
-    public final /*constructor*/ fun <init>(): Aaa
-    internal final fun f(): jet.Int
-    internal final fun </*0*/ P : jet.Any?>f(): jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/overload/ConflictingOverloadsIdenticalValsInClass.txt b/compiler/testData/lazyResolve/diagnostics/overload/ConflictingOverloadsIdenticalValsInClass.txt
deleted file mode 100644
index 35e6be0f99a..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/overload/ConflictingOverloadsIdenticalValsInClass.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final class Aaa : jet.Any {
-    public final /*constructor*/ fun <init>(): Aaa
-    internal final val a: jet.Int
-    internal final val a: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/overload/ConflictingOverloadsValsDifferentTypeInClass.txt b/compiler/testData/lazyResolve/diagnostics/overload/ConflictingOverloadsValsDifferentTypeInClass.txt
deleted file mode 100644
index e516646a23f..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/overload/ConflictingOverloadsValsDifferentTypeInClass.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final class Aaa : jet.Any {
-    public final /*constructor*/ fun <init>(): Aaa
-    internal final val a: jet.Int
-    internal final val a: jet.String
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/overload/ConstructorVsFunOverload.txt b/compiler/testData/lazyResolve/diagnostics/overload/ConstructorVsFunOverload.txt
deleted file mode 100644
index 41d2a464102..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/overload/ConstructorVsFunOverload.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-namespace <root>
-
-// <namespace name="constructorVsFun">
-namespace constructorVsFun
-
-internal final class constructorVsFun.Rtyu : jet.Any {
-    public final /*constructor*/ fun <init>(): constructorVsFun.Rtyu
-    internal final fun ololo(): jet.Tuple0
-    internal final class object constructorVsFun.Rtyu.<no name provided> : jet.Any {
-        internal final /*constructor*/ fun <init>(): constructorVsFun.Rtyu.<no name provided>
-        internal final class constructorVsFun.Rtyu.<no name provided>.ololo : jet.Any {
-            public final /*constructor*/ fun <init>(): constructorVsFun.Rtyu.<no name provided>.ololo
-        }
-    }
-}
-internal final class constructorVsFun.Tram : jet.Any {
-    public final /*constructor*/ fun <init>(): constructorVsFun.Tram
-    internal final class constructorVsFun.Tram.f : jet.Any {
-        public final /*constructor*/ fun <init>(): constructorVsFun.Tram.f
-    }
-    internal final fun f(): jet.Tuple0
-}
-internal final class constructorVsFun.Yvayva : jet.Any {
-    public final /*constructor*/ fun <init>(): constructorVsFun.Yvayva
-    internal final class object constructorVsFun.Yvayva.<no name provided> : jet.Any {
-        internal final /*constructor*/ fun <init>(): constructorVsFun.Yvayva.<no name provided>
-        internal final class constructorVsFun.Yvayva.<no name provided>.fghj : jet.Any {
-            public final /*constructor*/ fun <init>(): constructorVsFun.Yvayva.<no name provided>.fghj
-        }
-        internal final fun fghj(): jet.Tuple0
-    }
-}
-internal final class constructorVsFun.a : jet.Any {
-    public final /*constructor*/ fun <init>(): constructorVsFun.a
-}
-internal final fun a(): jet.Int
-// </namespace name="constructorVsFun">
diff --git a/compiler/testData/lazyResolve/diagnostics/overload/ExtFunDifferentReceiver.txt b/compiler/testData/lazyResolve/diagnostics/overload/ExtFunDifferentReceiver.txt
deleted file mode 100644
index 118f0018e4a..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/overload/ExtFunDifferentReceiver.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun jet.Int.rty(): jet.Int
-internal final fun jet.String.rty(): jet.Int
diff --git a/compiler/testData/lazyResolve/diagnostics/overload/FunNoConflictInDifferentPackages.txt b/compiler/testData/lazyResolve/diagnostics/overload/FunNoConflictInDifferentPackages.txt
deleted file mode 100644
index 98c8f1da7cb..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/overload/FunNoConflictInDifferentPackages.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace <root>
-
-// <namespace name="ns1">
-namespace ns1
-
-internal final fun e(): jet.Int
-// </namespace name="ns1">
-// <namespace name="ns2">
-namespace ns2
-
-internal final fun e(): jet.Int
-// </namespace name="ns2">
-// <namespace name="ns3">
-namespace ns3
-
-// <namespace name="ns1">
-namespace ns1
-
-internal final fun e(): jet.Int
-// </namespace name="ns1">
-// </namespace name="ns3">
diff --git a/compiler/testData/lazyResolve/diagnostics/overload/OverloadFunRegularAndExt.txt b/compiler/testData/lazyResolve/diagnostics/overload/OverloadFunRegularAndExt.txt
deleted file mode 100644
index 3749e9defb8..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/overload/OverloadFunRegularAndExt.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="extensionAndRegular">
-namespace extensionAndRegular
-
-internal final fun jet.Int.who(): jet.Int
-internal final fun who(): jet.Int
-// </namespace name="extensionAndRegular">
diff --git a/compiler/testData/lazyResolve/diagnostics/overload/OverloadVarAndFunInClass.txt b/compiler/testData/lazyResolve/diagnostics/overload/OverloadVarAndFunInClass.txt
deleted file mode 100644
index fe115c46865..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/overload/OverloadVarAndFunInClass.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final class Aaaa : jet.Any {
-    public final /*constructor*/ fun <init>(): Aaaa
-    internal final fun bb(): jet.Int
-    internal final val bb: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/override/AbstractFunImplemented.txt b/compiler/testData/lazyResolve/diagnostics/override/AbstractFunImplemented.txt
deleted file mode 100644
index 67bfc5cdc2c..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/AbstractFunImplemented.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-internal abstract class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal abstract fun foo(): jet.Int
-}
-internal final class B : A {
-    public final /*constructor*/ fun <init>(): B
-    internal open override /*1*/ fun foo(): jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/override/AbstractFunNotImplemented.txt b/compiler/testData/lazyResolve/diagnostics/override/AbstractFunNotImplemented.txt
deleted file mode 100644
index f0a8e4aed57..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/AbstractFunNotImplemented.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-internal abstract class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal abstract fun foo(): jet.Int
-}
-internal final class B : A {
-    public final /*constructor*/ fun <init>(): B
-    internal abstract override /*1*/ fun foo(): jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/override/AbstractValImplemented.txt b/compiler/testData/lazyResolve/diagnostics/override/AbstractValImplemented.txt
deleted file mode 100644
index 1b5c2d0c8f0..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/AbstractValImplemented.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-internal abstract class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal abstract val i: jet.Int
-}
-internal final class B : A {
-    public final /*constructor*/ fun <init>(): B
-    internal open override /*1*/ val i: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/override/AbstractValNotImplemented.txt b/compiler/testData/lazyResolve/diagnostics/override/AbstractValNotImplemented.txt
deleted file mode 100644
index 19f4c8a8db3..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/AbstractValNotImplemented.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-internal abstract class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal abstract val i: jet.Int
-}
-internal final class B : A {
-    public final /*constructor*/ fun <init>(): B
-    internal abstract override /*1*/ val i: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/override/AbstractVarImplemented.txt b/compiler/testData/lazyResolve/diagnostics/override/AbstractVarImplemented.txt
deleted file mode 100644
index a880e410bb5..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/AbstractVarImplemented.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-internal abstract class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal abstract var i: jet.Int
-}
-internal final class B : A {
-    public final /*constructor*/ fun <init>(): B
-    internal open override /*1*/ var i: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/override/AbstractVarNotImplemented.txt b/compiler/testData/lazyResolve/diagnostics/override/AbstractVarNotImplemented.txt
deleted file mode 100644
index aabba56d2f9..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/AbstractVarNotImplemented.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-internal abstract class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal abstract var i: jet.Int
-}
-internal final class B : A {
-    public final /*constructor*/ fun <init>(): B
-    internal abstract override /*1*/ var i: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/override/AllPrivateFromSuperTypes.txt b/compiler/testData/lazyResolve/diagnostics/override/AllPrivateFromSuperTypes.txt
deleted file mode 100644
index 3f9a2e7febf..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/AllPrivateFromSuperTypes.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace <root>
-
-// <namespace name="test">
-namespace test
-
-internal abstract trait test.A : jet.Any {
-    private open val a: jet.String
-}
-internal open class test.C : jet.Any {
-    public final /*constructor*/ fun <init>(): test.C
-    private final val a: jet.String
-}
-internal final class test.Subject : test.C, test.A {
-    public final /*constructor*/ fun <init>(): test.Subject
-    invisible_fake abstract override /*2*/ val a: jet.String private get
-    internal final val c: jet.String
-}
-// </namespace name="test">
diff --git a/compiler/testData/lazyResolve/diagnostics/override/AllProtectedFromSupertypes.txt b/compiler/testData/lazyResolve/diagnostics/override/AllProtectedFromSupertypes.txt
deleted file mode 100644
index f3aba8f3ae1..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/AllProtectedFromSupertypes.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace <root>
-
-// <namespace name="test">
-namespace test
-
-internal abstract trait test.A : jet.Any {
-    protected abstract val a: jet.String
-}
-internal open class test.C : jet.Any {
-    public final /*constructor*/ fun <init>(): test.C
-    protected final val a: jet.String
-}
-internal final class test.Subject : test.C, test.A {
-    public final /*constructor*/ fun <init>(): test.Subject
-    protected final override /*2*/ val a: jet.String
-    internal final val c: jet.String
-}
-// </namespace name="test">
diff --git a/compiler/testData/lazyResolve/diagnostics/override/ComplexValRedeclaration.txt b/compiler/testData/lazyResolve/diagnostics/override/ComplexValRedeclaration.txt
deleted file mode 100644
index 9d85d81f1f1..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/ComplexValRedeclaration.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace <root>
-
-// <namespace name="override">
-namespace override
-
-// <namespace name="generics">
-namespace generics
-
-internal abstract class override.generics.MyAbstractClass</*0*/ T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): override.generics.MyAbstractClass<T>
-    internal abstract val pr: T
-}
-internal abstract class override.generics.MyLegalAbstractClass2</*0*/ T : jet.Any?> : override.generics.MyAbstractClass<jet.Int> {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(/*0*/ t: T): override.generics.MyLegalAbstractClass2<T>
-    internal final val  </*0*/ R : jet.Any?> pr: T
-}
-// </namespace name="generics">
-// </namespace name="override">
diff --git a/compiler/testData/lazyResolve/diagnostics/override/ConflictingFunctionSignatureFromSuperclass.txt b/compiler/testData/lazyResolve/diagnostics/override/ConflictingFunctionSignatureFromSuperclass.txt
deleted file mode 100644
index 4fa6fdc2a88..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/ConflictingFunctionSignatureFromSuperclass.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-internal open class Aaa : jet.Any {
-    public final /*constructor*/ fun <init>(): Aaa
-    internal final fun foo(): jet.Int
-}
-internal open class Bbb : Aaa {
-    public final /*constructor*/ fun <init>(): Bbb
-    internal final fun </*0*/ T : jet.Any?>foo(): jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/override/ConflictingParameterNames-MultipleSupertypes.txt b/compiler/testData/lazyResolve/diagnostics/override/ConflictingParameterNames-MultipleSupertypes.txt
deleted file mode 100644
index 1b56bc4f73b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/ConflictingParameterNames-MultipleSupertypes.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace <root>
-
-internal abstract trait C : jet.Any {
-    internal abstract fun foo(/*0*/ a: jet.Int): jet.Tuple0
-}
-internal abstract trait D : jet.Any {
-    internal abstract fun foo(/*0*/ b: jet.Int): jet.Tuple0
-}
-internal abstract trait E : C, D {
-    internal abstract override /*2*/ fun foo(/*0*/ a: jet.Int): jet.Tuple0
-}
-internal abstract trait F : C, D {
-    internal open override /*2*/ fun foo(/*0*/ a: jet.Int): jet.Tuple0
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/override/ConflictingParameterNames.txt b/compiler/testData/lazyResolve/diagnostics/override/ConflictingParameterNames.txt
deleted file mode 100644
index f9d5dc79fe9..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/ConflictingParameterNames.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace <root>
-
-internal abstract trait A : jet.Any {
-    internal abstract fun b(/*0*/ a: jet.Int): jet.Tuple0
-}
-internal abstract trait B : A {
-    internal abstract override /*1*/ fun b(/*0*/ a: jet.Int): jet.Tuple0
-}
-internal final class C1 : A {
-    public final /*constructor*/ fun <init>(): C1
-    internal open override /*1*/ fun b(/*0*/ b: jet.Int): jet.Tuple0
-}
-internal final class C2 : B {
-    public final /*constructor*/ fun <init>(): C2
-    internal open override /*1*/ fun b(/*0*/ b: jet.Int): jet.Tuple0
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/override/ConflictingPropertySignatureFromSuperclass.txt b/compiler/testData/lazyResolve/diagnostics/override/ConflictingPropertySignatureFromSuperclass.txt
deleted file mode 100644
index 3b8a5b04238..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/ConflictingPropertySignatureFromSuperclass.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-internal open class Aaa : jet.Any {
-    public final /*constructor*/ fun <init>(): Aaa
-    internal final val bar: jet.Int
-}
-internal open class Bbb : Aaa {
-    public final /*constructor*/ fun <init>(): Bbb
-    internal final val  </*0*/ T : jet.Any?> bar: jet.String
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/override/DefaultParameterValueInOverride.txt b/compiler/testData/lazyResolve/diagnostics/override/DefaultParameterValueInOverride.txt
deleted file mode 100644
index a86972510e2..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/DefaultParameterValueInOverride.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace <root>
-
-internal open class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal open fun foo(/*0*/ a: jet.Int): jet.Tuple0
-}
-internal final class C : A {
-    public final /*constructor*/ fun <init>(): C
-    internal open override /*1*/ fun foo(/*0*/ a: jet.Int = ?): jet.Tuple0
-}
-internal final class D : A {
-    public final /*constructor*/ fun <init>(): D
-    internal open override /*1*/ fun foo(/*0*/ a: jet.Int = ?): jet.Tuple0
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/override/DefaultParameterValues-NoErrorsWhenInheritingFromOneTypeTwice.txt b/compiler/testData/lazyResolve/diagnostics/override/DefaultParameterValues-NoErrorsWhenInheritingFromOneTypeTwice.txt
deleted file mode 100644
index 3c03f605198..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/DefaultParameterValues-NoErrorsWhenInheritingFromOneTypeTwice.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-internal abstract trait Y : jet.Any {
-    internal abstract fun foo(/*0*/ a: jet.Int = ?): jet.Tuple0
-}
-internal abstract trait YSub : Y {
-    internal abstract override /*1*/ fun foo(/*0*/ a: jet.Int = ?): jet.Tuple0
-}
-internal final class Z2 : Y, YSub {
-    public final /*constructor*/ fun <init>(): Z2
-    internal open override /*2*/ fun foo(/*0*/ a: jet.Int = ?): jet.Tuple0
-}
-internal final val Z2O: Z2O
diff --git a/compiler/testData/lazyResolve/diagnostics/override/DelegationFun.txt b/compiler/testData/lazyResolve/diagnostics/override/DelegationFun.txt
deleted file mode 100644
index 9e6de5eea89..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/DelegationFun.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-// <namespace name="delegation">
-namespace delegation
-
-internal abstract trait delegation.Aaa : jet.Any {
-    internal abstract fun foo(): jet.Tuple0
-}
-internal final class delegation.Bbb : delegation.Aaa {
-    public final /*constructor*/ fun <init>(/*0*/ aaa: delegation.Aaa): delegation.Bbb
-    internal open override /*1*/ fun foo(): jet.Tuple0
-}
-// </namespace name="delegation">
diff --git a/compiler/testData/lazyResolve/diagnostics/override/DelegationVal.txt b/compiler/testData/lazyResolve/diagnostics/override/DelegationVal.txt
deleted file mode 100644
index e90f4f80485..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/DelegationVal.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-// <namespace name="delegation">
-namespace delegation
-
-internal abstract trait delegation.Aaa : jet.Any {
-    internal abstract val i: jet.Int
-}
-internal final class delegation.Bbb : delegation.Aaa {
-    public final /*constructor*/ fun <init>(/*0*/ aaa: delegation.Aaa): delegation.Bbb
-    internal open override /*1*/ val i: jet.Int
-}
-// </namespace name="delegation">
diff --git a/compiler/testData/lazyResolve/diagnostics/override/DelegationVar.txt b/compiler/testData/lazyResolve/diagnostics/override/DelegationVar.txt
deleted file mode 100644
index 216b32ad723..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/DelegationVar.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-// <namespace name="delegation">
-namespace delegation
-
-internal abstract trait delegation.Aaa : jet.Any {
-    internal abstract var i: jet.Int
-}
-internal final class delegation.Bbb : delegation.Aaa {
-    public final /*constructor*/ fun <init>(/*0*/ aaa: delegation.Aaa): delegation.Bbb
-    internal open override /*1*/ var i: jet.Int
-}
-// </namespace name="delegation">
diff --git a/compiler/testData/lazyResolve/diagnostics/override/EqualityOfIntersectionTypes.txt b/compiler/testData/lazyResolve/diagnostics/override/EqualityOfIntersectionTypes.txt
deleted file mode 100644
index 7cf9693ba64..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/EqualityOfIntersectionTypes.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-internal abstract trait A : jet.Any {
-    internal open fun </*0*/ T : Bar & Foo>foo(): jet.Tuple0
-}
-internal final class B : A {
-    public final /*constructor*/ fun <init>(): B
-    internal open override /*1*/ fun </*0*/ T : Bar & Foo>foo(): jet.Tuple0
-}
-internal abstract trait Bar : jet.Any {
-}
-internal abstract trait Foo : jet.Any {
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/override/ExtendFunctionClass.txt b/compiler/testData/lazyResolve/diagnostics/override/ExtendFunctionClass.txt
deleted file mode 100644
index eac9e004e33..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/ExtendFunctionClass.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace <root>
-
-// <namespace name="extendFunctionClass">
-namespace extendFunctionClass
-
-internal final class extendFunctionClass.A : jet.Function1<jet.Int, jet.Int> {
-    public final /*constructor*/ fun <init>(): extendFunctionClass.A
-    public abstract override /*1*/ fun invoke(/*0*/ p1: jet.Int): jet.Int
-}
-internal final class extendFunctionClass.B : jet.Function1<jet.Int, jet.Int> {
-    public final /*constructor*/ fun <init>(): extendFunctionClass.B
-    public open override /*1*/ fun invoke(/*0*/ p1: jet.Int): jet.Int
-}
-// </namespace name="extendFunctionClass">
diff --git a/compiler/testData/lazyResolve/diagnostics/override/FakeOverrideAbstractAndNonAbstractFun.txt b/compiler/testData/lazyResolve/diagnostics/override/FakeOverrideAbstractAndNonAbstractFun.txt
deleted file mode 100644
index 6c2c32fc252..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/FakeOverrideAbstractAndNonAbstractFun.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-internal open class Ccc : jet.Any {
-    public final /*constructor*/ fun <init>(): Ccc
-    internal final fun foo(): jet.Int
-}
-internal abstract trait Ttt : jet.Any {
-    internal abstract fun foo(): jet.Int
-}
-internal final class Zzz : Ccc, Ttt {
-    public final /*constructor*/ fun <init>(): Zzz
-    internal final override /*2*/ fun foo(): jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/override/Generics.txt b/compiler/testData/lazyResolve/diagnostics/override/Generics.txt
deleted file mode 100644
index 0f77c6c13f6..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/Generics.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-namespace <root>
-
-// <namespace name="override">
-namespace override
-
-// <namespace name="generics">
-namespace generics
-
-internal abstract class override.generics.MyAbstractClass</*0*/ T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): override.generics.MyAbstractClass<T>
-    internal abstract fun bar(/*0*/ t: T): T
-    internal abstract val pr: T
-}
-internal abstract class override.generics.MyAbstractClass1 : override.generics.MyTrait<jet.Int>, override.generics.MyAbstractClass<jet.String> {
-    public final /*constructor*/ fun <init>(): override.generics.MyAbstractClass1
-    internal open override /*1*/ fun bar(/*0*/ t: jet.String): jet.String
-    internal open override /*1*/ fun foo(/*0*/ t: jet.Int): jet.Int
-    internal abstract override /*1*/ val pr: jet.String
-}
-internal final class override.generics.MyChildClass : override.generics.MyGenericClass<jet.Int> {
-    public final /*constructor*/ fun <init>(): override.generics.MyChildClass
-    internal open override /*1*/ fun bar(/*0*/ t: jet.Int): jet.Int
-    internal open override /*1*/ fun foo(/*0*/ t: jet.Int): jet.Int
-    internal open override /*1*/ val p: jet.Int
-    internal open override /*1*/ val pr: jet.Int
-}
-internal final class override.generics.MyChildClass1</*0*/ T : jet.Any?> : override.generics.MyGenericClass<T> {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(/*0*/ t: T): override.generics.MyChildClass1<T>
-    internal open override /*1*/ fun bar(/*0*/ t: T): T
-    internal open override /*1*/ fun foo(/*0*/ t: T): T
-    internal open override /*1*/ val p: T
-    internal open override /*1*/ val pr: T
-}
-internal final class override.generics.MyChildClass2</*0*/ T : jet.Any?> : override.generics.MyGenericClass<T> {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(/*0*/ t: T): override.generics.MyChildClass2<T>
-    internal open override /*1*/ fun bar(/*0*/ t: T): T
-    internal final override /*1*/ fun foo(/*0*/ t: T): T
-    internal open override /*1*/ val p: T
-    internal final override /*1*/ val pr: T
-}
-internal open class override.generics.MyClass : override.generics.MyTrait<jet.Int>, override.generics.MyAbstractClass<jet.String> {
-    public final /*constructor*/ fun <init>(): override.generics.MyClass
-    internal open override /*1*/ fun bar(/*0*/ t: jet.String): jet.String
-    internal open override /*1*/ fun foo(/*0*/ t: jet.Int): jet.Int
-    internal open override /*1*/ val pr: jet.String
-}
-internal open class override.generics.MyGenericClass</*0*/ T : jet.Any?> : override.generics.MyTrait<T>, override.generics.MyAbstractClass<T>, override.generics.MyProps<T> {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(/*0*/ t: T): override.generics.MyGenericClass<T>
-    internal open override /*1*/ fun bar(/*0*/ t: T): T
-    internal open override /*1*/ fun foo(/*0*/ t: T): T
-    internal open override /*1*/ val p: T
-    internal open override /*1*/ val pr: T
-}
-internal final class override.generics.MyIllegalClass1 : override.generics.MyTrait<jet.Int>, override.generics.MyAbstractClass<jet.String> {
-    public final /*constructor*/ fun <init>(): override.generics.MyIllegalClass1
-    internal abstract override /*1*/ fun bar(/*0*/ t: jet.String): jet.String
-    internal abstract override /*1*/ fun foo(/*0*/ t: jet.Int): jet.Int
-    internal abstract override /*1*/ val pr: jet.String
-}
-internal final class override.generics.MyIllegalClass2</*0*/ T : jet.Any?> : override.generics.MyTrait<jet.Int>, override.generics.MyAbstractClass<jet.Int> {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(/*0*/ t: T): override.generics.MyIllegalClass2<T>
-    internal final fun bar(/*0*/ t: T): T
-    internal abstract override /*1*/ fun bar(/*0*/ t: jet.Int): jet.Int
-    internal final fun foo(/*0*/ t: T): T
-    internal abstract override /*1*/ fun foo(/*0*/ t: jet.Int): jet.Int
-    internal final val  </*0*/ R : jet.Any?> pr: T
-}
-internal final class override.generics.MyIllegalGenericClass1</*0*/ T : jet.Any?> : override.generics.MyTrait<T>, override.generics.MyAbstractClass<T> {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): override.generics.MyIllegalGenericClass1<T>
-    internal abstract override /*1*/ fun bar(/*0*/ t: T): T
-    internal abstract override /*1*/ fun foo(/*0*/ t: T): T
-    internal abstract override /*1*/ val pr: T
-}
-internal final class override.generics.MyIllegalGenericClass2</*0*/ T : jet.Any?, /*1*/ R : jet.Any?> : override.generics.MyTrait<T>, override.generics.MyAbstractClass<R> {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?, /*1*/ R : jet.Any?><init>(/*0*/ r: R): override.generics.MyIllegalGenericClass2<T, R>
-    internal abstract override /*1*/ fun bar(/*0*/ t: R): R
-    internal open fun foo(/*0*/ r: R): R
-    internal abstract override /*1*/ fun foo(/*0*/ t: T): T
-    internal open val  </*0*/ T : jet.Any?> pr: R
-}
-internal abstract class override.generics.MyLegalAbstractClass1 : override.generics.MyTrait<jet.Int>, override.generics.MyAbstractClass<jet.String> {
-    public final /*constructor*/ fun <init>(): override.generics.MyLegalAbstractClass1
-    internal abstract override /*1*/ fun bar(/*0*/ t: jet.String): jet.String
-    internal abstract override /*1*/ fun foo(/*0*/ t: jet.Int): jet.Int
-    internal abstract override /*1*/ val pr: jet.String
-}
-internal abstract class override.generics.MyLegalAbstractClass2</*0*/ T : jet.Any?> : override.generics.MyTrait<jet.Int>, override.generics.MyAbstractClass<jet.Int> {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(/*0*/ t: T): override.generics.MyLegalAbstractClass2<T>
-    internal final fun bar(/*0*/ t: T): T
-    internal abstract override /*1*/ fun bar(/*0*/ t: jet.Int): jet.Int
-    internal final fun foo(/*0*/ t: T): T
-    internal abstract override /*1*/ fun foo(/*0*/ t: jet.Int): jet.Int
-    internal final val  </*0*/ R : jet.Any?> pr: T
-}
-internal abstract trait override.generics.MyProps</*0*/ T : jet.Any?> : jet.Any {
-    internal abstract val p: T
-}
-internal abstract trait override.generics.MyTrait</*0*/ T : jet.Any?> : jet.Any {
-    internal abstract fun foo(/*0*/ t: T): T
-}
-// </namespace name="generics">
-// </namespace name="override">
diff --git a/compiler/testData/lazyResolve/diagnostics/override/InvisiblePotentialOverride.txt b/compiler/testData/lazyResolve/diagnostics/override/InvisiblePotentialOverride.txt
deleted file mode 100644
index 396fde450f0..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/InvisiblePotentialOverride.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-internal open class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    private final fun foo(): jet.Int
-}
-internal final class B : A {
-    public final /*constructor*/ fun <init>(): B
-    internal final fun foo(): jet.String
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/override/MultipleDefaultParametersInSupertypes.txt b/compiler/testData/lazyResolve/diagnostics/override/MultipleDefaultParametersInSupertypes.txt
deleted file mode 100644
index 939fe6bbb7d..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/MultipleDefaultParametersInSupertypes.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-internal abstract trait X : jet.Any {
-    internal abstract fun foo(/*0*/ a: jet.Int = ?): jet.Tuple0
-}
-internal abstract trait Y : jet.Any {
-    internal abstract fun foo(/*0*/ a: jet.Int = ?): jet.Tuple0
-}
-internal final class Z : X, Y {
-    public final /*constructor*/ fun <init>(): Z
-    internal open override /*2*/ fun foo(/*0*/ a: jet.Int = ?): jet.Tuple0
-}
-internal final val ZO: ZO
diff --git a/compiler/testData/lazyResolve/diagnostics/override/MultipleDefaultParametersInSupertypesNoOverride.txt b/compiler/testData/lazyResolve/diagnostics/override/MultipleDefaultParametersInSupertypesNoOverride.txt
deleted file mode 100644
index 95958c0285e..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/MultipleDefaultParametersInSupertypesNoOverride.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-internal abstract trait X : jet.Any {
-    internal abstract fun foo(/*0*/ a: jet.Int = ?): jet.Tuple0
-}
-internal abstract trait Y : jet.Any {
-    internal abstract fun foo(/*0*/ a: jet.Int = ?): jet.Tuple0
-}
-internal final class Z : X, Y {
-    public final /*constructor*/ fun <init>(): Z
-    internal final override /*2*/ fun foo(/*0*/ a: jet.Int = ?): jet.Tuple0
-}
-internal final val ZO: ZO
diff --git a/compiler/testData/lazyResolve/diagnostics/override/MultipleDefaultsInSupertypesNoExplicitOverride.txt b/compiler/testData/lazyResolve/diagnostics/override/MultipleDefaultsInSupertypesNoExplicitOverride.txt
deleted file mode 100644
index 58077d1cddb..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/MultipleDefaultsInSupertypesNoExplicitOverride.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-internal abstract trait X : jet.Any {
-    internal abstract fun foo(/*0*/ a: jet.Int = ?): jet.Tuple0
-}
-internal abstract trait Y : jet.Any {
-    internal abstract fun foo(/*0*/ a: jet.Int = ?): jet.Tuple0
-}
-internal final class Z1 : X, Y {
-    public final /*constructor*/ fun <init>(): Z1
-    internal abstract override /*2*/ fun foo(/*0*/ a: jet.Int = ?): jet.Tuple0
-}
-internal final val Z1O: Z1O
diff --git a/compiler/testData/lazyResolve/diagnostics/override/NonGenerics.txt b/compiler/testData/lazyResolve/diagnostics/override/NonGenerics.txt
deleted file mode 100644
index fa125f197f7..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/NonGenerics.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-namespace <root>
-
-// <namespace name="override">
-namespace override
-
-// <namespace name="normal">
-namespace normal
-
-internal abstract class override.normal.MyAbstractClass : jet.Any {
-    public final /*constructor*/ fun <init>(): override.normal.MyAbstractClass
-    internal abstract fun bar(): jet.Tuple0
-    internal abstract val prr: jet.Tuple0
-}
-internal final class override.normal.MyChildClass : override.normal.MyClass {
-    public final /*constructor*/ fun <init>(): override.normal.MyChildClass
-    internal open override /*1*/ fun bar(): jet.Tuple0
-    internal open override /*1*/ fun foo(): jet.Tuple0
-    internal open override /*1*/ val pr: jet.Tuple0
-    internal open override /*1*/ val prr: jet.Tuple0
-}
-internal final class override.normal.MyChildClass1 : override.normal.MyClass {
-    public final /*constructor*/ fun <init>(): override.normal.MyChildClass1
-    internal open override /*1*/ fun bar(): jet.Tuple0
-    internal final override /*1*/ fun foo(): jet.Tuple0
-    internal final override /*1*/ val pr: jet.Tuple0
-    internal open override /*1*/ val prr: jet.Tuple0
-}
-internal open class override.normal.MyClass : override.normal.MyTrait, override.normal.MyAbstractClass {
-    public final /*constructor*/ fun <init>(): override.normal.MyClass
-    internal open override /*1*/ fun bar(): jet.Tuple0
-    internal open override /*1*/ fun foo(): jet.Tuple0
-    internal open override /*1*/ val pr: jet.Tuple0
-    internal open override /*1*/ val prr: jet.Tuple0
-}
-internal final class override.normal.MyIllegalClass : override.normal.MyTrait, override.normal.MyAbstractClass {
-    public final /*constructor*/ fun <init>(): override.normal.MyIllegalClass
-    internal abstract override /*1*/ fun bar(): jet.Tuple0
-    internal abstract override /*1*/ fun foo(): jet.Tuple0
-    internal abstract override /*1*/ val pr: jet.Tuple0
-    internal abstract override /*1*/ val prr: jet.Tuple0
-}
-internal final class override.normal.MyIllegalClass2 : override.normal.MyTrait, override.normal.MyAbstractClass {
-    public final /*constructor*/ fun <init>(): override.normal.MyIllegalClass2
-    internal abstract override /*1*/ fun bar(): jet.Tuple0
-    internal open override /*1*/ fun foo(): jet.Tuple0
-    internal open override /*1*/ val pr: jet.Tuple0
-    internal open override /*1*/ val prr: jet.Tuple0
-}
-internal final class override.normal.MyIllegalClass3 : override.normal.MyTrait, override.normal.MyAbstractClass {
-    public final /*constructor*/ fun <init>(): override.normal.MyIllegalClass3
-    internal open override /*1*/ fun bar(): jet.Tuple0
-    internal abstract override /*1*/ fun foo(): jet.Tuple0
-    internal open override /*1*/ val pr: jet.Tuple0
-    internal open override /*1*/ val prr: jet.Tuple0
-}
-internal final class override.normal.MyIllegalClass4 : override.normal.MyTrait, override.normal.MyAbstractClass {
-    public final /*constructor*/ fun <init>(): override.normal.MyIllegalClass4
-    internal abstract override /*1*/ fun bar(): jet.Tuple0
-    internal final override /*1*/ fun foo(): jet.Tuple0
-    internal open fun other(): jet.Tuple0
-    internal open val otherPr: jet.Int
-    internal final override /*1*/ val pr: jet.Tuple0
-    internal abstract override /*1*/ val prr: jet.Tuple0
-}
-internal abstract trait override.normal.MyTrait : jet.Any {
-    internal abstract fun foo(): jet.Tuple0
-    internal abstract val pr: jet.Tuple0
-}
-// </namespace name="normal">
-// </namespace name="override">
diff --git a/compiler/testData/lazyResolve/diagnostics/override/ParameterDefaultValues-DefaultValueFromOnlyOneSupertype.txt b/compiler/testData/lazyResolve/diagnostics/override/ParameterDefaultValues-DefaultValueFromOnlyOneSupertype.txt
deleted file mode 100644
index 9c6fb4c0e60..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/ParameterDefaultValues-DefaultValueFromOnlyOneSupertype.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-internal abstract trait X : jet.Any {
-    internal abstract fun foo(/*0*/ a: jet.Int = ?): jet.Tuple0
-}
-internal abstract trait Y : jet.Any {
-    internal abstract fun foo(/*0*/ a: jet.Int): jet.Tuple0
-}
-internal final class Z : X, Y {
-    public final /*constructor*/ fun <init>(): Z
-    internal open override /*2*/ fun foo(/*0*/ a: jet.Int = ?): jet.Tuple0
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/override/ProtectedAndPrivateFromSupertypes.txt b/compiler/testData/lazyResolve/diagnostics/override/ProtectedAndPrivateFromSupertypes.txt
deleted file mode 100644
index cb032b3c9b1..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/ProtectedAndPrivateFromSupertypes.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace <root>
-
-// <namespace name="test">
-namespace test
-
-internal abstract trait test.A : jet.Any {
-    protected abstract val a: jet.String
-}
-internal abstract trait test.B : jet.Any {
-    protected abstract val a: jet.String
-}
-internal open class test.C : jet.Any {
-    public final /*constructor*/ fun <init>(): test.C
-    private final val a: jet.String
-}
-internal final class test.Subject : test.C, test.A, test.B {
-    public final /*constructor*/ fun <init>(): test.Subject
-    private abstract override /*2*/ val a: jet.String
-    internal final val c: jet.String
-}
-// </namespace name="test">
diff --git a/compiler/testData/lazyResolve/diagnostics/override/SuspiciousCase1.txt b/compiler/testData/lazyResolve/diagnostics/override/SuspiciousCase1.txt
deleted file mode 100644
index e70daad2e0f..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/SuspiciousCase1.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-internal abstract trait Bar</*0*/ Q : jet.Any?> : Foo<Q> {
-    internal open override /*1*/ fun quux(/*0*/ p: Q, /*1*/ q: jet.Int = ?): jet.Int
-}
-internal abstract class Baz : Bar<jet.String> {
-    public final /*constructor*/ fun <init>(): Baz
-    internal open override /*1*/ fun quux(/*0*/ p: jet.String, /*1*/ q: jet.Int = ?): jet.Int
-}
-internal abstract trait Foo</*0*/ P : jet.Any?> : jet.Any {
-    internal open fun quux(/*0*/ p: P, /*1*/ q: jet.Int = ?): jet.Int
-}
-internal final fun zz(/*0*/ b: Baz): jet.Int
diff --git a/compiler/testData/lazyResolve/diagnostics/override/ToAbstractMembersFromSuper-kt1996.txt b/compiler/testData/lazyResolve/diagnostics/override/ToAbstractMembersFromSuper-kt1996.txt
deleted file mode 100644
index c02180a656c..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/ToAbstractMembersFromSuper-kt1996.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-internal abstract trait Bar : jet.Any {
-    internal abstract fun foo(): jet.Tuple0
-}
-internal final class Baz : Foo, Bar {
-    public final /*constructor*/ fun <init>(): Baz
-    internal abstract override /*2*/ fun foo(): jet.Tuple0
-}
-internal abstract trait Foo : jet.Any {
-    internal abstract fun foo(): jet.Tuple0
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/override/kt1862.txt b/compiler/testData/lazyResolve/diagnostics/override/kt1862.txt
deleted file mode 100644
index 96cc596b29d..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/override/kt1862.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace <root>
-
-internal open class Aaa : jet.Any {
-    public final /*constructor*/ fun <init>(): Aaa
-    internal open fun foo(): jet.Int
-}
-internal open class Bbb : Aaa {
-    public final /*constructor*/ fun <init>(): Bbb
-    internal open override /*1*/ fun foo(): jet.Int
-}
-internal abstract trait Ccc : Aaa {
-    internal open override /*1*/ fun foo(): jet.Int
-}
-internal final class Ddd : Bbb, Ccc {
-    public final /*constructor*/ fun <init>(): Ddd
-    internal open override /*2*/ fun foo(): jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/redeclarations/ConflictingExtensionProperties.txt b/compiler/testData/lazyResolve/diagnostics/redeclarations/ConflictingExtensionProperties.txt
deleted file mode 100644
index 7202aa366a3..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/redeclarations/ConflictingExtensionProperties.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="foo">
-namespace foo
-
-internal final val jet.Int.foo: jet.Int
-internal final val jet.Int.foo: jet.Int
-// </namespace name="foo">
diff --git a/compiler/testData/lazyResolve/diagnostics/redeclarations/MultiFilePackageRedeclaration.txt b/compiler/testData/lazyResolve/diagnostics/redeclarations/MultiFilePackageRedeclaration.txt
deleted file mode 100644
index ea9c6945fdb..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/redeclarations/MultiFilePackageRedeclaration.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-// <namespace name="b">
-namespace b
-
-// </namespace name="b">
-internal final class a.b : jet.Any {
-    public final /*constructor*/ fun <init>(): a.b
-}
-// </namespace name="a">
diff --git a/compiler/testData/lazyResolve/diagnostics/redeclarations/PropertyAndFunInClass.txt b/compiler/testData/lazyResolve/diagnostics/redeclarations/PropertyAndFunInClass.txt
deleted file mode 100644
index d5706d667ef..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/redeclarations/PropertyAndFunInClass.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal final fun a(): jet.Int
-    internal final val a: jet.Int
-}
-internal final class B : jet.Any {
-    public final /*constructor*/ fun <init>(): B
-    internal final fun b(): jet.Int
-    internal final val b: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/redeclarations/kt2247.txt b/compiler/testData/lazyResolve/diagnostics/redeclarations/kt2247.txt
deleted file mode 100644
index 7b14d58a7a5..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/redeclarations/kt2247.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace <root>
-
-// <namespace name="kt2247">
-namespace kt2247
-
-internal final class kt2247.B : jet.Any {
-    public final /*constructor*/ fun <init>(): kt2247.B
-    internal final class kt2247.B.Y : jet.Any {
-        public final /*constructor*/ fun <init>(): kt2247.B.Y
-    }
-    internal final class object kt2247.B.<no name provided> : jet.Any {
-        internal final /*constructor*/ fun <init>(): kt2247.B.<no name provided>
-        internal final class kt2247.B.<no name provided>.Y : jet.Any {
-            public final /*constructor*/ fun <init>(): kt2247.B.<no name provided>.Y
-        }
-    }
-}
-// </namespace name="kt2247">
diff --git a/compiler/testData/lazyResolve/diagnostics/redeclarations/kt470.txt b/compiler/testData/lazyResolve/diagnostics/redeclarations/kt470.txt
deleted file mode 100644
index 7617e47dc93..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/redeclarations/kt470.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-namespace <root>
-
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal final val a: jet.Int
-    internal final val a: jet.Int
-    internal final val a: jet.Int
-    internal final val b: jet.Int
-    internal final val b: jet.Int
-    internal final val b: jet.Int
-    internal final val b: jet.Int
-    internal final fun bar(): jet.Tuple0
-    internal final fun bar(): jet.Tuple0
-    internal final fun bar(): jet.Tuple0
-    internal final fun foo(): jet.Tuple0
-    internal final fun foo(): jet.Tuple0
-    internal final fun foo(): jet.Tuple0
-    internal final fun foo(): jet.Tuple0
-}
-internal final val a: jet.Int
-internal final val a: jet.Int
-internal final val a: jet.Int
-internal final val b: jet.Int
-internal final val b: jet.Int
-internal final val b: jet.Int
-internal final val b: jet.Int
-internal final fun bar(): jet.Tuple0
-internal final fun bar(): jet.Tuple0
-internal final fun bar(): jet.Tuple0
-internal final fun foo(): jet.Tuple0
-internal final fun foo(): jet.Tuple0
-internal final fun foo(): jet.Tuple0
-internal final fun foo(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/AmbiguityOnLazyTypeComputation.txt b/compiler/testData/lazyResolve/diagnostics/regressions/AmbiguityOnLazyTypeComputation.txt
deleted file mode 100644
index 5e9050c2b60..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/AmbiguityOnLazyTypeComputation.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-// <namespace name="x">
-namespace x
-
-internal final class x.Foo : jet.Any {
-    public final /*constructor*/ fun <init>(): x.Foo
-    internal final fun compareTo(/*0*/ other: jet.Byte): jet.Int
-    internal final fun compareTo(/*0*/ other: jet.Char): jet.Int
-}
-internal final val a1: jet.Int
-internal final val b: x.Foo
-// </namespace name="x">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/AssignmentsUnderOperators.txt b/compiler/testData/lazyResolve/diagnostics/regressions/AssignmentsUnderOperators.txt
deleted file mode 100644
index 8a9f72ae986..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/AssignmentsUnderOperators.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/CoercionToUnit.txt b/compiler/testData/lazyResolve/diagnostics/regressions/CoercionToUnit.txt
deleted file mode 100644
index 400f87e4f3e..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/CoercionToUnit.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun foo(/*0*/ u: jet.Tuple0): jet.Int
-internal final fun test(): jet.Int
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/DoubleDefine.txt b/compiler/testData/lazyResolve/diagnostics/regressions/DoubleDefine.txt
deleted file mode 100644
index d4f60be4464..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/DoubleDefine.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final fun evaluate(/*0*/ expr: java.lang.StringBuilder, /*1*/ numbers: java.util.ArrayList<jet.Int>): jet.Int
-internal final fun evaluateAdd(/*0*/ expr: java.lang.StringBuilder, /*1*/ numbers: java.util.ArrayList<jet.Int>): jet.Int
-internal final fun evaluateArg(/*0*/ expr: jet.CharSequence, /*1*/ numbers: java.util.ArrayList<jet.Int>): jet.Int
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-internal final fun takeFirst(/*0*/ expr: java.lang.StringBuilder): jet.Char
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/ErrorsOnIbjectExpressionsAsParameters.txt b/compiler/testData/lazyResolve/diagnostics/regressions/ErrorsOnIbjectExpressionsAsParameters.txt
deleted file mode 100644
index 20d98c49f5b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/ErrorsOnIbjectExpressionsAsParameters.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun foo(/*0*/ a: jet.Any): jet.Tuple0
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/Jet11.txt b/compiler/testData/lazyResolve/diagnostics/regressions/Jet11.txt
deleted file mode 100644
index 70d2d58f77a..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/Jet11.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-internal open class NoC : jet.Any {
-    public final /*constructor*/ fun <init>(): NoC
-}
-internal final class NoC1 : NoC {
-    public final /*constructor*/ fun <init>(): NoC1
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/Jet121.txt b/compiler/testData/lazyResolve/diagnostics/regressions/Jet121.txt
deleted file mode 100644
index 40656e5f7f5..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/Jet121.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="jet121">
-namespace jet121
-
-internal final fun apply(/*0*/ arg: jet.String, /*1*/ f: jet.ExtensionFunction0<jet.String, jet.Int>): jet.Int
-internal final fun box(): jet.String
-// </namespace name="jet121">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/Jet124.txt b/compiler/testData/lazyResolve/diagnostics/regressions/Jet124.txt
deleted file mode 100644
index 906406dc8cf..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/Jet124.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun foo(): jet.Tuple0
-internal final fun foo1(): jet.Function1<jet.Int, jet.Int>
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/Jet169.txt b/compiler/testData/lazyResolve/diagnostics/regressions/Jet169.txt
deleted file mode 100644
index 48528432872..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/Jet169.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun set(/*0*/ key: jet.String, /*1*/ value: jet.String): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/Jet17.txt b/compiler/testData/lazyResolve/diagnostics/regressions/Jet17.txt
deleted file mode 100644
index 4368a0787f0..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/Jet17.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final class WithC : jet.Any {
-    public final /*constructor*/ fun <init>(): WithC
-    internal final val a: jet.Int
-    internal final val b: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/Jet183-1.txt b/compiler/testData/lazyResolve/diagnostics/regressions/Jet183-1.txt
deleted file mode 100644
index 9ed2f2ddb87..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/Jet183-1.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-internal abstract enum class ProtocolState : jet.Any {
-    public final /*constructor*/ fun <init>(): ProtocolState
-    internal abstract fun signal(): ProtocolState
-    internal final class object ProtocolState.<class-object-for-ProtocolState> {
-        internal final /*constructor*/ fun <init>(): ProtocolState.<class-object-for-ProtocolState>
-        internal final val TALKING: ProtocolState.<class-object-for-ProtocolState>.TALKING
-        internal final val WAITING: ProtocolState.<class-object-for-ProtocolState>.WAITING
-    }
-}
-internal final fun box(): jet.String
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/Jet183.txt b/compiler/testData/lazyResolve/diagnostics/regressions/Jet183.txt
deleted file mode 100644
index b947287bc73..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/Jet183.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace <root>
-
-internal final enum class Foo</*0*/ T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): Foo<T>
-    internal final class object Foo.<class-object-for-Foo> {
-        internal final /*constructor*/ fun <init>(): Foo.<class-object-for-Foo>
-        internal final val X: Foo.<class-object-for-Foo>.X
-    }
-}
-internal abstract enum class ProtocolState : jet.Any {
-    public final /*constructor*/ fun <init>(): ProtocolState
-    internal abstract fun signal(): ProtocolState
-    internal final class object ProtocolState.<class-object-for-ProtocolState> {
-        internal final /*constructor*/ fun <init>(): ProtocolState.<class-object-for-ProtocolState>
-        internal final val TALKING: ProtocolState.<class-object-for-ProtocolState>.TALKING
-        internal final val WAITING: ProtocolState.<class-object-for-ProtocolState>.WAITING
-    }
-}
-internal final fun box(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/Jet53.txt b/compiler/testData/lazyResolve/diagnostics/regressions/Jet53.txt
deleted file mode 100644
index 277fb8d2562..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/Jet53.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final val ab: java.util.List<jet.Int>?
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/Jet67.txt b/compiler/testData/lazyResolve/diagnostics/regressions/Jet67.txt
deleted file mode 100644
index 2afd760a213..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/Jet67.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace <root>
-
-internal abstract class XXX : jet.Any {
-    public final /*constructor*/ fun <init>(): XXX
-    internal abstract val a: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/Jet68.txt b/compiler/testData/lazyResolve/diagnostics/regressions/Jet68.txt
deleted file mode 100644
index e28689cf4ae..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/Jet68.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace <root>
-
-internal final class Foo : jet.Any {
-    public final /*constructor*/ fun <init>(): Foo
-}
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/Jet69.txt b/compiler/testData/lazyResolve/diagnostics/regressions/Jet69.txt
deleted file mode 100644
index 54d2f7f98be..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/Jet69.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-internal final class Command : jet.Any {
-    public final /*constructor*/ fun <init>(): Command
-}
-internal final fun jet.Any.equals(/*0*/ other: jet.Any?): jet.Boolean
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-internal final fun parse(/*0*/ cmd: jet.String): Command?
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/Jet72.txt b/compiler/testData/lazyResolve/diagnostics/regressions/Jet72.txt
deleted file mode 100644
index 0d868ac29e5..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/Jet72.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-internal abstract class Item : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ room: java.lang.Object): Item
-    internal abstract val name: jet.String
-    internal final val room: java.lang.Object
-}
-internal final val items: java.util.ArrayList<Item>
-internal final fun test(/*0*/ room: java.lang.Object): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/Jet81.txt b/compiler/testData/lazyResolve/diagnostics/regressions/Jet81.txt
deleted file mode 100644
index 4a8d5b1db0d..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/Jet81.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-internal final val A: A
-internal final val a: <no name provided>
-internal final val b: [ERROR : <ERROR PROPERTY TYPE>]
-internal final val c: jet.Int
-internal final val y: <no name provided>
-internal final val z: [ERROR : Type for y]
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/OrphanStarProjection.txt b/compiler/testData/lazyResolve/diagnostics/regressions/OrphanStarProjection.txt
deleted file mode 100644
index b5ae30814e1..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/OrphanStarProjection.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace <root>
-
-internal final class B : jet.Any {
-    public final /*constructor*/ fun <init>(): B
-}
-internal final val b: [ERROR : B<*>]
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/OutProjections.txt b/compiler/testData/lazyResolve/diagnostics/regressions/OutProjections.txt
deleted file mode 100644
index 0e734f7d29c..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/OutProjections.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace <root>
-
-internal final class G</*0*/ T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): G<T>
-}
-internal final class Out</*0*/ out T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ out T : jet.Any?><init>(): Out<T>
-}
-internal final class Point : jet.Any {
-    public final /*constructor*/ fun <init>(): Point
-}
-internal final fun </*0*/ T : jet.Any?>f(/*0*/ expression: T): G<out T>
-internal final fun foo(): G<Point>
-internal final fun fooout(): Out<Point>
-internal final fun </*0*/ T : jet.Any?>fout(/*0*/ expression: T): Out<out T>
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/OverrideResolution.txt b/compiler/testData/lazyResolve/diagnostics/regressions/OverrideResolution.txt
deleted file mode 100644
index fa981b347d6..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/OverrideResolution.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace <root>
-
-internal open class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal open fun foo(): jet.Tuple0
-}
-internal open class B : A {
-    public final /*constructor*/ fun <init>(): B
-    internal open override /*1*/ fun foo(): jet.Tuple0
-}
-internal open class C : B {
-    public final /*constructor*/ fun <init>(): C
-    internal open override /*1*/ fun foo(): jet.Tuple0
-}
-internal final fun box(/*0*/ c: C): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/ScopeForSecondaryConstructors.txt b/compiler/testData/lazyResolve/diagnostics/regressions/ScopeForSecondaryConstructors.txt
deleted file mode 100644
index 88cda330823..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/ScopeForSecondaryConstructors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-internal final class Foo : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ bar: jet.Int, /*1*/ barr: jet.Int, /*2*/ barrr: jet.Int): Foo
-    internal final jet.Int() val a: jet.Int
-    internal final var bar: jet.Int
-    internal final var bar: jet.Int
-    internal final var barr: jet.Int
-    internal final var barrr: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/SpecififcityByReceiver.txt b/compiler/testData/lazyResolve/diagnostics/regressions/SpecififcityByReceiver.txt
deleted file mode 100644
index 4cd7eebe639..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/SpecififcityByReceiver.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun jet.Any.equals(/*0*/ other: jet.Any?): jet.Boolean
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/ThisConstructorInGenericClass.txt b/compiler/testData/lazyResolve/diagnostics/regressions/ThisConstructorInGenericClass.txt
deleted file mode 100644
index 30720113013..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/ThisConstructorInGenericClass.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace <root>
-
-internal final class Z : jet.Any {
-    public final /*constructor*/ fun <init>(): Z
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/TypeMismatchOnUnaryOperations.txt b/compiler/testData/lazyResolve/diagnostics/regressions/TypeMismatchOnUnaryOperations.txt
deleted file mode 100644
index dc622bf14c5..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/TypeMismatchOnUnaryOperations.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/TypeParameterAsASupertype.txt b/compiler/testData/lazyResolve/diagnostics/regressions/TypeParameterAsASupertype.txt
deleted file mode 100644
index 28616408641..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/TypeParameterAsASupertype.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace <root>
-
-internal final class A</*0*/ T : jet.Any?> {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): A<T>
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/UnavaliableQualifiedThis.txt b/compiler/testData/lazyResolve/diagnostics/regressions/UnavaliableQualifiedThis.txt
deleted file mode 100644
index 2a808d697c8..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/UnavaliableQualifiedThis.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal abstract trait Iterator</*0*/ out T : jet.Any?> : jet.Any {
-    internal abstract val hasNext: jet.Boolean
-    internal open fun </*0*/ R : jet.Any?>map(/*0*/ transform: jet.Function1<T, R>): Iterator<R>
-    internal abstract fun next(): T
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/WrongTraceInCallResolver.txt b/compiler/testData/lazyResolve/diagnostics/regressions/WrongTraceInCallResolver.txt
deleted file mode 100644
index b0b8e8d9c68..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/WrongTraceInCallResolver.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace <root>
-
-internal open class Bar : jet.Any {
-    public final /*constructor*/ fun <init>(): Bar
-}
-internal open class Foo : jet.Any {
-    public final /*constructor*/ fun <init>(): Foo
-}
-internal final fun f(): jet.Tuple0
-internal final fun </*0*/ T : Bar, /*1*/ T1 : jet.Any?>foo(/*0*/ x: jet.Int): jet.Tuple0
-internal final fun </*0*/ T1 : jet.Any?, /*1*/ T : Foo>foo(/*0*/ x: jet.Long): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt127.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt127.txt
deleted file mode 100644
index 52f7e7f8b5d..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt127.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-internal final class Foo : jet.Any {
-    public final /*constructor*/ fun <init>(): Foo
-}
-internal final fun jet.Any.equals(/*0*/ other: jet.Any?): jet.Boolean
-internal final fun jet.Any?.equals1(/*0*/ other: jet.Any?): jet.Boolean
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt128.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt128.txt
deleted file mode 100644
index 35ffbe62f0f..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt128.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun div(/*0*/ c: jet.String = ?, /*1*/ f: jet.Function0<jet.Tuple0>): jet.Tuple0
-internal final fun f(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt1489_1728.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt1489_1728.txt
deleted file mode 100644
index bbade35c80a..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt1489_1728.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace <root>
-
-// <namespace name="kt606_dependents">
-namespace kt606_dependents
-
-internal abstract trait kt606_dependents.AutoCloseable : jet.Any {
-    internal abstract fun close(): jet.Tuple0
-}
-internal final class kt606_dependents.C : jet.Any {
-    public final /*constructor*/ fun <init>(): kt606_dependents.C
-    internal final fun bar(): jet.Tuple0
-    internal final fun </*0*/ X : kt606_dependents.AutoCloseable>foo(/*0*/ x: X, /*1*/ body: jet.Function1<X, jet.Tuple0>): jet.Tuple0
-    internal final class kt606_dependents.C.Resource : kt606_dependents.AutoCloseable {
-        public final /*constructor*/ fun <init>(): kt606_dependents.C.Resource
-        internal open override /*1*/ fun close(): jet.Tuple0
-    }
-    internal final fun p(): kt606_dependents.C.Resource?
-}
-internal final val jet.Int.ext: jet.Function0<jet.Int>
-internal final val x: jet.Int
-// </namespace name="kt606_dependents">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt1550.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt1550.txt
deleted file mode 100644
index 5ed3f291218..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt1550.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="foo">
-namespace foo
-
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-// </namespace name="foo">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt1647.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt1647.txt
deleted file mode 100644
index f1b4f3a8b7c..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt1647.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-internal open class Abs : jet.Any {
-    public final /*constructor*/ fun <init>(): Abs
-}
-internal final class Bar : Abs {
-    public final /*constructor*/ fun <init>(): Bar
-}
-internal final fun </*0*/ F : Abs>patternMatchingAndGenerics(/*0*/ arg: F): jet.String
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt1736.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt1736.txt
deleted file mode 100644
index a986a0328df..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt1736.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1736">
-namespace kt1736
-
-internal final val Obj: kt1736.Obj
-internal final val x: jet.Tuple0
-// </namespace name="kt1736">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt174.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt174.txt
deleted file mode 100644
index 047a3793ab7..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt174.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace <root>
-
-internal abstract trait Tree : jet.Any {
-}
-internal final fun jet.Any?.TreeValue(): Tree
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt201.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt201.txt
deleted file mode 100644
index 282c6084781..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt201.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun foo(): jet.Tuple0
-internal final fun </*0*/ T : jet.Any>T?.npe(): T
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt235.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt235.txt
deleted file mode 100644
index 3e1f8c1ff93..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt235.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace <root>
-
-// <namespace name="kt235">
-namespace kt235
-
-internal final class kt235.MyArray : jet.Any {
-    public final /*constructor*/ fun <init>(): kt235.MyArray
-    internal final fun get(/*0*/ i: jet.Int): jet.Int
-    internal final fun set(/*0*/ i: jet.Int, /*1*/ value: jet.Int): jet.Int
-}
-internal final class kt235.MyArray1 : jet.Any {
-    public final /*constructor*/ fun <init>(): kt235.MyArray1
-    internal final fun get(/*0*/ i: jet.Int): jet.Int
-    internal final fun set(/*0*/ i: jet.Int, /*1*/ value: jet.Int): jet.Tuple0
-}
-internal final class kt235.MyNumber : jet.Any {
-    public final /*constructor*/ fun <init>(): kt235.MyNumber
-    internal final fun inc(): kt235.MyNumber
-}
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-// </namespace name="kt235">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt2376.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt2376.txt
deleted file mode 100644
index 1a03ee863d5..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt2376.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace <root>
-
-public open class Test : java.lang.Object {
-    public final /*constructor*/ fun <init>(): Test
-    protected open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    package open fun number(/*0*/ n: jet.Number?): jet.Tuple0
-    public open override /*1*/ fun toString(): jet.String?
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt251.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt251.txt
deleted file mode 100644
index d508ebfcc28..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt251.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal final var a: jet.Any
-    internal final val b: jet.Int
-    internal final val c: jet.Int
-    internal final val d: jet.Int
-    internal final val e: jet.Int
-    internal final var x: jet.Int
-    internal final val y: jet.Int
-    internal final val z: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt258.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt258.txt
deleted file mode 100644
index d8b05485691..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt258.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun </*0*/ K : jet.Any?, /*1*/ V : jet.Any?>java.util.Map<K, V>.set(/*0*/ key: K, /*1*/ value: V): jet.Tuple0
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt26-1.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt26-1.txt
deleted file mode 100644
index c797b60066a..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt26-1.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-// <namespace name="foo">
-namespace foo
-
-// </namespace name="foo">
-// <namespace name="bar">
-namespace bar
-
-// </namespace name="bar">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt26.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt26.txt
deleted file mode 100644
index 8cc56101dc6..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt26.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-// <namespace name="html">
-namespace html
-
-internal abstract class html.Factory</*0*/ T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): html.Factory<T>
-    internal final fun create(): T?
-}
-// </namespace name="html">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt282.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt282.txt
deleted file mode 100644
index b4cf816c533..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt282.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-internal final class Set : jet.Any {
-    public final /*constructor*/ fun <init>(): Set
-    internal final fun contains(/*0*/ x: jet.Int): jet.Boolean
-}
-internal final fun jet.Int?.contains(/*0*/ x: jet.Int): jet.Boolean
-internal final fun f(): jet.Tuple0
-internal final fun Set?.plus(/*0*/ x: jet.Int): jet.Int
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt287.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt287.txt
deleted file mode 100644
index 977f81dc7c0..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt287.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace <root>
-
-internal final val attributes: java.util.Map<jet.String, jet.String>
-internal final fun attributes(): java.util.Map<jet.String, jet.String>
-internal final fun foo(/*0*/ m: java.util.Map<jet.String, jet.String>): jet.Tuple0
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt302.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt302.txt
deleted file mode 100644
index 9ccb8bbc7b3..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt302.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace <root>
-
-// <namespace name="kt302">
-namespace kt302
-
-internal abstract trait kt302.A : jet.Any {
-    internal open fun foo(): jet.Tuple0
-}
-internal abstract trait kt302.B : jet.Any {
-    internal open fun foo(): jet.Tuple0
-}
-internal final class kt302.C : kt302.A, kt302.B {
-    public final /*constructor*/ fun <init>(): kt302.C
-    internal open override /*2*/ fun foo(): jet.Tuple0
-}
-// </namespace name="kt302">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt306.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt306.txt
deleted file mode 100644
index 1b83462abec..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt306.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace <root>
-
-internal final class Barr : jet.Any {
-    public final /*constructor*/ fun <init>(): Barr
-    internal final fun bar(): jet.Tuple0
-}
-internal final class Foo : jet.Any {
-    public final /*constructor*/ fun <init>(): Foo
-    internal final fun bar(): jet.Tuple0
-}
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt307.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt307.txt
deleted file mode 100644
index 9f982e8ca56..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt307.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-internal open class AL : jet.Any {
-    public final /*constructor*/ fun <init>(): AL
-    internal final fun get(/*0*/ i: jet.Int): jet.Any?
-}
-internal abstract trait ALE</*0*/ T : jet.Any?> : AL {
-    internal final override /*1*/ fun get(/*0*/ i: jet.Int): jet.Any?
-    internal open fun getOrNull(/*0*/ index: jet.Int, /*1*/ value: T): T
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt312.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt312.txt
deleted file mode 100644
index c41c0e08376..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt312.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace <root>
-
-internal final val args: jet.Array<jet.String>
-internal final val name: jet.String
-internal final val name1: jet.String?
-internal final fun </*0*/ T : jet.Any?>jet.Array<out T>.safeGet(/*0*/ index: jet.Int): T?
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt313.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt313.txt
deleted file mode 100644
index 72bc183d98c..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt313.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun </*0*/ T : jet.Any?>jet.Iterable<T>.join(/*0*/ separator: jet.String?): jet.String
-internal final fun </*0*/ T : jet.Any>T?.npe(): T
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt316.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt316.txt
deleted file mode 100644
index a72a4477360..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt316.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace <root>
-
-internal open class A : B {
-    public final /*constructor*/ fun <init>(): A
-    internal open override /*1*/ fun bar(): jet.Tuple0
-    internal open override /*1*/ fun foo(): jet.Tuple0
-}
-internal abstract trait B : jet.Any {
-    internal open fun bar(): jet.Tuple0
-    internal open fun foo(): jet.Tuple0
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt328.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt328.txt
deleted file mode 100644
index 67e35484a7c..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt328.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal final val x: jet.Function0<[ERROR : <return type>]>
-}
-internal final val x: jet.Function0<[ERROR : <return type>]>
-internal final val z: [ERROR : Type for z]
-internal final fun bar1(): jet.Function0<[ERROR : <return type>]>
-internal final fun bar2(): jet.Function0<jet.Tuple0>
-internal final fun bar3(): jet.Tuple0
-internal final fun block(/*0*/ f: jet.Function0<jet.Tuple0>): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt335.336.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt335.336.txt
deleted file mode 100644
index b0b9b6526ec..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt335.336.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun </*0*/ T : jet.Any?>java.util.List<T>.plus(/*0*/ other: java.util.List<T>): java.util.List<T>
-internal final fun </*0*/ T : jet.Comparable<T>>java.util.List<T>.sort(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt337.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt337.txt
deleted file mode 100644
index 955e222056b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt337.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal final fun foo(): jet.Tuple0
-}
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt352.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt352.txt
deleted file mode 100644
index 1597cca1815..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt352.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace <root>
-
-// <namespace name="kt352">
-namespace kt352
-
-internal final class kt352.A : jet.Any {
-    public final /*constructor*/ fun <init>(): kt352.A
-    internal final val f: jet.Function1<jet.Any, jet.Tuple0>
-}
-internal final val f: jet.Function1<jet.Any, jet.Tuple0>
-internal final val g: jet.Function0<jet.Tuple0>
-internal final val h: jet.Function0<jet.Tuple0>
-internal final val testIt: jet.Function1<jet.Any, jet.Tuple0>
-internal final fun doSmth(): jet.Int
-internal final fun doSmth(/*0*/ a: jet.String): jet.Tuple0
-internal final fun foo(): jet.Tuple0
-// </namespace name="kt352">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt353.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt353.txt
deleted file mode 100644
index a6b746fac2e..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt353.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace <root>
-
-internal abstract trait A : jet.Any {
-    internal abstract fun </*0*/ T : jet.Any?>gen(): T
-}
-internal final fun foo(/*0*/ a: A): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt385.109.441.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt385.109.441.txt
deleted file mode 100644
index 2cbf0ee5a0f..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt385.109.441.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-internal final fun box(): jet.String
-internal final fun </*0*/ T : jet.Any?>jet.Iterable<T>.foreach(/*0*/ operation: jet.Function1<T, jet.Tuple0>): jet.Tuple0
-internal final fun </*0*/ T : jet.Any?>jet.Iterable<T>.foreach(/*0*/ operation: jet.Function2<jet.Int, T, jet.Tuple0>): jet.Tuple0
-internal final fun </*0*/ T : jet.Any?>jet.Iterator<T>.foreach(/*0*/ operation: jet.Function1<T, jet.Tuple0>): jet.Tuple0
-internal final fun </*0*/ T : jet.Any?>jet.Iterator<T>.foreach(/*0*/ operation: jet.Function2<jet.Int, T, jet.Tuple0>): jet.Tuple0
-internal final fun </*0*/ T : jet.Any?>generic_invoker(/*0*/ gen: jet.Function0<T>): T
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-internal final fun println(/*0*/ message: jet.Int): jet.Tuple0
-internal final fun println(/*0*/ message: jet.Long): jet.Tuple0
-internal final fun </*0*/ T : jet.Any?>run(/*0*/ body: jet.Function0<T>): T
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt398.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt398.txt
deleted file mode 100644
index dbe7a9bc4f8..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt398.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final class X</*0*/ T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): X<T>
-    internal final val check: jet.Function1<jet.Any, jet.Boolean>
-}
-internal final fun box(): jet.String
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt399.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt399.txt
deleted file mode 100644
index 087509a1883..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt399.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun box(): jet.String
-internal final fun </*0*/ T : jet.Any?>getSameTypeChecker(/*0*/ obj: T): jet.Function1<jet.Any, jet.Boolean>
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt402.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt402.txt
deleted file mode 100644
index bef4752805f..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt402.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="kt402">
-namespace kt402
-
-internal final fun f(): jet.Function1<jet.Any, jet.Boolean>
-internal final fun getTypeChecker(): jet.Function1<jet.Any, jet.Boolean>
-// </namespace name="kt402">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt41.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt41.txt
deleted file mode 100644
index 0fb842f2c66..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt41.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="kt41">
-namespace kt41
-
-internal final fun aaa(): [ERROR : Error function type]
-internal final fun bbb(): jet.Tuple0
-// </namespace name="kt41">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt411.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt411.txt
deleted file mode 100644
index ea60c1f0cd3..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt411.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-// <namespace name="kt411">
-namespace kt411
-
-internal final fun f(): jet.Tuple0
-internal final fun invoker(/*0*/ gen: jet.Function0<jet.Int>): jet.Int
-internal final fun t1(): jet.Tuple0
-internal final fun t2(): jet.String
-internal final fun t3(): jet.String
-internal final fun t4(): jet.Int
-// </namespace name="kt411">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt439.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt439.txt
deleted file mode 100644
index c35601905d8..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt439.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun main1(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-internal final fun </*0*/ T : jet.Any?>run1(/*0*/ body: jet.Function0<T>): T
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt442.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt442.txt
deleted file mode 100644
index ec55b504b98..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt442.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-internal final fun box(): jet.String
-internal final fun </*0*/ T : jet.Any?>funny(/*0*/ f: jet.Function0<T>): T
-internal final fun </*0*/ T : jet.Any?>funny2(/*0*/ f: jet.Function1<T, T>): T
-internal final fun </*0*/ T : jet.Any?>generic_invoker(/*0*/ gen: jet.Function1<jet.String, T>): T
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-internal final fun testFunny(): jet.Tuple0
-internal final fun testFunny2(): jet.Tuple0
-internal final fun </*0*/ T : jet.Any?>T.with(/*0*/ f: jet.ExtensionFunction0<T, jet.Tuple0>): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt443.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt443.txt
deleted file mode 100644
index 1d3ff8dddb0..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt443.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace <root>
-
-internal open class M : jet.Any {
-    public final /*constructor*/ fun <init>(): M
-    internal open val b: jet.Int
-}
-internal final class N : M {
-    public final /*constructor*/ fun <init>(): N
-    internal final val a: jet.Int
-    internal open override /*1*/ val b: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt455.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt455.txt
deleted file mode 100644
index decaf847119..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt455.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="kt455">
-namespace kt455
-
-internal final fun doSmth(/*0*/ i: jet.Int): jet.Tuple0
-internal final fun foo(): jet.Tuple0
-// </namespace name="kt455">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt456.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt456.txt
deleted file mode 100644
index 5e1da2e3112..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt456.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace <root>
-
-// <namespace name="kt456">
-namespace kt456
-
-internal final class kt456.A : jet.Any {
-    public final /*constructor*/ fun <init>(): kt456.A
-    internal final val i: jet.Int
-}
-internal final class kt456.B : jet.Any {
-    public final /*constructor*/ fun <init>(): kt456.B
-    internal final val i: jet.Int
-}
-internal final class kt456.C : jet.Any {
-    public final /*constructor*/ fun <init>(): kt456.C
-    internal final val i: jet.Int
-}
-internal final fun doSmth(): jet.Tuple0
-// </namespace name="kt456">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt459.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt459.txt
deleted file mode 100644
index d8b05485691..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt459.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun </*0*/ K : jet.Any?, /*1*/ V : jet.Any?>java.util.Map<K, V>.set(/*0*/ key: K, /*1*/ value: V): jet.Tuple0
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt469.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt469.txt
deleted file mode 100644
index 4ca0d641485..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt469.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace <root>
-
-// <namespace name="kt469">
-namespace kt469
-
-internal final class kt469.MyNumber : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ i: jet.Int): kt469.MyNumber
-    internal final var i: jet.Int
-    internal final fun minusAssign(/*0*/ m: kt469.MyNumber): jet.Tuple0
-}
-internal final fun bar(/*0*/ list: java.util.List<jet.Int>): jet.Tuple0
-internal final fun foo(): jet.Tuple0
-internal final fun </*0*/ T : jet.Any?>java.util.List<T>.plusAssign(/*0*/ t: T): jet.Tuple0
-// </namespace name="kt469">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt498.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt498.txt
deleted file mode 100644
index e17c5a9b569..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt498.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-internal final class IdUnavailableException : java.lang.Exception {
-    public final /*constructor*/ fun <init>(): IdUnavailableException
-    public final override /*1*/ fun getCause(): jet.Throwable?
-    public final override /*1*/ fun getMessage(): jet.String?
-    public final override /*1*/ fun printStackTrace(): jet.Tuple0
-}
-internal final fun </*0*/ T : jet.Any>T.getJavaClass(): java.lang.Class<T>
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt524.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt524.txt
deleted file mode 100644
index 5d8c9ce2cea..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt524.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-// <namespace name="StringBuilder">
-namespace StringBuilder
-
-internal final val jet.Int.bd: java.lang.StringBuilder
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-internal final fun java.lang.StringBuilder.plus(/*0*/ other: java.lang.StringBuilder): java.lang.StringBuilder
-internal final fun </*0*/ T : jet.Any>T?.sure1(): T
-// </namespace name="StringBuilder">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt526UnresolvedReferenceInnerStatic.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt526UnresolvedReferenceInnerStatic.txt
deleted file mode 100644
index 902c1efe49f..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt526UnresolvedReferenceInnerStatic.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace <root>
-
-// <namespace name="demo">
-namespace demo
-
-internal final class demo.Foo : jet.Any {
-    public final /*constructor*/ fun <init>(): demo.Foo
-    internal final class object demo.Foo.<no name provided> : jet.Any {
-        internal final /*constructor*/ fun <init>(): demo.Foo.<no name provided>
-        internal final class demo.Foo.<no name provided>.Bar : jet.Any {
-            public final /*constructor*/ fun <init>(): demo.Foo.<no name provided>.Bar
-        }
-    }
-}
-internal final class demo.User : jet.Any {
-    public final /*constructor*/ fun <init>(): demo.User
-    internal final fun main(): jet.Tuple0
-}
-// </namespace name="demo">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt549.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt549.txt
deleted file mode 100644
index f125786e17e..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt549.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="demo">
-namespace demo
-
-internal final fun </*0*/ T : jet.Any?>filter(/*0*/ list: jet.Array<T>, /*1*/ filter: jet.Function1<T, jet.Boolean>): java.util.List<T>
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-// </namespace name="demo">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt557.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt557.txt
deleted file mode 100644
index a26707c1a3c..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt557.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun jet.Array<jet.String>.length(): jet.Int
-internal final fun test(/*0*/ array: jet.Array<jet.String?>?): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt571.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt571.txt
deleted file mode 100644
index 86a4a28757d..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt571.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-private final fun double(/*0*/ d: jet.Int): jet.Int
-internal final fun </*0*/ T : jet.Any?, /*1*/ R : jet.Any?>let(/*0*/ t: T, /*1*/ body: jet.Function1<T, R>): R
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt575.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt575.txt
deleted file mode 100644
index a72131dd04f..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt575.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace <root>
-
-// <namespace name="kt575">
-namespace kt575
-
-internal final class kt575.Creature : jet.Any {
-    public final /*constructor*/ fun <init>(): kt575.Creature
-    internal final val A: kt575.Creature.A
-    internal final class kt575.Creature.C : jet.Any {
-        public final /*constructor*/ fun <init>(): kt575.Creature.C
-        internal final var ccc: jet.Int
-    }
-    internal final class object kt575.Creature.<no name provided> : jet.Any {
-        internal final /*constructor*/ fun <init>(): kt575.Creature.<no name provided>
-        internal final var numCreated: jet.Int private set
-    }
-}
-// </namespace name="kt575">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt58.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt58.txt
deleted file mode 100644
index f09add8b664..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt58.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace <root>
-
-// <namespace name="kt58">
-namespace kt58
-
-internal final fun doSmth(/*0*/ i: jet.Int): jet.Tuple0
-internal final fun </*0*/ T : jet.Any?>lock(/*0*/ lock: java.util.concurrent.locks.Lock, /*1*/ body: jet.Function0<T>): T
-internal final fun t1(): jet.Int
-internal final fun t2(): jet.Int
-internal final fun t3(): jet.Int
-internal final fun t4(): jet.Int
-internal final fun t5(): jet.Int
-internal final fun t6(): jet.Int
-internal final fun t7(): jet.Int
-// </namespace name="kt58">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt580.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt580.txt
deleted file mode 100644
index 131cc4f4c70..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt580.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace <root>
-
-// <namespace name="whats">
-namespace whats
-
-// <namespace name="the">
-namespace the
-
-// <namespace name="difference">
-namespace difference
-
-internal final val  </*0*/ T : jet.Any?> jet.Array<T>.lastIndex: jet.Int
-internal final fun iarray(/*0*/ vararg a: jet.String /*jet.Array<jet.String>*/): jet.Array<jet.String>
-internal final fun </*0*/ T : jet.Any?>jet.Array<T>.lastIndex(): jet.Int
-internal final fun main(): jet.Tuple0
-// </namespace name="difference">
-// </namespace name="the">
-// </namespace name="whats">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt588.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt588.txt
deleted file mode 100644
index 5a55484f8e6..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt588.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-namespace <root>
-
-internal final class Test : java.lang.Thread {
-    public final /*constructor*/ fun <init>(): Test
-    public final override /*1*/ fun checkAccess(): jet.Tuple0
-    protected open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun countStackFrames(): jet.Int
-    public open override /*1*/ fun destroy(): jet.Tuple0
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun getContextClassLoader(): java.lang.ClassLoader?
-    public open override /*1*/ fun getId(): jet.Long
-    public final override /*1*/ fun getName(): jet.String?
-    public final override /*1*/ fun getPriority(): jet.Int
-    public open override /*1*/ fun getStackTrace(): jet.Array<[ERROR : Unresolved java class: StackTraceElement]>?
-    public final override /*1*/ fun getThreadGroup(): [ERROR : Unresolved java class: ThreadGroup]
-    public open override /*1*/ fun hashCode(): jet.Int
-    invisible_fake abstract override /*1*/ var inheritableThreadLocals: java.lang.ThreadLocal.ThreadLocalMap?
-    public open override /*1*/ fun interrupt(): jet.Tuple0
-    public final override /*1*/ fun isAlive(): jet.Boolean
-    public final override /*1*/ fun isDaemon(): jet.Boolean
-    public open override /*1*/ fun isInterrupted(): jet.Boolean
-    public final override /*1*/ fun join(): jet.Tuple0
-    public final override /*1*/ fun join(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun join(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    public final override /*1*/ fun resume(): jet.Tuple0
-    public open override /*1*/ fun run(): jet.Tuple0
-    public open override /*1*/ fun setContextClassLoader(/*0*/ p0: java.lang.ClassLoader?): jet.Tuple0
-    public final override /*1*/ fun setDaemon(/*0*/ p0: jet.Boolean): jet.Tuple0
-    public final override /*1*/ fun setName(/*0*/ p0: jet.String?): jet.Tuple0
-    public final override /*1*/ fun setPriority(/*0*/ p0: jet.Int): jet.Tuple0
-    public open override /*1*/ fun start(): jet.Tuple0
-    public final override /*1*/ fun stop(): jet.Tuple0
-    public final override /*1*/ fun stop(/*0*/ p0: jet.Throwable?): jet.Tuple0
-    public final override /*1*/ fun suspend(): jet.Tuple0
-    invisible_fake abstract override /*1*/ var threadLocals: java.lang.ThreadLocal.ThreadLocalMap?
-    public open override /*1*/ fun toString(): jet.String?
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-    internal final class object Test.<no name provided> : jet.Any {
-        internal final /*constructor*/ fun <init>(): Test.<no name provided>
-        internal final fun init2(): jet.Tuple0
-    }
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt597.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt597.txt
deleted file mode 100644
index e944d823e3b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt597.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace <root>
-
-internal final fun </*0*/ T : jet.Any?>jet.Array<T>?.get(/*0*/ i: jet.Int): T
-internal final fun jet.Int?.inc(): jet.Int
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt600.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt600.txt
deleted file mode 100644
index dd05b09a9fa..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt600.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final fun </*0*/ T : jet.Any>T?._sure(): T
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt604.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt604.txt
deleted file mode 100644
index f0952c956b3..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt604.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace <root>
-
-internal abstract trait ChannelPipeline : jet.Any {
-}
-internal abstract trait ChannelPipelineFactory : jet.Any {
-    internal abstract fun getPipeline(): ChannelPipeline
-}
-internal final class DefaultChannelPipeline : ChannelPipeline {
-    public final /*constructor*/ fun <init>(): DefaultChannelPipeline
-}
-internal final class StandardPipelineFactory : ChannelPipelineFactory {
-    public final /*constructor*/ fun <init>(/*0*/ config: jet.ExtensionFunction0<ChannelPipeline, jet.Tuple0>): StandardPipelineFactory
-    internal final val config: jet.ExtensionFunction0<ChannelPipeline, jet.Tuple0>
-    internal open override /*1*/ fun getPipeline(): ChannelPipeline
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt618.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt618.txt
deleted file mode 100644
index 3ff11450de4..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt618.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace <root>
-
-// <namespace name="lol">
-namespace lol
-
-internal final class lol.B : jet.Any {
-    public final /*constructor*/ fun <init>(): lol.B
-    internal final fun divAssign(/*0*/ other: lol.B): jet.String
-    internal final fun minusAssign(/*0*/ other: lol.B): jet.String
-    internal final fun modAssign(/*0*/ other: lol.B): jet.String
-    internal final fun plusAssign(/*0*/ other: lol.B): jet.String
-    internal final fun timesAssign(/*0*/ other: lol.B): jet.String
-}
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-// </namespace name="lol">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt629.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt629.txt
deleted file mode 100644
index c4af41b826e..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt629.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-// <namespace name="kt629">
-namespace kt629
-
-internal final class kt629.A : jet.Any {
-    public final /*constructor*/ fun <init>(): kt629.A
-    internal final fun mod(/*0*/ other: kt629.A): kt629.A
-    internal final var p: jet.String
-}
-internal final fun box(): jet.Boolean
-internal final fun box2(): jet.Boolean
-// </namespace name="kt629">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt630.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt630.txt
deleted file mode 100644
index 6bc93b1f274..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt630.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final val s: jet.String
-internal final val x: jet.String
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt688.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt688.txt
deleted file mode 100644
index 0597951b0d4..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt688.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace <root>
-
-internal open class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-}
-internal open class B : A {
-    public final /*constructor*/ fun <init>(): B
-    internal final fun b(): B
-}
-internal final class C : jet.Any {
-    public final /*constructor*/ fun <init>(): C
-    internal final fun </*0*/ T : jet.Any?>a(/*0*/ x: jet.Function1<T, T>, /*1*/ y: T): T
-    internal final val x: B
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt691.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt691.txt
deleted file mode 100644
index 59032b1330c..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt691.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace <root>
-
-// <namespace name="foo">
-namespace foo
-
-// <namespace name="bar">
-namespace bar
-
-// <namespace name="buz">
-namespace buz
-
-// </namespace name="buz">
-// </namespace name="bar">
-// </namespace name="foo">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt701.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt701.txt
deleted file mode 100644
index 7a4b28eaa8b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt701.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace <root>
-
-public final class Throwables : jet.Any {
-    public final /*constructor*/ fun <init>(): Throwables
-    internal final class object Throwables.<no name provided> : jet.Any {
-        internal final /*constructor*/ fun <init>(): Throwables.<no name provided>
-        public final fun </*0*/ X : jet.Throwable?>propagateIfInstanceOf(/*0*/ throwable: jet.Throwable?, /*1*/ declaredType: java.lang.Class<X?>?): jet.Tuple0
-        public final fun propagateIfPossible(/*0*/ throwable: jet.Throwable?): jet.Tuple0
-    }
-}
-internal final fun </*0*/ T : jet.Any?>getJavaClass(): java.lang.Class<T>
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt716.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt716.txt
deleted file mode 100644
index bd191ad0fc6..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt716.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-internal final class TypeInfo</*0*/ T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): TypeInfo<T>
-}
-internal final fun </*0*/ T : jet.Any?>TypeInfo<T>.getJavaClass(): java.lang.Class<T>
-internal final fun </*0*/ T : jet.Any?>getJavaClass(): java.lang.Class<T>
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
-internal final fun </*0*/ T : jet.Any?>typeinfo(): TypeInfo<T>
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt743.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt743.txt
deleted file mode 100644
index bf9c380a76d..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt743.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-internal final class List</*0*/ T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(/*0*/ head: T, /*1*/ tail: List<T>? = ?): List<T>
-    internal final val head: T
-    internal final val tail: List<T>?
-}
-internal final fun </*0*/ T : jet.Any?>foo(/*0*/ t: T): T
-internal final fun </*0*/ T : jet.Any?, /*1*/ Q : jet.Any?>List<T>.map(/*0*/ f: jet.Function1<T, Q>): List<T>?
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt750.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt750.txt
deleted file mode 100644
index dc622bf14c5..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt750.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt762.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt762.txt
deleted file mode 100644
index dc622bf14c5..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt762.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt847.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt847.txt
deleted file mode 100644
index 70b47b23e17..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt847.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun </*0*/ T : jet.Any?>T.mustBe(/*0*/ t: T): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt860.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt860.txt
deleted file mode 100644
index 7d99e93722a..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt860.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-// <namespace name="kotlin">
-namespace kotlin
-
-// <namespace name="util">
-namespace util
-
-internal final fun </*0*/ T : jet.Any?, /*1*/ U : java.util.Collection<in T>>jet.Iterator<T>.to(/*0*/ container: U): U
-internal final fun </*0*/ T : jet.Any?>jet.Iterator<T>.toArrayList(): java.util.ArrayList<T>
-// </namespace name="util">
-// </namespace name="kotlin">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/ImportFromCurrentWithDifferentName.txt b/compiler/testData/lazyResolve/diagnostics/scopes/ImportFromCurrentWithDifferentName.txt
deleted file mode 100644
index 4ea07c437bb..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/ImportFromCurrentWithDifferentName.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-internal final class a.A : jet.Any {
-    public final /*constructor*/ fun <init>(): a.A
-}
-// </namespace name="a">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/ImportTwoTimes.txt b/compiler/testData/lazyResolve/diagnostics/scopes/ImportTwoTimes.txt
deleted file mode 100644
index b024e5ffd08..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/ImportTwoTimes.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-// <namespace name="weatherForecast">
-namespace weatherForecast
-
-internal final fun weatherToday(): jet.String
-// </namespace name="weatherForecast">
-// <namespace name="myApp">
-namespace myApp
-
-internal final fun needUmbrella(): jet.Boolean
-// </namespace name="myApp">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/ImportTwoTimesStar.txt b/compiler/testData/lazyResolve/diagnostics/scopes/ImportTwoTimesStar.txt
deleted file mode 100644
index b024e5ffd08..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/ImportTwoTimesStar.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-// <namespace name="weatherForecast">
-namespace weatherForecast
-
-internal final fun weatherToday(): jet.String
-// </namespace name="weatherForecast">
-// <namespace name="myApp">
-namespace myApp
-
-internal final fun needUmbrella(): jet.Boolean
-// </namespace name="myApp">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/Imports-hidden.txt b/compiler/testData/lazyResolve/diagnostics/scopes/Imports-hidden.txt
deleted file mode 100644
index 4371ead246a..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/Imports-hidden.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-// </namespace name="a">
-// <namespace name="b">
-namespace b
-
-internal final val O: b.O
-// </namespace name="b">
-// <namespace name="c">
-namespace c
-
-internal final val O: c.O
-// </namespace name="c">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/Imports.txt b/compiler/testData/lazyResolve/diagnostics/scopes/Imports.txt
deleted file mode 100644
index a702ebf5740..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/Imports.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-internal final fun test(/*0*/ arg: b.B): jet.Tuple0
-// </namespace name="a">
-// <namespace name="b">
-namespace b
-
-internal final class b.B : jet.Any {
-    public final /*constructor*/ fun <init>(): b.B
-}
-internal final class b.C : jet.Any {
-    public final /*constructor*/ fun <init>(): b.C
-    internal final class object b.C.<no name provided> : jet.Any {
-        internal final /*constructor*/ fun <init>(): b.C.<no name provided>
-        internal final fun bar(): jet.Tuple0
-        internal final val cValue: jet.Int
-    }
-}
-internal final class b.D : jet.Any {
-    public final /*constructor*/ fun <init>(): b.D
-    internal final val dValue: jet.String
-    internal final fun fff(/*0*/ s: jet.String): jet.String
-}
-internal final class b.E : jet.Any {
-    public final /*constructor*/ fun <init>(): b.E
-    internal final class object b.E.<no name provided> : jet.Any {
-        internal final /*constructor*/ fun <init>(): b.E.<no name provided>
-        internal final val f: b.F
-    }
-}
-internal final class b.F : jet.Any {
-    public final /*constructor*/ fun <init>(): b.F
-    internal final fun f(): jet.Tuple0
-}
-internal final val constant: b.D
-internal final val value: jet.Int
-internal final fun bar(): jet.Tuple0
-internal final fun b.B.ext(): jet.Tuple0
-internal final fun foo(/*0*/ i: jet.Int): jet.Int
-// </namespace name="b">
-// <namespace name="c">
-namespace c
-
-internal final val C: c.C
-internal final fun foo(): jet.Tuple0
-// </namespace name="c">
-// <namespace name="d">
-namespace d
-
-internal final class d.A : jet.Any {
-    public final /*constructor*/ fun <init>(): d.A
-    internal final class object d.A.<no name provided> : jet.Any {
-        internal final /*constructor*/ fun <init>(): d.A.<no name provided>
-        internal final val C: d.A.<no name provided>.C
-        internal open class d.A.<no name provided>.B : jet.Any {
-            public final /*constructor*/ fun <init>(): d.A.<no name provided>.B
-        }
-    }
-}
-internal final val b: d.A.<no name provided>.B
-internal final val c: d.A.<no name provided>.B
-// </namespace name="d">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/ImportsConflicting.txt b/compiler/testData/lazyResolve/diagnostics/scopes/ImportsConflicting.txt
deleted file mode 100644
index 811a9bcabf7..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/ImportsConflicting.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-// </namespace name="a">
-// <namespace name="b">
-namespace b
-
-internal final fun foo(): jet.Int
-// </namespace name="b">
-// <namespace name="c">
-namespace c
-
-internal final fun foo(): jet.Int
-// </namespace name="c">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/ImportsUselessSimpleImport.txt b/compiler/testData/lazyResolve/diagnostics/scopes/ImportsUselessSimpleImport.txt
deleted file mode 100644
index ec5450c3f40..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/ImportsUselessSimpleImport.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-internal final val B: a.B
-// </namespace name="a">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/ImportsUselessSimpleImport2.txt b/compiler/testData/lazyResolve/diagnostics/scopes/ImportsUselessSimpleImport2.txt
deleted file mode 100644
index 00624fddb8a..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/ImportsUselessSimpleImport2.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-// </namespace name="a">
-// <namespace name="b">
-namespace b
-
-internal final class b.B : jet.Any {
-    public final /*constructor*/ fun <init>(): b.B
-}
-// </namespace name="b">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/VisibilityInheritModifier.txt b/compiler/testData/lazyResolve/diagnostics/scopes/VisibilityInheritModifier.txt
deleted file mode 100644
index d9bbb298bd0..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/VisibilityInheritModifier.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-namespace <root>
-
-// <namespace name="b">
-namespace b
-
-internal open class b.A : jet.Any {
-    public final /*constructor*/ fun <init>(): b.A
-    internal open fun foo(): jet.Tuple0
-}
-internal final class b.B : b.A {
-    public final /*constructor*/ fun <init>(): b.B
-    protected open override /*1*/ fun foo(): jet.Tuple0
-}
-internal final class b.C : b.A {
-    public final /*constructor*/ fun <init>(): b.C
-    internal open override /*1*/ fun foo(): jet.Tuple0
-}
-internal open class b.D : jet.Any {
-    public final /*constructor*/ fun <init>(): b.D
-    private open fun self(): b.D
-}
-internal final class b.E : b.D {
-    public final /*constructor*/ fun <init>(): b.E
-    internal open fun self(): b.E
-    internal final fun test(): jet.Tuple0
-}
-internal open class b.F : jet.Any {
-    public final /*constructor*/ fun <init>(): b.F
-    protected open fun protected_fun(): jet.Tuple0
-}
-internal final class b.G : b.F {
-    public final /*constructor*/ fun <init>(): b.G
-    protected open override /*1*/ fun protected_fun(): jet.Tuple0
-}
-internal open class b.H : jet.Any {
-    public final /*constructor*/ fun <init>(): b.H
-    protected open fun pi_fun(): jet.Tuple0
-}
-internal final class b.I : b.H {
-    public final /*constructor*/ fun <init>(): b.I
-    protected open override /*1*/ fun pi_fun(): jet.Tuple0
-}
-internal final class b.J : b.H {
-    public final /*constructor*/ fun <init>(): b.J
-    internal open override /*1*/ fun pi_fun(): jet.Tuple0
-}
-internal final class b.K : b.H {
-    public final /*constructor*/ fun <init>(): b.K
-    public open override /*1*/ fun pi_fun(): jet.Tuple0
-}
-internal open class b.L : b.T {
-    public final /*constructor*/ fun <init>(): b.L
-    public open override /*1*/ fun foo(): jet.Tuple0
-}
-internal final class b.M : b.L {
-    public final /*constructor*/ fun <init>(): b.M
-    internal open override /*1*/ fun foo(): jet.Tuple0
-}
-internal abstract trait b.P : b.R {
-    internal open override /*1*/ fun foo(): jet.Tuple0
-}
-internal abstract trait b.Q : b.R {
-    protected open override /*1*/ fun foo(): jet.Tuple0
-}
-internal abstract trait b.R : jet.Any {
-    protected open fun foo(): jet.Tuple0
-}
-internal final class b.S : b.P, b.Q {
-    public final /*constructor*/ fun <init>(): b.S
-    internal open override /*2*/ fun foo(): jet.Tuple0
-}
-internal abstract trait b.T : jet.Any {
-    public open fun foo(): jet.Tuple0
-}
-internal final fun test_fun_stays_protected(/*0*/ g: b.G): jet.Tuple0
-// </namespace name="b">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/initializerScopeOfExtensionProperty.txt b/compiler/testData/lazyResolve/diagnostics/scopes/initializerScopeOfExtensionProperty.txt
deleted file mode 100644
index 87773d626bb..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/initializerScopeOfExtensionProperty.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-namespace <root>
-
-// <namespace name="i">
-namespace i
-
-internal final class i.A : jet.Any {
-    public final /*constructor*/ fun <init>(): i.A
-    internal final val ii: jet.Int
-}
-internal final class i.C : jet.Any {
-    public final /*constructor*/ fun <init>(): i.C
-    internal final class i.C.D : jet.Any {
-        public final /*constructor*/ fun <init>(): i.C.D
-    }
-}
-internal final val i.C.bar: i.C.D
-internal final val jet.String.bd: [ERROR : <ERROR FUNCTION RETURN TYPE>]
-internal final val jet.String.bd1: jet.String
-internal final val i.A.foo: [ERROR : Type for ii]
-internal final val i.C.foo: i.C.D
-internal final val i.A.foo1: jet.Int
-internal final val i.C.foo1: i.C.D
-internal final val  </*0*/ T : jet.Any?> java.util.List<T>.length: [ERROR : Type for size()]
-internal final val  </*0*/ T : jet.Any?> java.util.List<T>.length1: jet.Int
-// </namespace name="i">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt1078.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt1078.txt
deleted file mode 100644
index 1b65f105bc8..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt1078.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1078">
-namespace kt1078
-
-internal final class kt1078.B : jet.Any {
-    public final /*constructor*/ fun <init>(): kt1078.B
-    internal final fun bar(): jet.Boolean
-}
-internal final fun foo(): kt1078.B
-internal final fun test(): kt1078.B
-// </namespace name="kt1078">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt1080.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt1080.txt
deleted file mode 100644
index 1df452aff48..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt1080.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1080">
-namespace kt1080
-
-internal final class kt1080.Some : jet.Any {
-    public final /*constructor*/ fun <init>(): kt1080.Some
-}
-// </namespace name="kt1080">
-// <namespace name="b">
-namespace b
-
-// <namespace name="d">
-namespace d
-
-public open class b.d.Test : jet.Any {
-    public final /*constructor*/ fun <init>(): b.d.Test
-}
-// </namespace name="d">
-// </namespace name="b">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt1244.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt1244.txt
deleted file mode 100644
index 49560a42e0c..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt1244.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1244">
-namespace kt1244
-
-internal final class kt1244.A : jet.Any {
-    public final /*constructor*/ fun <init>(): kt1244.A
-    private final var a: jet.String
-}
-internal final class kt1244.B : jet.Any {
-    public final /*constructor*/ fun <init>(): kt1244.B
-}
-// </namespace name="kt1244">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt1248.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt1248.txt
deleted file mode 100644
index 4054dfc25e0..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt1248.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1248">
-namespace kt1248
-
-internal abstract trait kt1248.ParseResult</*0*/ out T : jet.Any?> : jet.Any {
-    public abstract val success: jet.Boolean
-    public abstract val value: T
-}
-internal final class kt1248.Success</*0*/ T : jet.Any?> : kt1248.ParseResult<T> {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(/*0*/ value: T): kt1248.Success<T>
-    internal open override /*1*/ val success: jet.Boolean
-    internal open override /*1*/ val value: T
-}
-// </namespace name="kt1248">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt151.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt151.txt
deleted file mode 100644
index 6b5055cfa27..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt151.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-namespace <root>
-
-// <namespace name="kt151">
-namespace kt151
-
-internal open class kt151.A : jet.Any {
-    public final /*constructor*/ fun <init>(): kt151.A
-    protected open fun x(): jet.Tuple0
-}
-internal final class kt151.B : kt151.A {
-    public final /*constructor*/ fun <init>(): kt151.B
-    protected open override /*1*/ fun x(): jet.Tuple0
-}
-internal open class kt151.C : jet.Any {
-    public final /*constructor*/ fun <init>(): kt151.C
-    internal open fun foo(): jet.Tuple0
-}
-internal final class kt151.D : kt151.C, kt151.T {
-    public final /*constructor*/ fun <init>(): kt151.D
-    protected open override /*2*/ fun foo(): jet.Tuple0
-}
-internal final class kt151.E : kt151.C, kt151.T {
-    public final /*constructor*/ fun <init>(): kt151.E
-    internal open override /*2*/ fun foo(): jet.Tuple0
-}
-internal final class kt151.F : kt151.C, kt151.T {
-    public final /*constructor*/ fun <init>(): kt151.F
-    private open override /*2*/ fun foo(): jet.Tuple0
-}
-internal final class kt151.G : kt151.C, kt151.T {
-    public final /*constructor*/ fun <init>(): kt151.G
-    public open override /*2*/ fun foo(): jet.Tuple0
-}
-internal abstract trait kt151.T : jet.Any {
-    protected open fun foo(): jet.Tuple0
-}
-internal final fun test(/*0*/ b: kt151.B): jet.Tuple0
-// </namespace name="kt151">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt1579.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt1579.txt
deleted file mode 100644
index 690a2e8fa20..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt1579.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace <root>
-
-// <namespace name="lib">
-namespace lib
-
-internal abstract trait lib.WithInner : jet.Any {
-    internal abstract trait lib.WithInner.Inner : jet.Any {
-    }
-}
-// </namespace name="lib">
-// <namespace name="user">
-namespace user
-
-// </namespace name="user">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt1579_map_entry.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt1579_map_entry.txt
deleted file mode 100644
index cc98a11c4fb..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt1579_map_entry.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-internal final fun foo(/*0*/ b: java.util.Map.Entry<jet.String, jet.String>): java.util.Map.Entry<jet.String, jet.String>
-// </namespace name="a">
-// <namespace name="b">
-namespace b
-
-internal final fun bar(/*0*/ b: java.util.Map.Entry<jet.String, jet.String>): java.util.Map.Entry<jet.String, jet.String>
-// </namespace name="b">
-// <namespace name="c">
-namespace c
-
-internal final fun fff(/*0*/ b: java.util.Map.Entry<jet.String, jet.String>): java.util.Map.Entry<jet.String, jet.String>
-// </namespace name="c">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt1580.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt1580.txt
deleted file mode 100644
index 67c598ce182..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt1580.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace <root>
-
-// <namespace name="lib">
-namespace lib
-
-internal abstract trait lib.WithInner : jet.Any {
-    internal abstract trait lib.WithInner.Inner : jet.Any {
-    }
-}
-// </namespace name="lib">
-// <namespace name="user">
-namespace user
-
-internal final fun main(/*0*/ a: lib.WithInner, /*1*/ b: lib.WithInner.Inner): jet.Tuple0
-// </namespace name="user">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt1642.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt1642.txt
deleted file mode 100644
index 46adece16cb..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt1642.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-// <namespace name="java">
-namespace java
-
-// </namespace name="java">
-// </namespace name="a">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt1738.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt1738.txt
deleted file mode 100644
index 809fc1501c5..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt1738.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1738">
-namespace kt1738
-
-internal final class kt1738.A : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ i: jet.Int, /*1*/ j: jet.Int): kt1738.A
-    private final var i: jet.Int
-    internal final var j: jet.Int
-}
-internal final fun test(/*0*/ a: kt1738.A): jet.Tuple0
-// </namespace name="kt1738">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt1805.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt1805.txt
deleted file mode 100644
index 9d2471536b6..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt1805.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1805">
-namespace kt1805
-
-internal open class kt1805.Some : jet.Any {
-    public final /*constructor*/ fun <init>(): kt1805.Some
-    private final val privateField: jet.Int
-}
-internal final class kt1805.SomeSubclass : kt1805.Some {
-    public final /*constructor*/ fun <init>(): kt1805.SomeSubclass
-    invisible_fake abstract override /*1*/ val privateField: jet.Int private get
-    internal final fun test(): jet.Tuple0
-}
-internal final fun test(): jet.Tuple0
-// </namespace name="kt1805">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt1806.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt1806.txt
deleted file mode 100644
index 6b3e7850ff0..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt1806.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1806">
-namespace kt1806
-
-internal final val MyObject: kt1806.MyObject
-internal final val MyObject1: kt1806.<no name provided>
-internal final fun doSmth(/*0*/ s: jet.String): jet.String
-internal final fun test1(): jet.Tuple0
-internal final fun test2(): jet.Tuple0
-// </namespace name="kt1806">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt1822.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt1822.txt
deleted file mode 100644
index 42a10a651ed..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt1822.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-namespace <root>
-
-// <namespace name="kt1822">
-namespace kt1822
-
-internal open class kt1822.A : jet.Any {
-    public final /*constructor*/ fun <init>(): kt1822.A
-    internal open fun foo(): jet.Tuple0
-}
-internal abstract trait kt1822.B : jet.Any {
-    protected open fun foo(): jet.Tuple0
-}
-internal open class kt1822.C : jet.Any {
-    public final /*constructor*/ fun <init>(): kt1822.C
-    internal open fun foo(): jet.Tuple0
-}
-internal abstract trait kt1822.D : jet.Any {
-    public open fun foo(): jet.Tuple0
-}
-internal final class kt1822.E : kt1822.A, kt1822.B, kt1822.D {
-    public final /*constructor*/ fun <init>(): kt1822.E
-    public open override /*3*/ fun foo(): jet.Tuple0
-}
-internal final class kt1822.G : kt1822.C, kt1822.T {
-    public final /*constructor*/ fun <init>(): kt1822.G
-    public open override /*2*/ fun foo(): jet.Tuple0
-}
-internal abstract trait kt1822.T : jet.Any {
-    protected open fun foo(): jet.Tuple0
-}
-// </namespace name="kt1822">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt1942.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt1942.txt
deleted file mode 100644
index b617c8ea043..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt1942.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace <root>
-
-// <namespace name="d">
-namespace d
-
-internal final class d.A : a.C {
-    public final /*constructor*/ fun <init>(): d.A
-    protected open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    invisible_fake abstract override /*1*/ var myValue: jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    internal final fun test(): jet.Tuple0
-    public open override /*1*/ fun toString(): jet.String?
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
-// </namespace name="d">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt2262.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt2262.txt
deleted file mode 100644
index d988c4c6a40..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt2262.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace <root>
-
-// <namespace name="kt2262">
-namespace kt2262
-
-internal final class kt2262.Bar : kt2262.Foo {
-    public final /*constructor*/ fun <init>(): kt2262.Bar
-    protected final override /*1*/ val color: jet.String
-    protected final val i: jet.Int
-    internal final class kt2262.Bar.Baz : jet.Any {
-        public final /*constructor*/ fun <init>(): kt2262.Bar.Baz
-        internal final val copy: jet.String
-        internal final val j: jet.Int
-    }
-}
-internal abstract class kt2262.Foo : jet.Any {
-    public final /*constructor*/ fun <init>(): kt2262.Foo
-    protected final val color: jet.String
-}
-// </namespace name="kt2262">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt250.617.10.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt250.617.10.txt
deleted file mode 100644
index 761f0121937..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt250.617.10.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-namespace <root>
-
-// <namespace name="kt_250_617_10">
-namespace kt_250_617_10
-
-internal open class kt_250_617_10.A : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ x: jet.Int): kt_250_617_10.A
-    internal final val x: jet.Int
-}
-internal final class kt_250_617_10.B : kt_250_617_10.A {
-    public final /*constructor*/ fun <init>(/*0*/ y: jet.Int): kt_250_617_10.B
-    internal final override /*1*/ val x: jet.Int
-}
-internal final class kt_250_617_10.Body : kt_250_617_10.BodyTag {
-    public final /*constructor*/ fun <init>(): kt_250_617_10.Body
-    internal final override /*1*/ val attributes: java.util.HashMap<jet.String, jet.String>
-    internal final override /*1*/ val children: java.util.ArrayList<kt_250_617_10.Element>
-    internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
-    internal final override /*1*/ val name: jet.String
-}
-internal final class kt_250_617_10.Body1 : kt_250_617_10.BodyTag {
-    public final /*constructor*/ fun <init>(): kt_250_617_10.Body1
-    internal final override /*1*/ val attributes: java.util.HashMap<jet.String, jet.String>
-    internal final override /*1*/ val children: java.util.ArrayList<kt_250_617_10.Element>
-    internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
-    internal final override /*1*/ val name: jet.String
-}
-internal open class kt_250_617_10.BodyTag : kt_250_617_10.TagWithText {
-    public final /*constructor*/ fun <init>(/*0*/ name: jet.String): kt_250_617_10.BodyTag
-    internal final override /*1*/ val attributes: java.util.HashMap<jet.String, jet.String>
-    internal final override /*1*/ val children: java.util.ArrayList<kt_250_617_10.Element>
-    internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
-    internal final override /*1*/ val name: jet.String
-}
-internal open class kt_250_617_10.Element : jet.Any {
-    public final /*constructor*/ fun <init>(): kt_250_617_10.Element
-}
-internal open class kt_250_617_10.M : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ p: jet.Int): kt_250_617_10.M
-}
-internal final class kt_250_617_10.N : kt_250_617_10.A {
-    public final /*constructor*/ fun <init>(/*0*/ p: jet.Int): kt_250_617_10.N
-    internal final val p: jet.Int
-    internal final override /*1*/ val x: jet.Int
-}
-internal abstract class kt_250_617_10.Tag : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ name: jet.String): kt_250_617_10.Tag
-    internal final val attributes: java.util.HashMap<jet.String, jet.String>
-    internal final val children: java.util.ArrayList<kt_250_617_10.Element>
-    internal final val name: jet.String
-}
-internal abstract class kt_250_617_10.TagWithText : kt_250_617_10.Tag {
-    public final /*constructor*/ fun <init>(/*0*/ name: jet.String): kt_250_617_10.TagWithText
-    internal final override /*1*/ val attributes: java.util.HashMap<jet.String, jet.String>
-    internal final override /*1*/ val children: java.util.ArrayList<kt_250_617_10.Element>
-    internal final fun jet.String.plus(): jet.Tuple0
-    internal final override /*1*/ val name: jet.String
-}
-internal final class kt_250_617_10.TextElement : kt_250_617_10.Element {
-    public final /*constructor*/ fun <init>(/*0*/ name: jet.String): kt_250_617_10.TextElement
-}
-internal open class kt_250_617_10.X : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ p: jet.Int, /*1*/ r: jet.Int): kt_250_617_10.X
-    internal final val s: jet.String
-}
-internal final class kt_250_617_10.Y : kt_250_617_10.X {
-    public final /*constructor*/ fun <init>(/*0*/ i: jet.Int): kt_250_617_10.Y
-    internal final val rrr: jet.Int
-    internal final override /*1*/ val s: jet.String
-}
-internal final class kt_250_617_10.Z : kt_250_617_10.X {
-    public final /*constructor*/ fun <init>(/*0*/ i: jet.Int): kt_250_617_10.Z
-    internal final val i: jet.Int
-    internal final override /*1*/ val s: jet.String
-    internal final val x: jet.Int
-}
-// </namespace name="kt_250_617_10">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt323.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt323.txt
deleted file mode 100644
index 654e871d558..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt323.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace <root>
-
-// <namespace name="kt323">
-namespace kt323
-
-internal open class kt323.A : jet.Any {
-    public final /*constructor*/ fun <init>(): kt323.A
-    internal open var a: jet.Int
-}
-internal final class kt323.B : kt323.A {
-    public final /*constructor*/ fun <init>(): kt323.B
-    internal open override /*1*/ val a: jet.Int
-    internal final var b: jet.Int public get
-    protected final var c: jet.Int private set
-}
-// </namespace name="kt323">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt37.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt37.txt
deleted file mode 100644
index 71ec1ae45c0..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt37.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace <root>
-
-// <namespace name="kt37">
-namespace kt37
-
-internal final class kt37.C : jet.Any {
-    public final /*constructor*/ fun <init>(): kt37.C
-    private final var f: jet.Int
-}
-internal final fun box(): jet.String
-// </namespace name="kt37">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt421Scopes.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt421Scopes.txt
deleted file mode 100644
index 625a507c5a3..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt421Scopes.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
-    internal final val a: jet.Int
-    internal final val b: jet.Int
-    internal final val c: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt587.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt587.txt
deleted file mode 100644
index 6616986d1c7..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt587.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace <root>
-
-internal final class Main : jet.Any {
-    public final /*constructor*/ fun <init>(): Main
-    internal final class object Main.<no name provided> : jet.Any {
-        internal final /*constructor*/ fun <init>(): Main.<no name provided>
-        internal final class Main.<no name provided>.States : jet.Any {
-            public final /*constructor*/ fun <init>(): Main.<no name provided>.States
-            internal final class object Main.<no name provided>.States.<no name provided> : jet.Any {
-                internal final /*constructor*/ fun <init>(): Main.<no name provided>.States.<no name provided>
-                public final val N: Main.<no name provided>.States
-            }
-        }
-    }
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt900-1.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt900-1.txt
deleted file mode 100644
index ce5de5acaf9..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt900-1.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace <root>
-
-// <namespace name="c">
-namespace c
-
-internal final class c.A : jet.Any {
-    public final /*constructor*/ fun <init>(): c.A
-    internal final class object c.A.<no name provided> : jet.Any {
-        internal final /*constructor*/ fun <init>(): c.A.<no name provided>
-        internal final class c.A.<no name provided>.B : jet.Any {
-            public final /*constructor*/ fun <init>(): c.A.<no name provided>.B
-            internal final class object c.A.<no name provided>.B.<no name provided> : jet.Any {
-                internal final /*constructor*/ fun <init>(): c.A.<no name provided>.B.<no name provided>
-            }
-        }
-    }
-}
-internal final val M: c.M
-internal final fun foo(): jet.Tuple0
-// </namespace name="c">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt900-2.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt900-2.txt
deleted file mode 100644
index cc2773f8e56..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt900-2.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace <root>
-
-// <namespace name="d">
-namespace d
-
-internal final val A: d.A
-internal final val M: d.M
-internal final var r: d.M.T
-internal final val y: d.M.T
-internal final fun f(): jet.Tuple0
-// </namespace name="d">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt900.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt900.txt
deleted file mode 100644
index c3a52e02c77..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt900.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-internal final class a.A : jet.Any {
-    public final /*constructor*/ fun <init>(): a.A
-    internal final class object a.A.<no name provided> : jet.Any {
-        internal final /*constructor*/ fun <init>(): a.A.<no name provided>
-        internal final val P: a.A.<no name provided>.P
-        internal final class a.A.<no name provided>.B : jet.Any {
-            public final /*constructor*/ fun <init>(): a.A.<no name provided>.B
-            internal final class object a.A.<no name provided>.B.<no name provided> : jet.Any {
-                internal final /*constructor*/ fun <init>(): a.A.<no name provided>.B.<no name provided>
-                internal final fun foo(): jet.Tuple0
-            }
-        }
-    }
-}
-internal final val N: a.N
-internal final fun foo(): jet.Tuple0
-// </namespace name="a">
-// <namespace name="b">
-namespace b
-
-internal final class b.A : jet.Any {
-    public final /*constructor*/ fun <init>(): b.A
-    internal final class object b.A.<no name provided> : jet.Any {
-        internal final /*constructor*/ fun <init>(): b.A.<no name provided>
-        internal final val P: b.A.<no name provided>.P
-        internal final class b.A.<no name provided>.B : jet.Any {
-            public final /*constructor*/ fun <init>(): b.A.<no name provided>.B
-            internal final class object b.A.<no name provided>.B.<no name provided> : jet.Any {
-                internal final /*constructor*/ fun <init>(): b.A.<no name provided>.B.<no name provided>
-                internal final fun foo(): jet.Tuple0
-            }
-        }
-    }
-}
-internal final val N: b.N
-internal final fun foo(): jet.Tuple0
-// </namespace name="b">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt939.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt939.txt
deleted file mode 100644
index d3b6a63b4ac..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt939.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-// <namespace name="kt939">
-namespace kt939
-
-internal final fun compare(/*0*/ o1: jet.String?, /*1*/ o2: jet.String?): jet.Int
-internal final fun test(): jet.Tuple0
-// </namespace name="kt939">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/stopResolutionOnAmbiguity.txt b/compiler/testData/lazyResolve/diagnostics/scopes/stopResolutionOnAmbiguity.txt
deleted file mode 100644
index ded0f368884..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/stopResolutionOnAmbiguity.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace <root>
-
-// <namespace name="c">
-namespace c
-
-internal abstract trait c.B : jet.Any {
-    internal open fun bar(): jet.Tuple0
-}
-internal final class c.C : jet.Any {
-    public final /*constructor*/ fun <init>(): c.C
-    internal final fun bar(): jet.Tuple0
-}
-internal final fun jet.Any?.bar(): jet.Tuple0
-internal final fun test(/*0*/ a: jet.Any?): jet.Tuple0
-// </namespace name="c">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/visibility.txt b/compiler/testData/lazyResolve/diagnostics/scopes/visibility.txt
deleted file mode 100644
index 977bda3f9d2..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/visibility.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-namespace <root>
-
-// <namespace name="test_visibility">
-namespace test_visibility
-
-internal final class test_visibility.A : jet.Any {
-    public final /*constructor*/ fun <init>(): test_visibility.A
-    private final fun f(/*0*/ i: jet.Int): test_visibility.B
-    private final val i: jet.Int
-    internal final fun test(): jet.Tuple0
-    private final val v: test_visibility.B
-}
-internal final class test_visibility.B : jet.Any {
-    public final /*constructor*/ fun <init>(): test_visibility.B
-    internal final fun bMethod(): jet.Tuple0
-}
-internal open class test_visibility.C : test_visibility.T {
-    public final /*constructor*/ fun <init>(): test_visibility.C
-    protected final var i: jet.Int
-    internal final fun test5(): jet.Tuple0
-}
-internal final class test_visibility.D : test_visibility.C {
-    public final /*constructor*/ fun <init>(): test_visibility.D
-    protected final override /*1*/ var i: jet.Int
-    internal final val j: jet.Int
-    internal final override /*1*/ fun test5(): jet.Tuple0
-    internal final fun test6(): jet.Tuple0
-}
-internal final class test_visibility.E : test_visibility.C {
-    public final /*constructor*/ fun <init>(): test_visibility.E
-    protected final override /*1*/ var i: jet.Int
-    internal final override /*1*/ fun test5(): jet.Tuple0
-    internal final fun test7(): jet.Tuple0
-}
-internal final class test_visibility.F : test_visibility.C {
-    public final /*constructor*/ fun <init>(): test_visibility.F
-    protected final override /*1*/ var i: jet.Int
-    internal final override /*1*/ fun test5(): jet.Tuple0
-    internal final fun test8(/*0*/ c: test_visibility.C): jet.Tuple0
-}
-internal final class test_visibility.G : test_visibility.T {
-    public final /*constructor*/ fun <init>(): test_visibility.G
-    internal final fun test8(/*0*/ c: test_visibility.C): jet.Tuple0
-}
-protected final class test_visibility.ProtectedClass : jet.Any {
-    public final /*constructor*/ fun <init>(): test_visibility.ProtectedClass
-}
-protected abstract trait test_visibility.ProtectedTrait : jet.Any {
-}
-internal abstract trait test_visibility.T : jet.Any {
-}
-internal final class test_visibility.Y : jet.Any {
-    public final /*constructor*/ fun <init>(): test_visibility.Y
-    internal final fun test2(): jet.Tuple0
-}
-internal final val internal_val: jet.Int
-private final val private_val: jet.Int
-protected final val protected_val: jet.Int
-internal final fun doSmth(/*0*/ i: jet.Int): jet.Int
-internal final fun internal_fun(): jet.Tuple0
-private final fun private_fun(): jet.Tuple0
-protected final fun protected_fun(): jet.Tuple0
-internal final fun test1(): jet.Tuple0
-internal final fun test3(/*0*/ a: test_visibility.A): jet.Tuple0
-internal final fun test4(/*0*/ c: test_visibility.C): jet.Tuple0
-// </namespace name="test_visibility">
-// <namespace name="test_visibility2">
-namespace test_visibility2
-
-internal final fun test(): jet.Tuple0
-// </namespace name="test_visibility2">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/visibility2.txt b/compiler/testData/lazyResolve/diagnostics/scopes/visibility2.txt
deleted file mode 100644
index 71f149fd12f..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/scopes/visibility2.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-namespace <root>
-
-// <namespace name="a">
-namespace a
-
-private open class a.A : jet.Any {
-    public final /*constructor*/ fun <init>(): a.A
-    internal final fun bar(): jet.Tuple0
-}
-private final val PO: a.PO
-private final fun foo(): jet.Tuple0
-internal final fun makeA(): a.A
-// </namespace name="a">
-// <namespace name="b">
-namespace b
-
-internal final class b.B : a.A {
-    public final /*constructor*/ fun <init>(): b.B
-    invisible_fake abstract override /*1*/ fun bar(): jet.Tuple0
-}
-internal final class b.NewClass : java.util.ArrayList<java.lang.Integer> {
-    public final /*constructor*/ fun <init>(): b.NewClass
-    public open override /*1*/ fun add(/*0*/ p0: java.lang.Integer): jet.Boolean
-    public open override /*1*/ fun add(/*0*/ p0: jet.Int, /*1*/ p1: java.lang.Integer): jet.Tuple0
-    public open override /*1*/ fun addAll(/*0*/ p0: java.util.Collection<out java.lang.Integer>): jet.Boolean
-    public open override /*1*/ fun addAll(/*0*/ p0: jet.Int, /*1*/ p1: java.util.Collection<out java.lang.Integer>): jet.Boolean
-    public open override /*1*/ fun clear(): jet.Tuple0
-    public open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun contains(/*0*/ p0: jet.Any?): jet.Boolean
-    public open override /*1*/ fun containsAll(/*0*/ p0: java.util.Collection<out jet.Any?>): jet.Boolean
-    public open override /*1*/ fun ensureCapacity(/*0*/ p0: jet.Int): jet.Tuple0
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    public open override /*1*/ fun get(/*0*/ p0: jet.Int): java.lang.Integer
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    public open override /*1*/ fun indexOf(/*0*/ p0: jet.Any?): jet.Int
-    public open override /*1*/ fun isEmpty(): jet.Boolean
-    public open override /*1*/ fun iterator(): java.util.Iterator<java.lang.Integer>
-    public open override /*1*/ fun lastIndexOf(/*0*/ p0: jet.Any?): jet.Int
-    public open override /*1*/ fun listIterator(): java.util.ListIterator<java.lang.Integer>
-    public open override /*1*/ fun listIterator(/*0*/ p0: jet.Int): java.util.ListIterator<java.lang.Integer>
-    protected final override /*1*/ var modCount: jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    public open override /*1*/ fun remove(/*0*/ p0: jet.Any?): jet.Boolean
-    public open override /*1*/ fun remove(/*0*/ p0: jet.Int): java.lang.Integer
-    public open override /*1*/ fun removeAll(/*0*/ p0: java.util.Collection<out jet.Any?>): jet.Boolean
-    protected open override /*1*/ fun removeRange(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): jet.Tuple0
-    public open override /*1*/ fun retainAll(/*0*/ p0: java.util.Collection<out jet.Any?>): jet.Boolean
-    public open override /*1*/ fun set(/*0*/ p0: jet.Int, /*1*/ p1: java.lang.Integer): java.lang.Integer
-    public open override /*1*/ fun size(): jet.Int
-    public open override /*1*/ fun subList(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): java.util.List<java.lang.Integer>
-    public open override /*1*/ fun toArray(): jet.Array<jet.Any?>
-    public open override /*1*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ p0: jet.Array<T>): jet.Array<T>
-    public open override /*1*/ fun toString(): jet.String
-    public open override /*1*/ fun trimToSize(): jet.Tuple0
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
-internal final class b.Q : jet.Any {
-    public final /*constructor*/ fun <init>(): b.Q
-    internal final class b.Q.W : jet.Any {
-        public final /*constructor*/ fun <init>(): b.Q.W
-        internal final fun foo(): jet.Tuple0
-    }
-}
-internal final fun test(): jet.Tuple0
-// </namespace name="b">
diff --git a/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowParameterInFunctionBody.txt b/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowParameterInFunctionBody.txt
deleted file mode 100644
index 3c8b106de7b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowParameterInFunctionBody.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun f(/*0*/ p: jet.Int): jet.Int
diff --git a/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowParameterInNestedBlockInFor.txt b/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowParameterInNestedBlockInFor.txt
deleted file mode 100644
index 44d0ba47325..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowParameterInNestedBlockInFor.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun f(/*0*/ i: jet.Int): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowPropertyInClosure.txt b/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowPropertyInClosure.txt
deleted file mode 100644
index 9e3751a0ccf..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowPropertyInClosure.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace <root>
-
-internal final val f: jet.Function0<jet.Int>
-internal final val i: jet.Int
diff --git a/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowPropertyInFor.txt b/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowPropertyInFor.txt
deleted file mode 100644
index 8208812b6e3..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowPropertyInFor.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final class RedefinePropertyInFor : jet.Any {
-    public final /*constructor*/ fun <init>(): RedefinePropertyInFor
-    internal final fun ff(): jet.Tuple0
-    internal final var i: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowPropertyInFunction.txt b/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowPropertyInFunction.txt
deleted file mode 100644
index 9990bd4c6a9..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowPropertyInFunction.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal final class RedefinePropertyInFunction : jet.Any {
-    public final /*constructor*/ fun <init>(): RedefinePropertyInFunction
-    internal final fun f(): jet.Int
-    internal final var i: jet.Int
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowVariableInFor.txt b/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowVariableInFor.txt
deleted file mode 100644
index d7faa630170..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowVariableInFor.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun ff(): jet.Int
diff --git a/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowVariableInNestedBlock.txt b/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowVariableInNestedBlock.txt
deleted file mode 100644
index d7faa630170..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowVariableInNestedBlock.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun ff(): jet.Int
diff --git a/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowVariableInNestedClosure.txt b/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowVariableInNestedClosure.txt
deleted file mode 100644
index 5d7114f2eee..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowVariableInNestedClosure.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun f(): jet.Int
diff --git a/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowVariableInNestedClosureParam.txt b/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowVariableInNestedClosureParam.txt
deleted file mode 100644
index d7faa630170..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/shadowing/ShadowVariableInNestedClosureParam.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun ff(): jet.Int
diff --git a/compiler/testData/lazyResolve/diagnostics/substitutions/kt1558-short.txt b/compiler/testData/lazyResolve/diagnostics/substitutions/kt1558-short.txt
deleted file mode 100644
index 3e4365ff960..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/substitutions/kt1558-short.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun testArrays(/*0*/ ci: java.util.List<jet.Int>): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/subtyping/kt-1457.txt b/compiler/testData/lazyResolve/diagnostics/subtyping/kt-1457.txt
deleted file mode 100644
index f0b10eeb816..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/subtyping/kt-1457.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-namespace <root>
-
-internal final class MyListOfPairs</*0*/ T : jet.Any?> : java.util.ArrayList<jet.Tuple2<out T, out T>> {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): MyListOfPairs<T>
-    public open override /*1*/ fun add(/*0*/ p0: jet.Int, /*1*/ p1: jet.Tuple2<out T, out T>): jet.Tuple0
-    public open override /*1*/ fun add(/*0*/ p0: jet.Tuple2<out T, out T>): jet.Boolean
-    public open override /*1*/ fun addAll(/*0*/ p0: java.util.Collection<out jet.Tuple2<out T, out T>>): jet.Boolean
-    public open override /*1*/ fun addAll(/*0*/ p0: jet.Int, /*1*/ p1: java.util.Collection<out jet.Tuple2<out T, out T>>): jet.Boolean
-    public open override /*1*/ fun clear(): jet.Tuple0
-    public open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun contains(/*0*/ p0: jet.Any?): jet.Boolean
-    public open override /*1*/ fun containsAll(/*0*/ p0: java.util.Collection<out jet.Any?>): jet.Boolean
-    public open override /*1*/ fun ensureCapacity(/*0*/ p0: jet.Int): jet.Tuple0
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    public open override /*1*/ fun get(/*0*/ p0: jet.Int): jet.Tuple2<out T, out T>
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    public open override /*1*/ fun indexOf(/*0*/ p0: jet.Any?): jet.Int
-    public open override /*1*/ fun isEmpty(): jet.Boolean
-    public open override /*1*/ fun iterator(): java.util.Iterator<jet.Tuple2<out T, out T>>
-    public open override /*1*/ fun lastIndexOf(/*0*/ p0: jet.Any?): jet.Int
-    public open override /*1*/ fun listIterator(): java.util.ListIterator<jet.Tuple2<out T, out T>>
-    public open override /*1*/ fun listIterator(/*0*/ p0: jet.Int): java.util.ListIterator<jet.Tuple2<out T, out T>>
-    protected final override /*1*/ var modCount: jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    public open override /*1*/ fun remove(/*0*/ p0: jet.Any?): jet.Boolean
-    public open override /*1*/ fun remove(/*0*/ p0: jet.Int): jet.Tuple2<out T, out T>
-    public open override /*1*/ fun removeAll(/*0*/ p0: java.util.Collection<out jet.Any?>): jet.Boolean
-    protected open override /*1*/ fun removeRange(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): jet.Tuple0
-    public open override /*1*/ fun retainAll(/*0*/ p0: java.util.Collection<out jet.Any?>): jet.Boolean
-    public open override /*1*/ fun set(/*0*/ p0: jet.Int, /*1*/ p1: jet.Tuple2<out T, out T>): jet.Tuple2<out T, out T>
-    public open override /*1*/ fun size(): jet.Int
-    public open override /*1*/ fun subList(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): java.util.List<jet.Tuple2<out T, out T>>
-    public open override /*1*/ fun toArray(): jet.Array<jet.Any?>
-    public open override /*1*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ p0: jet.Array<T>): jet.Array<T>
-    public open override /*1*/ fun toString(): jet.String?
-    public open override /*1*/ fun trimToSize(): jet.Tuple0
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/subtyping/kt2069.txt b/compiler/testData/lazyResolve/diagnostics/subtyping/kt2069.txt
deleted file mode 100644
index 776f2458696..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/subtyping/kt2069.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace <root>
-
-// <namespace name="kt2069">
-namespace kt2069
-
-internal final class kt2069.T : kt2069.T1 {
-    public final /*constructor*/ fun <init>(): kt2069.T
-    internal final fun bar(): jet.Tuple0
-    internal open override /*1*/ fun foo(): jet.Tuple0
-    internal final class object kt2069.T.<no name provided> : jet.Any {
-        internal final /*constructor*/ fun <init>(): kt2069.T.<no name provided>
-    }
-}
-internal abstract trait kt2069.T1 : jet.Any {
-    internal open fun foo(): jet.Tuple0
-}
-// </namespace name="kt2069">
diff --git a/compiler/testData/lazyResolve/diagnostics/subtyping/kt304.txt b/compiler/testData/lazyResolve/diagnostics/subtyping/kt304.txt
deleted file mode 100644
index 76554c26029..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/subtyping/kt304.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-internal open class Bar</*0*/ T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): Bar<T>
-}
-internal open class Foo {
-    public final /*constructor*/ fun <init>(): Foo
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/tuples/BasicTuples.txt b/compiler/testData/lazyResolve/diagnostics/tuples/BasicTuples.txt
deleted file mode 100644
index d4170907a0b..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/tuples/BasicTuples.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace <root>
-
-internal final fun foo(/*0*/ a: jet.Tuple2<out jet.Int, out jet.String>): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/varargs/AmbiguousVararg.txt b/compiler/testData/lazyResolve/diagnostics/varargs/AmbiguousVararg.txt
deleted file mode 100644
index 9ae417d42d9..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/varargs/AmbiguousVararg.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace <root>
-
-internal final fun foo(/*0*/ vararg t: jet.Int /*jet.IntArray*/): jet.String
-internal final fun foo(/*0*/ vararg t: jet.String /*jet.Array<jet.String>*/): jet.String
-internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/varargs/MoreSpecificVarargsOfEqualLength.txt b/compiler/testData/lazyResolve/diagnostics/varargs/MoreSpecificVarargsOfEqualLength.txt
deleted file mode 100644
index f586865c7fb..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/varargs/MoreSpecificVarargsOfEqualLength.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace <root>
-
-internal final class D : jet.Any {
-    public final /*constructor*/ fun <init>(): D
-    internal final fun from(/*0*/ vararg a: jet.Any /*jet.Array<jet.Any>*/): jet.Tuple0
-    internal final fun from(/*0*/ vararg a: jet.String /*jet.Array<jet.String>*/): jet.Tuple0
-}
-internal final fun main(/*0*/ d: D): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/varargs/MostSepcificVarargsWithJava.txt b/compiler/testData/lazyResolve/diagnostics/varargs/MostSepcificVarargsWithJava.txt
deleted file mode 100644
index f00f3396a96..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/varargs/MostSepcificVarargsWithJava.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace <root>
-
-public open class C : java.lang.Object {
-    public final /*constructor*/ fun <init>(): C
-    protected open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    package open fun from(): jet.Tuple0
-    package open fun from(/*0*/ s1: jet.String?, /*1*/ vararg s: jet.String? /*jet.Array<jet.String?>*/): jet.Tuple0
-    package open fun from(/*0*/ s: jet.String?): jet.Tuple0
-    package open fun from(/*0*/ s: jet.String?, /*1*/ s1: jet.String?): jet.Tuple0
-    package open fun from(/*0*/ vararg s: jet.String? /*jet.Array<jet.String?>*/): jet.Tuple0
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    public open override /*1*/ fun toString(): jet.String?
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
-internal final fun main(/*0*/ j: C, /*1*/ s: jet.Array<jet.String?>): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/varargs/NilaryVsVararg.txt b/compiler/testData/lazyResolve/diagnostics/varargs/NilaryVsVararg.txt
deleted file mode 100644
index f996f8debcb..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/varargs/NilaryVsVararg.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace <root>
-
-internal final fun foo0(): jet.String
-internal final fun foo0(/*0*/ vararg t: jet.Int /*jet.IntArray*/): jet.String
-internal final fun test0(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/varargs/UnaryVsVararg.txt b/compiler/testData/lazyResolve/diagnostics/varargs/UnaryVsVararg.txt
deleted file mode 100644
index a2a5212852f..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/varargs/UnaryVsVararg.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace <root>
-
-internal final fun foo1(/*0*/ a: jet.Int): jet.String
-internal final fun foo1(/*0*/ a: jet.Int, /*1*/ vararg t: jet.Int /*jet.IntArray*/): jet.String
-internal final fun test1(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/varargs/kt1781.txt b/compiler/testData/lazyResolve/diagnostics/varargs/kt1781.txt
deleted file mode 100644
index 88be3c0d0ec..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/varargs/kt1781.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace <root>
-
-public open class JavaClass : java.lang.Object {
-    public final /*constructor*/ fun <init>(): JavaClass
-    public final /*constructor*/ fun <init>(/*0*/ vararg ss: jet.String? /*jet.Array<jet.String?>*/): JavaClass
-    protected open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    public open override /*1*/ fun toString(): jet.String?
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
-internal final fun foo(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/varargs/kt1835.txt b/compiler/testData/lazyResolve/diagnostics/varargs/kt1835.txt
deleted file mode 100644
index 4bc629c2035..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/varargs/kt1835.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace <root>
-
-public open class JavaClass : java.lang.Object {
-    public final /*constructor*/ fun <init>(): JavaClass
-    protected open override /*1*/ fun clone(): jet.Any
-    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
-    protected open override /*1*/ fun finalize(): jet.Tuple0
-    package open fun from(/*0*/ s: jet.String?): jet.Tuple0
-    package open fun from(/*0*/ vararg s: jet.String? /*jet.Array<jet.String?>*/): jet.Tuple0
-    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
-    public open override /*1*/ fun hashCode(): jet.Int
-    public final override /*1*/ fun notify(): jet.Tuple0
-    public final override /*1*/ fun notifyAll(): jet.Tuple0
-    public open override /*1*/ fun toString(): jet.String?
-    public final override /*1*/ fun wait(): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
-    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
-}
-internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/varargs/kt1838-param.txt b/compiler/testData/lazyResolve/diagnostics/varargs/kt1838-param.txt
deleted file mode 100644
index b0f8c7c49f3..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/varargs/kt1838-param.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace <root>
-
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ vararg t: jet.Int /*jet.IntArray*/): A
-}
diff --git a/compiler/testData/lazyResolve/diagnostics/varargs/kt1838-val.txt b/compiler/testData/lazyResolve/diagnostics/varargs/kt1838-val.txt
deleted file mode 100644
index cae074c94a9..00000000000
--- a/compiler/testData/lazyResolve/diagnostics/varargs/kt1838-val.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace <root>
-
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ vararg t: jet.Int /*jet.IntArray*/): A
-    internal final val t: jet.IntArray
-}
diff --git a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java
index ef7dc4c2ee2..6a43c2062c2 100644
--- a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java
+++ b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java
@@ -181,15 +181,6 @@ public class GenerateTests {
                 testModel("compiler/testData/renderer")
         );
 
-        // TODO test is temporarily disabled
-        //generateTest(
-        //        "compiler/tests/",
-        //        "org.jetbrains.jet.lang.resolve.lazy",
-        //        "LazyResolveDiagnosticsTestGenerated",
-        //        AbstractLazyResolveDiagnosticsTest.class,
-        //        new SimpleTestClassModel(AbstractLazyResolveDiagnosticsTest.TEST_DATA_DIR, true, "kt", "doTest")
-        //);
-
         generateTest("compiler/tests",
                      "LazyResolveTestGenerated",
                      AbstractLazyResolveTest.class,