diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt
index 21dd8404514..61cbca3d49a 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt
@@ -403,8 +403,8 @@ class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransformer)
         }
 
         val label = anonymousFunction.label
-        return if (label != null && receiverTypeRef is FirResolvedTypeRef) {
-            withLabelAndReceiverType(Name.identifier(label.name), anonymousFunction, receiverTypeRef.type) {
+        return if (label != null || receiverTypeRef is FirResolvedTypeRef) {
+            withLabelAndReceiverType(label?.name?.let { Name.identifier(it) }, anonymousFunction, receiverTypeRef?.coneTypeSafe()) {
                 transform()
             }
         } else {
diff --git a/compiler/testData/diagnostics/tests/callableReference/callableReferenceAsLastExpressionInBlock.fir.kt b/compiler/testData/diagnostics/tests/callableReference/callableReferenceAsLastExpressionInBlock.fir.kt
index a0fbbd4e5fc..357e98bcb2f 100644
--- a/compiler/testData/diagnostics/tests/callableReference/callableReferenceAsLastExpressionInBlock.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/callableReferenceAsLastExpressionInBlock.fir.kt
@@ -11,7 +11,7 @@ fun test() {
     } else {
         ::foo
     }
-    a checkType {  <!UNRESOLVED_REFERENCE!>_<!><KFunction0<Int>>() }
+    a checkType {  _<KFunction0<Int>>() }
 }
 
 fun foo(): Int = 0
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/extensionToSupertype.fir.kt b/compiler/testData/diagnostics/tests/callableReference/function/extensionToSupertype.fir.kt
index d7ff99df247..cd886eb65e8 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/extensionToSupertype.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/extensionToSupertype.fir.kt
@@ -13,7 +13,7 @@ fun take(f: (A) -> Unit) {}
 fun take(f: () -> Unit) {}
 
 fun test() {
-    B::foo checkType { <!UNRESOLVED_REFERENCE!>_<!><KFunction1<B, Unit>>() }
+    B::foo checkType { _<KFunction1<B, Unit>>() }
 
     <!INAPPLICABLE_CANDIDATE!>take<!>(B::foo)
 }
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/fakeOverrideType.fir.kt b/compiler/testData/diagnostics/tests/callableReference/function/fakeOverrideType.fir.kt
index 821dffbb84b..89bbbfa27c2 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/fakeOverrideType.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/fakeOverrideType.fir.kt
@@ -11,7 +11,7 @@ class B : A() {
 
 
 fun test() {
-    B::foo checkType { <!UNRESOLVED_REFERENCE!>_<!><KFunction2<B, String, String>>() }
+    B::foo checkType { _<KFunction2<B, String, String>>() }
 
     <!INAPPLICABLE_CANDIDATE!>(B::hashCode)("No.")<!>
 }
diff --git a/compiler/testData/diagnostics/tests/callableReference/property/samePriorityForFunctionsAndProperties.fir.kt b/compiler/testData/diagnostics/tests/callableReference/property/samePriorityForFunctionsAndProperties.fir.kt
deleted file mode 100644
index 218a2795117..00000000000
--- a/compiler/testData/diagnostics/tests/callableReference/property/samePriorityForFunctionsAndProperties.fir.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-// !CHECK_TYPE
-
-import kotlin.reflect.KProperty1
-
-class C {
-    val baz: Int = 12
-}
-
-fun Int.baz() {}
-
-fun test() {
-    C::baz checkType { <!UNRESOLVED_REFERENCE!>_<!><KProperty1<C, Int>>() }
-}
diff --git a/compiler/testData/diagnostics/tests/callableReference/property/samePriorityForFunctionsAndProperties.kt b/compiler/testData/diagnostics/tests/callableReference/property/samePriorityForFunctionsAndProperties.kt
index 6bedc84c041..1b19216725c 100644
--- a/compiler/testData/diagnostics/tests/callableReference/property/samePriorityForFunctionsAndProperties.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/property/samePriorityForFunctionsAndProperties.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 
 import kotlin.reflect.KProperty1
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/overloads.fir.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/overloads.fir.kt
index 60effb9908c..b5d54864ccd 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/overloads.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/overloads.fir.kt
@@ -22,7 +22,7 @@ fun fas(i: Int = 1) {}
 fun test() {
     <!UNRESOLVED_REFERENCE!>B::foo<!> // todo KT-9601 Chose maximally specific function in callable reference
 
-    B::bar checkType { <!UNRESOLVED_REFERENCE!>_<!><KFunction1<B, Unit>>() }
+    B::bar checkType { _<KFunction1<B, Unit>>() }
 
     <!UNRESOLVED_REFERENCE!>B::bas<!>
 
diff --git a/compiler/testData/diagnostics/tests/checkType.fir.kt b/compiler/testData/diagnostics/tests/checkType.fir.kt
index f1e5dad30ab..70bf2b6d137 100644
--- a/compiler/testData/diagnostics/tests/checkType.fir.kt
+++ b/compiler/testData/diagnostics/tests/checkType.fir.kt
@@ -6,7 +6,7 @@ interface B : A
 interface C : B
 
 fun test(b: B) {
-    b checkType { <!UNRESOLVED_REFERENCE!>_<!><B>() }
-    b checkType { <!UNRESOLVED_REFERENCE!>_<!><A>() }
-    b checkType { <!UNRESOLVED_REFERENCE!>_<!><C>() }
+    b checkType { _<B>() }
+    b checkType { <!INAPPLICABLE_CANDIDATE!>_<!><A>() }
+    b checkType { <!INAPPLICABLE_CANDIDATE!>_<!><C>() }
 }
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/basicCollectionLiterals.fir.kt b/compiler/testData/diagnostics/tests/collectionLiterals/basicCollectionLiterals.fir.kt
index dd381a3eb8c..374e2afb643 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/basicCollectionLiterals.fir.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/basicCollectionLiterals.fir.kt
@@ -14,11 +14,11 @@ fun test() {
 }
 
 fun check() {
-    [1, 2] checkType { <!UNRESOLVED_REFERENCE!>_<!><Array<Int>>() }
-    [""] checkType { <!UNRESOLVED_REFERENCE!>_<!><Array<String>>() }
+    [1, 2] checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Array<Int>>() }
+    [""] checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Array<String>>() }
 
     val f: IntArray = [1]
-    [f] checkType { <!UNRESOLVED_REFERENCE!>_<!><Array<IntArray>>() }
+    [f] checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Array<IntArray>>() }
 
-    [1, ""] checkType { <!UNRESOLVED_REFERENCE!>_<!><Array<Any>>() }
+    [1, ""] checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Array<Any>>() }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.fir.kt
index d36e959db14..659695922fc 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.fir.kt
@@ -9,7 +9,7 @@ class None<T> : Option<T>
 fun <T> bind(r: Option<T>): Option<T> {
     return if (r is Some) {
         // Ideally we should infer Option<T> here (see KT-10896)
-        (if (true) None() else r) checkType { <!UNRESOLVED_REFERENCE!>_<!><Option<T>>() }
+        (if (true) None() else r) checkType { _<Option<T>>() }
         // Works correctly
         if (true) None() else r
     }
@@ -48,7 +48,7 @@ class SimpleNone : SimpleOption
 
 fun bindNoGeneric(r: SimpleOption): SimpleOption {
     return if (r is SimpleSome) {
-        (if (true) SimpleNone() else r) checkType { <!UNRESOLVED_REFERENCE!>_<!><SimpleOption>() }
+        (if (true) SimpleNone() else r) checkType { _<SimpleOption>() }
         if (true) SimpleNone() else r
     }
     else r
diff --git a/compiler/testData/diagnostics/tests/controlStructures/typeInferenceForExclExcl.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/typeInferenceForExclExcl.fir.kt
index b136b408f54..195ba2a2ef4 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/typeInferenceForExclExcl.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/typeInferenceForExclExcl.fir.kt
@@ -12,10 +12,10 @@ fun <T: Any> exclExcl(t: T?): T = t!!
 
 fun test11() {
     // not 'String!'
-    exclExcl(A.foo()) checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
-    exclExcl(A.foo()) checkType { <!UNRESOLVED_REFERENCE!>_<!><String?>() }
+    exclExcl(A.foo()) checkType { _<String>() }
+    exclExcl(A.foo()) checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String?>() }
 
     // not 'String!'
-    A.foo()!! checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
-    A.foo()!! checkType { <!UNRESOLVED_REFERENCE!>_<!><String?>() }
+    A.foo()!! checkType { _<String>() }
+    A.foo()!! checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String?>() }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/coroutines/callableReference/outsideSuspend.fir.kt b/compiler/testData/diagnostics/tests/coroutines/callableReference/outsideSuspend.fir.kt
index a3c6e936dbf..b765a7bd023 100644
--- a/compiler/testData/diagnostics/tests/coroutines/callableReference/outsideSuspend.fir.kt
+++ b/compiler/testData/diagnostics/tests/coroutines/callableReference/outsideSuspend.fir.kt
@@ -7,5 +7,5 @@ import kotlin.reflect.KSuspendFunction0
 suspend fun foo() {}
 
 fun test() {
-    ::foo checkType { <!UNRESOLVED_REFERENCE!>_<!><KSuspendFunction0<Unit>>() }
+    ::foo checkType { <!INAPPLICABLE_CANDIDATE!>_<!><KSuspendFunction0<Unit>>() }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/anonymousFunAsLastExpressionInBlock.fir.kt b/compiler/testData/diagnostics/tests/declarationChecks/anonymousFunAsLastExpressionInBlock.fir.kt
index c43ed114e65..a9e6167b5a6 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/anonymousFunAsLastExpressionInBlock.fir.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/anonymousFunAsLastExpressionInBlock.fir.kt
@@ -37,7 +37,7 @@ fun test() {
         y: Int -> fun(): Int {return 1}
     }
 
-    x4 checkType { <!UNRESOLVED_REFERENCE!>_<!><Function1<Int, Function0<Int>>>() }
+    x4 checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Function1<Int, Function0<Int>>>() }
 
     { y: Int -> fun(): Int {return 1} }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/namedFunAsLastExpressionInBlock.fir.kt b/compiler/testData/diagnostics/tests/declarationChecks/namedFunAsLastExpressionInBlock.fir.kt
index 99b1a0e45f7..42202be3f09 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/namedFunAsLastExpressionInBlock.fir.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/namedFunAsLastExpressionInBlock.fir.kt
@@ -42,7 +42,7 @@ fun test() {
         y: Int -> fun named12(): Int {return 1}
     }
 
-    x4 checkType { <!UNRESOLVED_REFERENCE!>_<!><Function1<Int, Unit>>() }
+    x4 checkType { _<Function1<Int, Unit>>() }
 
     { y: Int -> fun named14(): Int {return 1} }
     val b = <!UNRESOLVED_REFERENCE!>(<!EXPRESSION_REQUIRED!>fun named15(): Boolean { return true }<!>)()<!>
@@ -61,7 +61,7 @@ fun success() {
     run2 { fun named2() = 1 }
 
     val x = run { fun named3() = 1 }
-    x checkType { <!UNRESOLVED_REFERENCE!>_<!><Unit>() }
+    x checkType { _<Unit>() }
 
     val y = when (1) {
         0 -> {
@@ -71,5 +71,5 @@ fun success() {
             fun named5(): Int {return 1}
         }
     }
-    y checkType { <!UNRESOLVED_REFERENCE!>_<!><Unit>() }
+    y checkType { _<Unit>() }
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/noExpectedType.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/noExpectedType.fir.kt
index 6fb33e99ee2..3b39223d348 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/noExpectedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/noExpectedType.fir.kt
@@ -9,24 +9,24 @@ fun bar() {
         b <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
     }
 
-    x checkType { <!UNRESOLVED_REFERENCE!>_<!><(A) -> Unit>() }
+    x checkType { _<(A) -> Unit>() }
 
     val y = { (<!UNRESOLVED_REFERENCE!>a: Int<!>, <!UNRESOLVED_REFERENCE!>b<!>): A ->
-        a checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+        a checkType { _<Int>() }
         b <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
     }
 
-    y checkType { <!UNRESOLVED_REFERENCE!>_<!><(A) -> Unit>() }
+    y checkType { _<(A) -> Unit>() }
 
     val y2 = { (<!UNRESOLVED_REFERENCE!>a: Number<!>, <!UNRESOLVED_REFERENCE!>b<!>): A ->
-        a checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+        a checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Int>() }
         b <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
     }
 
-    y2 checkType { <!UNRESOLVED_REFERENCE!>_<!><(A) -> Unit>() }
+    y2 checkType { _<(A) -> Unit>() }
 
     val z = { (<!UNRESOLVED_REFERENCE!>a: Int<!>, <!UNRESOLVED_REFERENCE!>b: String<!>) ->
-        a checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-        b checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+        a checkType { _<Int>() }
+        b checkType { _<String>() }
     }
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/functionLIteralInBlockInIf.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/functionLIteralInBlockInIf.fir.kt
deleted file mode 100644
index dbb2f2e3c3f..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/functionLIteralInBlockInIf.fir.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-// !CHECK_TYPE
-fun test() {
-    val a = if (true) {
-        val x = 1
-        ({ x })
-    } else {
-        { 2 }
-    }
-    a checkType {  <!UNRESOLVED_REFERENCE!>_<!><() -> Int>() }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/functionLIteralInBlockInIf.kt b/compiler/testData/diagnostics/tests/functionLiterals/functionLIteralInBlockInIf.kt
index 678ab68bc0c..ecd3cea9b2b 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/functionLIteralInBlockInIf.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/functionLIteralInBlockInIf.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 fun test() {
     val a = if (true) {
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralWithoutArgumentList.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralWithoutArgumentList.fir.kt
deleted file mode 100644
index 4ff47f19893..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralWithoutArgumentList.fir.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-// !CHECK_TYPE
-fun <T> id(t: T) = t
-
-fun foo() {
-    val i = id { 22 } //type inference error: no information for parameter
-    i checkType { <!UNRESOLVED_REFERENCE!>_<!><()->Int>() }
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralWithoutArgumentList.kt b/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralWithoutArgumentList.kt
index ac3e89990a2..3522938e5d4 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralWithoutArgumentList.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralWithoutArgumentList.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 fun <T> id(t: T) = t
 
diff --git a/compiler/testData/diagnostics/tests/generics/doNotCaptureSupertype.fir.kt b/compiler/testData/diagnostics/tests/generics/doNotCaptureSupertype.fir.kt
deleted file mode 100644
index 8c96719d74b..00000000000
--- a/compiler/testData/diagnostics/tests/generics/doNotCaptureSupertype.fir.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-// !CHECK_TYPE
-// SKIP_TXT
-fun test(b: S) {
-    b.collect(toList()) checkType { <!UNRESOLVED_REFERENCE!>_<!><Inv<String>>() }
-}
-
-interface S {
-    fun <R> collect(collector: C<in String, R>): R
-}
-
-class C<X, Y>
-
-fun <T> toList(): C<T, Inv<T>> = null!!
-
-class Inv<Q>
diff --git a/compiler/testData/diagnostics/tests/generics/doNotCaptureSupertype.kt b/compiler/testData/diagnostics/tests/generics/doNotCaptureSupertype.kt
index 6f32d24fe2a..eeca507a60e 100644
--- a/compiler/testData/diagnostics/tests/generics/doNotCaptureSupertype.kt
+++ b/compiler/testData/diagnostics/tests/generics/doNotCaptureSupertype.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 // SKIP_TXT
 fun test(b: S) {
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClasses.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClasses.fir.kt
index 581059db154..a8fa7ce8835 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClasses.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClasses.fir.kt
@@ -19,8 +19,8 @@ class A : Outer<Double, Short>() {
 }
 
 fun foo() {
-    Derived().foo() checkType { <!UNRESOLVED_REFERENCE!>_<!><Outer<String, Int>.Inner<Char>>() }
+    Derived().foo() checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Outer<String, Int>.Inner<Char>>() }
     Derived().baz() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Map<Char, String>>() }
-    A.B().bar() checkType { <!UNRESOLVED_REFERENCE!>_<!><Outer<Float, Long>.Inner<String>>() }
+    A.B().bar() checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Outer<Float, Long>.Inner<String>>() }
     A.B().x() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Map<String, Float>>() }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocal.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocal.fir.kt
index 95c97c0dfd3..ffd67e920ab 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocal.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocal.fir.kt
@@ -42,7 +42,7 @@ fun test() {
     var x = foobar<String>()
     x = foobar<String>()
 
-    x().foo().a() checkType { <!UNRESOLVED_REFERENCE!>_<!><A<String, Double, Short, Long>>() }
+    x().foo().a() checkType { <!INAPPLICABLE_CANDIDATE!>_<!><A<String, Double, Short, Long>>() }
     x().bar() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><A<String, Double, Short, Char>>() }
 
     x = foobar<Int>()
@@ -50,6 +50,6 @@ fun test() {
     var y = noParameters()
     y = noParameters()
 
-    y().foo().a() checkType { <!UNRESOLVED_REFERENCE!>_<!><A<Any, Double, Short, Long>>() }
+    y().foo().a() checkType { <!INAPPLICABLE_CANDIDATE!>_<!><A<Any, Double, Short, Long>>() }
     y().bar() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><A<Any, Double, Short, Char>>() }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesTransitive.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesTransitive.fir.kt
index 56cb5e609c8..44702eb782f 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesTransitive.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesTransitive.fir.kt
@@ -14,6 +14,6 @@ class Derived : BaseDerived2<Int>() {
 }
 
 fun foo() {
-    Derived().foo() checkType { <!UNRESOLVED_REFERENCE!>_<!><Outer<Int, String>.Inner<Char>>() }
+    Derived().foo() checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Outer<Int, String>.Inner<Char>>() }
     Derived().baz() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Map<Char, Int>>() }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/secondLevelDepth.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/secondLevelDepth.fir.kt
index e5f856332b7..289136efa64 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/secondLevelDepth.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/secondLevelDepth.fir.kt
@@ -14,5 +14,5 @@ class DerivedOuter : Outer<String>() {
 }
 
 fun foo() {
-    DerivedOuter().DerivedInner().foo() checkType { <!UNRESOLVED_REFERENCE!>_<!><Outer<String>.Inner<Int>.Inner2<Char>>() }
+    DerivedOuter().DerivedInner().foo() checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Outer<String>.Inner<Int>.Inner2<Char>>() }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/kt9985.fir.kt b/compiler/testData/diagnostics/tests/generics/kt9985.fir.kt
index 6af3f78e7e7..7be3088b3d8 100644
--- a/compiler/testData/diagnostics/tests/generics/kt9985.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/kt9985.fir.kt
@@ -24,23 +24,23 @@ fun <T> B<T>.bar() = ""
 
 fun foo(l: A<String>?) {
     // No errors should be here
-    foo(l?.bar()) checkType { <!UNRESOLVED_REFERENCE!>_<!><String?>() }
-    foo(l?.gav()) checkType { <!UNRESOLVED_REFERENCE!>_<!><String?>() }
+    foo(l?.bar()) checkType { _<String?>() }
+    foo(l?.gav()) checkType { _<String?>() }
     if (l != null) {
-        foo(l?.bar()) checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
-        foo(l?.gav()) checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+        foo(l?.bar()) checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
+        foo(l?.gav()) checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
     }
 }
 
 fun fooNotNull(l: A<String>) {
     // No errors should be here
-    foo(l?.bar()) checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
-    foo(l?.gav()) checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    foo(l?.bar()) checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
+    foo(l?.gav()) checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
 }
 
 fun bar() {
     val l = B.create<String>()
-    foo(l?.bar()) checkType { <!UNRESOLVED_REFERENCE!>_<!><String?>() }
-    foo(l?.gav()) checkType { <!UNRESOLVED_REFERENCE!>_<!><String?>() }
+    foo(l?.bar()) checkType { _<String?>() }
+    foo(l?.gav()) checkType { _<String?>() }
 }
 
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/MLOut.fir.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/MLOut.fir.kt
deleted file mode 100644
index 082106edebe..00000000000
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/MLOut.fir.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-// !CHECK_TYPE
-
-// FILE: A.java
-public class A {
-    public java.util.List<? extends CharSequence> foo() {}
-}
-
-// FILE: main.kt
-
-fun foo2(x: A, y: MutableList<out CharSequence>) {
-    x.foo().isEmpty()
-    x.foo().get(0) checkType { <!UNRESOLVED_REFERENCE!>_<!><CharSequence>() }
-    x.foo().iterator() checkType { <!UNRESOLVED_REFERENCE!>_<!><MutableIterator<CharSequence>>() }
-
-    y.isEmpty()
-    y.get(0) checkType { <!UNRESOLVED_REFERENCE!>_<!><CharSequence>() }
-    y.iterator() checkType { <!UNRESOLVED_REFERENCE!>_<!><MutableIterator<CharSequence>>() }
-}
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/MLOut.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/MLOut.kt
index 8f573bce36f..df71a9b7c6e 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/MLOut.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/MLOut.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 
 // FILE: A.java
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/approximateDispatchReceiver.fir.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/approximateDispatchReceiver.fir.kt
deleted file mode 100644
index 7c3a4681b6b..00000000000
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/approximateDispatchReceiver.fir.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-// !CHECK_TYPE
-
-public abstract class A<E> {
-    fun bar(): String = ""
-}
-
-public class B<F> : A<B<F>>()
-
-fun test(b: B<*>) {
-    // Here `bar` could have dispatch receiver parameter type 'A<B<Captured(*)>>', but it wouldn't work as
-    // since 'b' has type 'A<out B<*>>', so we should approximate dispatch receiver PARAMETER type to make it accept original receiver
-    b.bar()
-    b.bar() checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
-}
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/approximateDispatchReceiver.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/approximateDispatchReceiver.kt
index 3f8d756af45..f8e7989ba53 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/approximateDispatchReceiver.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/approximateDispatchReceiver.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 
 public abstract class A<E> {
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/kt7296.fir.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/kt7296.fir.kt
index c609458644b..0016cabdc19 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/kt7296.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/kt7296.fir.kt
@@ -11,5 +11,5 @@ fun main() {
     val c : ListOfLists<*> = b
     val d : ArrayList<ArrayList<*>> = c.x
 
-    c.x checkType { <!UNRESOLVED_REFERENCE!>_<!><ArrayList<out ArrayList<*>>>() }
+    c.x checkType { <!INAPPLICABLE_CANDIDATE!>_<!><ArrayList<out ArrayList<*>>>() }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/platformSuperClass.fir.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/platformSuperClass.fir.kt
index f44f0a6ed53..88468010ca6 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/platformSuperClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/platformSuperClass.fir.kt
@@ -9,12 +9,12 @@ public class Clazz<T> {
 
 // FILE: main.kt
 fun test(clazz: Clazz<*>) {
-    clazz.t checkType { <!UNRESOLVED_REFERENCE!>_<!><Any?>() }
-    clazz.getSuperClass() checkType { <!UNRESOLVED_REFERENCE!>_<!><Clazz<*>?>() }
-    clazz.getSuperClass().t checkType { <!UNRESOLVED_REFERENCE!>_<!><Any?>() }
+    clazz.t checkType { _<Any?>() }
+    clazz.getSuperClass() checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Clazz<*>?>() }
+    clazz.getSuperClass().t checkType { _<Any?>() }
 
-    clazz.superClass checkType { <!UNRESOLVED_REFERENCE!>_<!><Clazz<*>?>() }
-    clazz.superClass.t checkType { <!UNRESOLVED_REFERENCE!>_<!><Any?>() }
+    clazz.superClass checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Clazz<*>?>() }
+    clazz.superClass.t checkType { _<Any?>() }
 
     // See KT-9294
     if (clazz.superClass == null) {
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/starNullability.fir.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/starNullability.fir.kt
index a7fe4f6edc3..48265c7ce2f 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/starNullability.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/starNullability.fir.kt
@@ -11,6 +11,6 @@ fun acceptA(a: A) {
 }
 
 fun main(i: I<*>) {
-    i.foo() checkType { <!UNRESOLVED_REFERENCE!>_<!><A?>() }
+    i.foo() checkType { _<A?>() }
     <!INAPPLICABLE_CANDIDATE!>acceptA<!>(i.foo()) // i.foo() should be nullable but isn't
 }
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/starNullabilityRecursive.fir.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/starNullabilityRecursive.fir.kt
index ed7aedae6a1..46a58ae16a9 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/starNullabilityRecursive.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/starNullabilityRecursive.fir.kt
@@ -5,5 +5,5 @@ interface A<T : A<T?>?> {
     fun foo(): T?
 }
 fun testA(a: A<*>) {
-    a.foo() checkType { <!UNRESOLVED_REFERENCE!>_<!><A<*>?>() }
+    a.foo() checkType { <!INAPPLICABLE_CANDIDATE!>_<!><A<*>?>() }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/superClass.fir.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/superClass.fir.kt
index e0963df5033..5ea9a64097d 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/superClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/superClass.fir.kt
@@ -6,7 +6,7 @@ interface Clazz<T> {
 }
 
 fun test(clazz: Clazz<*>) {
-    clazz.t checkType { <!UNRESOLVED_REFERENCE!>_<!><Any?>() }
-    clazz.getSuperClass() checkType { <!UNRESOLVED_REFERENCE!>_<!><Clazz<*>>() }
-    clazz.getSuperClass().t checkType { <!UNRESOLVED_REFERENCE!>_<!><Any?>() }
+    clazz.t checkType { _<Any?>() }
+    clazz.getSuperClass() checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Clazz<*>>() }
+    clazz.getSuperClass().t checkType { _<Any?>() }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/starProjections/invalid.fir.kt b/compiler/testData/diagnostics/tests/generics/starProjections/invalid.fir.kt
index 068e1c105b1..23be8a295d5 100644
--- a/compiler/testData/diagnostics/tests/generics/starProjections/invalid.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/starProjections/invalid.fir.kt
@@ -13,9 +13,9 @@ class Inv2<T : Inv2<in T>>(val x: T)
 fun main(a: A<*>, j: JavaClass<*>, i2: Inv2<*>) {
     // Probably it's too restrictive to suppose star projection type here as Any?,
     // but looks like we can refine it later
-    a.foo() checkType { <!UNRESOLVED_REFERENCE!>_<!><Any?>() }
-    j.foo() checkType { <!UNRESOLVED_REFERENCE!>_<!><Any?>() }
-    i2.x checkType { <!UNRESOLVED_REFERENCE!>_<!><Any?>() }
+    a.foo() checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Any?>() }
+    j.foo() checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Any?>() }
+    i2.x checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Any?>() }
 
     j.<!INAPPLICABLE_CANDIDATE!>bar<!>(1, 2, Any())
     j.bar(null)
diff --git a/compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.fir.kt b/compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.fir.kt
index 9086a1fa476..0d4d739096a 100644
--- a/compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.fir.kt
@@ -6,5 +6,5 @@ interface Tr<T> {
 
 fun test(t: Tr<*>) {
     t.v = t
-    t.v checkType { <!UNRESOLVED_REFERENCE!>_<!><Tr<*>>() }
+    t.v checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Tr<*>>() }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.fir.kt b/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.fir.kt
index fedfb34f531..6812fed723e 100644
--- a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.fir.kt
@@ -10,5 +10,5 @@ fun test(t: Tr<*>) {
     t.v = null!!
     t.v = ""
     t.v = null
-    t.v checkType { <!UNRESOLVED_REFERENCE!>_<!><Any?>() }
+    t.v checkType { _<Any?>() }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureForNullableTypes.fir.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureForNullableTypes.fir.kt
index 019da0ed399..1f1c83f0fbf 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureForNullableTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureForNullableTypes.fir.kt
@@ -7,7 +7,7 @@ fun <T: Any> bar(a: Array<T>): Array<T?> =  null!!
 fun test1(a: Array<out Int>) {
     val r: Array<out Int?> = bar(a)
     val t = bar(a)
-    t checkType { <!UNRESOLVED_REFERENCE!>_<!><Array<out Int?>>() }
+    t checkType { _<Array<out Int?>>() }
 }
 
 fun <T: Any> foo(l: Array<T>): Array<Array<T?>> = null!!
@@ -15,5 +15,5 @@ fun <T: Any> foo(l: Array<T>): Array<Array<T?>> = null!!
 fun test2(a: Array<out Int>) {
     val r: Array<out Array<out Int?>> = foo(a)
     val t = foo(a)
-    t checkType { <!UNRESOLVED_REFERENCE!>_<!><Array<out Array<out Int?>>>() }
+    t checkType { _<Array<out Array<out Int?>>>() }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureForPlatformTypes.fir.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureForPlatformTypes.fir.kt
deleted file mode 100644
index fe976e17094..00000000000
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureForPlatformTypes.fir.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-// !CHECK_TYPE
-// !DIAGNOSTICS: -UNUSED_VARIABLE
-// FILE: A.java
-public class A {
-    public static <T> Class<T> foo(Class<T> clazz) {
-        return clazz;
-    }
-
-    public static <T> Class<Class<T>> bar(Class<T> clazz) {
-        throw new Exception();
-    }
-}
-
-// FILE: b.kt
-fun test1(clazz: Class<out Int>) {
-    val foo0: Class<out Int> = A.foo(clazz)
-    val foo1 = A.foo(clazz)
-    foo1 checkType { <!UNRESOLVED_REFERENCE!>_<!>< Class<out Int> >() }
-    foo1 checkType { <!UNRESOLVED_REFERENCE!>_<!>< Class<out Int?> >() }
-}
-
-fun tes2t(clazz: Class<in Int>) {
-    val foo0: Class<out Class<in Int>> = A.bar(clazz)
-    val foo1 = A.bar(clazz)
-    foo1 checkType { <!UNRESOLVED_REFERENCE!>_<!>< Class<out Class<in Int>> >() }
-    foo1 checkType { <!UNRESOLVED_REFERENCE!>_<!>< Class<out Class<in Int?>> >() }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureForPlatformTypes.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureForPlatformTypes.kt
index 6509c48e8f9..3ca38374720 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureForPlatformTypes.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureForPlatformTypes.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // FILE: A.java
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/capturedType.fir.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/capturedType.fir.kt
deleted file mode 100644
index a032a30b87e..00000000000
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/capturedType.fir.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// !CHECK_TYPE
-
-fun <T> foo(array: Array<T>): Array<T> = array
-
-fun test1(a1: Array<out Int>) {
-    val b1: Array<out Int> = foo(a1)
-    val c1 = foo(a1)
-    c1 checkType { <!UNRESOLVED_REFERENCE!>_<!><Array<out Int>>() }
-}
-
-fun test2(a2: Array<in Int>) {
-    val b2: Array<in Int> = foo(a2)
-    val c2 = foo(a2)
-    c2 checkType { <!UNRESOLVED_REFERENCE!>_<!><Array<in Int>>() }
-}
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/capturedType.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/capturedType.kt
index 1cee3fe84e8..7666c598f03 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/capturedType.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/capturedType.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 // !CHECK_TYPE
 
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeAndApproximation.fir.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeAndApproximation.fir.kt
deleted file mode 100644
index b0cc77cfab5..00000000000
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeAndApproximation.fir.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// !CHECK_TYPE
-
-fun <T> foo(a: Array<T>): Array<Array<T>> = throw Exception()
-
-fun test1(a1: Array<out Int>) {
-    val b1: Array<out Array<out Int>> = foo(a1)
-    val c1 = foo(a1)
-    c1 checkType { <!UNRESOLVED_REFERENCE!>_<!><Array<out Array<out Int>>>() }
-}
-
-fun test2(a2: Array<in Int>) {
-    val b2: Array<out Array<in Int>> = foo(a2)
-    val c2 = foo(a2)
-    c2 checkType { <!UNRESOLVED_REFERENCE!>_<!><Array<out Array<in Int>>>() }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeAndApproximation.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeAndApproximation.kt
index 42689ae47fb..0a5e17b3444 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeAndApproximation.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeAndApproximation.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 // !CHECK_TYPE
 
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeSubstitutedIntoOppositeProjection.fir.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeSubstitutedIntoOppositeProjection.fir.kt
deleted file mode 100644
index 8d039702800..00000000000
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeSubstitutedIntoOppositeProjection.fir.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// !CHECK_TYPE
-
-fun <T> foo1(a1: Array<in T>, a2: Array<T>): T = null!!
-
-fun test1(a1: Array<Int>, a2: Array<out Int>) {
-    foo1(a1, a2) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-}
-
-fun <T> foo2(a1: Array<T>, a2: Array<out T>): T = null!!
-
-fun test2(a1: Array<in Int>, a2: Array<Int>) {
-    foo2(a1, a2) checkType { <!UNRESOLVED_REFERENCE!>_<!><Any?>() }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeSubstitutedIntoOppositeProjection.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeSubstitutedIntoOppositeProjection.kt
index 42a2080473b..48590465f11 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeSubstitutedIntoOppositeProjection.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeSubstitutedIntoOppositeProjection.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
 
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2570.fir.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2570.fir.kt
deleted file mode 100644
index 505d3dbbefa..00000000000
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2570.fir.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-// !CHECK_TYPE
-// !DIAGNOSTICS: -UNUSED_VARIABLE
-
-fun <T> foo(l: MutableList<T>): MutableList<T> = l
-fun test(l: MutableList<out Int>) {
-    val a: MutableList<out Int> = foo(l)
-    val b = foo(l)
-    b checkType { <!UNRESOLVED_REFERENCE!>_<!>< MutableList<out Int> >() }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2570.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2570.kt
index 30e3508c4fb..edd7c1b47d8 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2570.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2570.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/memberScopeOfCaptured.fir.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/memberScopeOfCaptured.fir.kt
index c09a56415ba..ec3e58cb823 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/memberScopeOfCaptured.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/memberScopeOfCaptured.fir.kt
@@ -7,6 +7,6 @@ class A<T> {
 fun <E> A<E>.bar(): A<in E> = this
 
 fun baz(x: A<out CharSequence>) {
-    x.bar() checkType { <!UNRESOLVED_REFERENCE!>_<!><A<*>>() }
-    x.bar().foo() checkType { <!UNRESOLVED_REFERENCE!>_<!><Any?>() } // See KT-10448
+    x.bar() checkType { _<A<*>>() }
+    x.bar().foo() checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Any?>() } // See KT-10448
 }
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/overApproximationForInCaptured.fir.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/overApproximationForInCaptured.fir.kt
deleted file mode 100644
index b14d2498fd2..00000000000
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/overApproximationForInCaptured.fir.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// !CHECK_TYPE
-
-fun <T> foo(a: Array<T>): T = null!!
-
-fun test(a: Array<in Int>) {
-    foo(a) checkType { <!UNRESOLVED_REFERENCE!>_<!><Any?>() }
-}
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/overApproximationForInCaptured.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/overApproximationForInCaptured.kt
index 5d69f03f96e..63259b2b7b8 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/overApproximationForInCaptured.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/overApproximationForInCaptured.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
 
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/overApproximationForOutCaptured.fir.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/overApproximationForOutCaptured.fir.kt
deleted file mode 100644
index 9c9fa4e59fa..00000000000
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/overApproximationForOutCaptured.fir.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// !CHECK_TYPE
-
-fun <T> foo(a: Array<T>): T = null!!
-
-fun test(a: Array<out Int>) {
-    foo(a) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-}
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/overApproximationForOutCaptured.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/overApproximationForOutCaptured.kt
index 33a5f8da396..859ab7b5b8a 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/overApproximationForOutCaptured.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/overApproximationForOutCaptured.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
 
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/noCoercion.fir.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/noCoercion.fir.kt
index 25ebd6d5781..655898ee233 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/noCoercion.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/noCoercion.fir.kt
@@ -6,7 +6,7 @@ fun noCoercionLastExpressionUsedAsReturnArgument() {
         42
     }
 
-    a checkType { <!UNRESOLVED_REFERENCE!>_<!><() -> Int>() }
+    a checkType { _<() -> Int>() }
 }
 
 fun noCoercionBlockHasExplicitType() {
diff --git a/compiler/testData/diagnostics/tests/inference/commonSystem/kt3372toCollection.fir.kt b/compiler/testData/diagnostics/tests/inference/commonSystem/kt3372toCollection.fir.kt
deleted file mode 100644
index 18cd4edb8d4..00000000000
--- a/compiler/testData/diagnostics/tests/inference/commonSystem/kt3372toCollection.fir.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// !CHECK_TYPE
-// KT-3372 Use upper bound in type argument inference
-
-import java.util.HashSet
-
-fun <T, C: MutableCollection<T>> Iterable<T>.toCollection(result: C) : C = throw Exception()
-
-fun test(list: List<Int>) {
-    val set = list.toCollection(HashSet())
-    set checkType { <!UNRESOLVED_REFERENCE!>_<!><HashSet<Int>>() }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/commonSystem/kt3372toCollection.kt b/compiler/testData/diagnostics/tests/inference/commonSystem/kt3372toCollection.kt
index ea1f2c3b8de..f52fae489e4 100644
--- a/compiler/testData/diagnostics/tests/inference/commonSystem/kt3372toCollection.kt
+++ b/compiler/testData/diagnostics/tests/inference/commonSystem/kt3372toCollection.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
 // KT-3372 Use upper bound in type argument inference
diff --git a/compiler/testData/diagnostics/tests/inference/commonSystem/nestedLambdas.fir.kt b/compiler/testData/diagnostics/tests/inference/commonSystem/nestedLambdas.fir.kt
deleted file mode 100644
index 3e81b84763c..00000000000
--- a/compiler/testData/diagnostics/tests/inference/commonSystem/nestedLambdas.fir.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// !CHECK_TYPE
-
-fun <T, R> Collection<T>.map(transform : (T) -> R) : List<R> = throw Exception()
-
-fun test(list: List<List<Int>>) {
-
-    val list1 = list.map { it.map { "$it" } }
-    list1 checkType { <!UNRESOLVED_REFERENCE!>_<!><List<List<String>>>() }
-}
diff --git a/compiler/testData/diagnostics/tests/inference/commonSystem/nestedLambdas.kt b/compiler/testData/diagnostics/tests/inference/commonSystem/nestedLambdas.kt
index 636000acb4c..09b52c4b2d9 100644
--- a/compiler/testData/diagnostics/tests/inference/commonSystem/nestedLambdas.kt
+++ b/compiler/testData/diagnostics/tests/inference/commonSystem/nestedLambdas.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
 
diff --git a/compiler/testData/diagnostics/tests/inference/commonSystem/theSameFunctionInArgs.fir.kt b/compiler/testData/diagnostics/tests/inference/commonSystem/theSameFunctionInArgs.fir.kt
deleted file mode 100644
index 87ce95e3651..00000000000
--- a/compiler/testData/diagnostics/tests/inference/commonSystem/theSameFunctionInArgs.fir.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-// !CHECK_TYPE
-
-fun test() {
-    val array = arrayOf(arrayOf(1))
-    array checkType { <!UNRESOLVED_REFERENCE!>_<!><Array<Array<Int>>>() }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/commonSystem/theSameFunctionInArgs.kt b/compiler/testData/diagnostics/tests/inference/commonSystem/theSameFunctionInArgs.kt
index ee5966fe5f2..0e544da05bc 100644
--- a/compiler/testData/diagnostics/tests/inference/commonSystem/theSameFunctionInArgs.kt
+++ b/compiler/testData/diagnostics/tests/inference/commonSystem/theSameFunctionInArgs.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 
 fun test() {
diff --git a/compiler/testData/diagnostics/tests/inference/completion/nothingFromNestedCall.fir.kt b/compiler/testData/diagnostics/tests/inference/completion/nothingFromNestedCall.fir.kt
index e97e31bbaf8..2319bd65e03 100644
--- a/compiler/testData/diagnostics/tests/inference/completion/nothingFromNestedCall.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/completion/nothingFromNestedCall.fir.kt
@@ -9,5 +9,5 @@ fun <K> invOut(y: K?): Inv<Out<K>> = TODO()
 fun <R> test(x: Inv<Out<R>>): R = TODO()
 
 fun testNothing() {
-    test(invOut(null)) checkType { <!UNRESOLVED_REFERENCE!>_<!><Nothing>() }
+    test(invOut(null)) checkType { _<Nothing>() }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/equalityConstraintOnNullableType.fir.kt b/compiler/testData/diagnostics/tests/inference/constraints/equalityConstraintOnNullableType.fir.kt
deleted file mode 100644
index c9e1f3c8eab..00000000000
--- a/compiler/testData/diagnostics/tests/inference/constraints/equalityConstraintOnNullableType.fir.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-// !CHECK_TYPE
-interface A<T>
-
-fun <T> foo(a: A<T>, aN: A<T?>): T = throw Exception("$a $aN")
-
-fun <T> doA(a: A<T>): T = throw Exception("$a")
-
-fun test(a: A<Int>, aN: A<Int?>) {
-    val aa = doA(aN)
-    aa checkType {  <!UNRESOLVED_REFERENCE!>_<!><Int?>() }
-
-    val nullable = foo(aN, aN)
-    //T = Int?, T? = Int? => T = Int?
-    nullable checkType { <!UNRESOLVED_REFERENCE!>_<!><Int?>() }
-
-    val notNullable = foo(a, aN)
-    //T = Int, T? = Int? => T = Int
-    notNullable checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-}
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/equalityConstraintOnNullableType.kt b/compiler/testData/diagnostics/tests/inference/constraints/equalityConstraintOnNullableType.kt
index 152242d6392..26f5b6971d7 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/equalityConstraintOnNullableType.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/equalityConstraintOnNullableType.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 interface A<T>
 
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.fir.kt b/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.fir.kt
index ac3cc49aa4f..2d90e788e21 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.fir.kt
@@ -15,7 +15,7 @@ fun test(out: Out<Int>, i: In<Int>, inv: A<Int>) {
     // T? >: Int => T = Int
     doT(1)
     val r = doOut(out)
-    r checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    r checkType { _<Int>() }
 
     // T? <: Int => error
     <!INAPPLICABLE_CANDIDATE!>doIn<!>(i)
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/subtypeConstraintOnNullableType.fir.kt b/compiler/testData/diagnostics/tests/inference/constraints/subtypeConstraintOnNullableType.fir.kt
deleted file mode 100644
index a4459ec1777..00000000000
--- a/compiler/testData/diagnostics/tests/inference/constraints/subtypeConstraintOnNullableType.fir.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-// !CHECK_TYPE
-interface A<T>
-
-interface Out<out T>
-
-fun <T> foo(a: A<T>, o: Out<T?>): T = throw Exception("$a $o")
-
-fun <T> doOut(o: Out<T?>): T = throw Exception("$o")
-
-fun test(a: A<Int>, aN: A<Int?>, o: Out<Int?>) {
-    val out = doOut(o)
-    //T? >: Int? => T >: Int
-    out checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-
-    val nullable = foo(aN, o)
-    //T = Int?, T? >: Int? => T = Int?
-    nullable checkType { <!UNRESOLVED_REFERENCE!>_<!><Int?>() }
-
-    val notNullable = foo(a, o)
-    //T = Int, T? >: Int? => T = Int
-    notNullable checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-}
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/subtypeConstraintOnNullableType.kt b/compiler/testData/diagnostics/tests/inference/constraints/subtypeConstraintOnNullableType.kt
index 59d59410736..f21457943ca 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/subtypeConstraintOnNullableType.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/subtypeConstraintOnNullableType.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 interface A<T>
 
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/supertypeConstraintOnNullableType.fir.kt b/compiler/testData/diagnostics/tests/inference/constraints/supertypeConstraintOnNullableType.fir.kt
deleted file mode 100644
index 8eecd698e16..00000000000
--- a/compiler/testData/diagnostics/tests/inference/constraints/supertypeConstraintOnNullableType.fir.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-// !CHECK_TYPE
-interface A<T>
-
-interface In<in T>
-
-fun <T> foo(a: A<T>, i: In<T>): T = throw Exception("$a $i")
-
-fun <T> doIn(i: In<T?>): T = throw Exception("$i")
-
-fun test(a: A<Int>, aN: A<Int?>, i: In<Int?>) {
-    val _in = doIn(i)
-    //T? <: Int? => T <: Int?
-    _in checkType { <!UNRESOLVED_REFERENCE!>_<!><Int?>() }
-
-    val notNullable = foo(a, i)
-    //T = Int, T? <: Int? => T = Int
-    notNullable checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-
-    val nullable = foo(aN, i)
-    //T = Int?, T? <: Int? => T = Int?
-    nullable checkType { <!UNRESOLVED_REFERENCE!>_<!><Int?>() }
-}
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/supertypeConstraintOnNullableType.kt b/compiler/testData/diagnostics/tests/inference/constraints/supertypeConstraintOnNullableType.kt
index c6689046e89..90b401bfa05 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/supertypeConstraintOnNullableType.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/supertypeConstraintOnNullableType.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 interface A<T>
 
diff --git a/compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.fir.kt b/compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.fir.kt
index 9dad1baf906..8d7337641a6 100644
--- a/compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.fir.kt
@@ -11,19 +11,19 @@ class State(val p1: Double, val p2: () -> Int, val p3: String?)
 
 fun test(s: SelectorFor<State>): Double {
     val a = s { p1 }
-    a checkType { <!UNRESOLVED_REFERENCE!>_<!><AbstractSelector<State, Double>>() }
+    a checkType { _<AbstractSelector<State, Double>>() }
 
     val b = s { p2 }
-    b checkType { <!UNRESOLVED_REFERENCE!>_<!><AbstractSelector<State, () -> Int>>()}
+    b checkType { _<AbstractSelector<State, () -> Int>>()}
 
     val c = s { p3 }
-    c checkType { <!UNRESOLVED_REFERENCE!>_<!><AbstractSelector<State, String?>>() }
+    c checkType { _<AbstractSelector<State, String?>>() }
 
     val d = s { }
-    d checkType { <!UNRESOLVED_REFERENCE!>_<!><AbstractSelector<State, Unit>>() }
+    d checkType { _<AbstractSelector<State, Unit>>() }
 
     val e = s { return p1 }
-    e checkType { <!UNRESOLVED_REFERENCE!>_<!><AbstractSelector<State, Nothing>>() }
+    e checkType { _<AbstractSelector<State, Nothing>>() }
 
     return null!!
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/implicitInvokeInCompanionObjectWithFunctionalArgument.fir.kt b/compiler/testData/diagnostics/tests/inference/implicitInvokeInCompanionObjectWithFunctionalArgument.fir.kt
index 6335fc1b530..46da8700d06 100644
--- a/compiler/testData/diagnostics/tests/inference/implicitInvokeInCompanionObjectWithFunctionalArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/implicitInvokeInCompanionObjectWithFunctionalArgument.fir.kt
@@ -10,8 +10,8 @@ class TestClass {
 
 fun test(s: String): String {
     val a = TestClass { "K" }
-    a checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    a checkType { _<String>() }
 
     val b = TestClass { return s }
-    b checkType { <!UNRESOLVED_REFERENCE!>_<!><Nothing>() }
+    b checkType { _<Nothing>() }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/implicitInvokeInObjectWithFunctionalArgument.fir.kt b/compiler/testData/diagnostics/tests/inference/implicitInvokeInObjectWithFunctionalArgument.fir.kt
index 9b445a43789..cd227b70b35 100644
--- a/compiler/testData/diagnostics/tests/inference/implicitInvokeInObjectWithFunctionalArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/implicitInvokeInObjectWithFunctionalArgument.fir.kt
@@ -8,8 +8,8 @@ object TestClass {
 
 fun test(s: String): String {
     val a = TestClass { TestClass { TestClass } }
-    a checkType { <!UNRESOLVED_REFERENCE!>_<!><TestClass>() }
+    a checkType { _<TestClass>() }
 
     val b = TestClass { return s }
-    b checkType { <!UNRESOLVED_REFERENCE!>_<!><Nothing>() }
+    b checkType { _<Nothing>() }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/implicitInvokeWithFunctionLiteralArgument.fir.kt b/compiler/testData/diagnostics/tests/inference/implicitInvokeWithFunctionLiteralArgument.fir.kt
index cc6a8ce84ff..7975f090869 100644
--- a/compiler/testData/diagnostics/tests/inference/implicitInvokeWithFunctionLiteralArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/implicitInvokeWithFunctionLiteralArgument.fir.kt
@@ -8,7 +8,7 @@ class TestClass {
 
 fun <T> test(value: T, test: TestClass): T {
     val x = test { return value }
-    x checkType { <!UNRESOLVED_REFERENCE!>_<!><Nothing>() }
+    x checkType { _<Nothing>() }
 
     return value
 }
@@ -23,13 +23,13 @@ interface FutureCallback<E> {
 
 fun test(cb: FutureCallback<String>) {
     val a = cb { it[0] }
-    a checkType { <!UNRESOLVED_REFERENCE!>_<!><Future<Char>>() }
+    a checkType { _<Future<Char>>() }
 
     val b = cb { it }
-    b checkType { <!UNRESOLVED_REFERENCE!>_<!><Future<String>>() }
+    b checkType { _<Future<String>>() }
 
     val c = cb {}
-    c checkType { <!UNRESOLVED_REFERENCE!>_<!><Future<Unit>>() }
+    c checkType { _<Future<Unit>>() }
 
     cb.let { callback ->
         val d = callback { it.length }
diff --git a/compiler/testData/diagnostics/tests/inference/kt30405.fir.kt b/compiler/testData/diagnostics/tests/inference/kt30405.fir.kt
deleted file mode 100644
index b769cf1ff57..00000000000
--- a/compiler/testData/diagnostics/tests/inference/kt30405.fir.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-// !WITH_NEW_INFERENCE
-// !LANGUAGE: +ExpectedTypeFromCast
-// !CHECK_TYPE
-// Issue: KT-30405
-
-inline fun <reified T> foo(): T {
-    TODO()
-}
-
-fun test() {
-    val fooCall = foo() as String // T in foo should be inferred to String
-    fooCall checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
-
-    val safeFooCall = foo() as? String
-    safeFooCall checkType { <!UNRESOLVED_REFERENCE!>_<!><String?>() }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/kt30405.kt b/compiler/testData/diagnostics/tests/inference/kt30405.kt
index c618fc45235..eeb542cd06c 100644
--- a/compiler/testData/diagnostics/tests/inference/kt30405.kt
+++ b/compiler/testData/diagnostics/tests/inference/kt30405.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !WITH_NEW_INFERENCE
 // !LANGUAGE: +ExpectedTypeFromCast
 // !CHECK_TYPE
diff --git a/compiler/testData/diagnostics/tests/inference/nothingType/notEnoughInformationAndNothing.fir.kt b/compiler/testData/diagnostics/tests/inference/nothingType/notEnoughInformationAndNothing.fir.kt
index 3e58c6b661b..988a99029ca 100644
--- a/compiler/testData/diagnostics/tests/inference/nothingType/notEnoughInformationAndNothing.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/nothingType/notEnoughInformationAndNothing.fir.kt
@@ -13,7 +13,7 @@ fun test1(b: Boolean?) {
         false -> null
         null -> materialize<String>()
     }
-    v checkType { <!UNRESOLVED_REFERENCE!>_<!><Inv<String>?>() }
+    v checkType { _<Inv<String>?>() }
 }
 
 fun test2() {
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2754.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2754.fir.kt
deleted file mode 100644
index 3fb056c4e15..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2754.fir.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-// !CHECK_TYPE
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-
-// T is the immutable type
-interface Builder<out T> {
-    fun build(): T
-}
-
-// T is the immutable type, U is the builder
-interface Copyable<out T, out U : Builder<T>> {
-    fun builder(): U
-}
-
-fun <T : Copyable<T, U>, U : Builder<T>> T.copy(fn: U.() -> Unit): T = throw Exception()
-
-open class Foo(val x: Int, val y: Int) : Copyable<Foo, Foo.FooBuilder> {
-    override fun builder(): FooBuilder = FooBuilder(x, y)
-
-    open class FooBuilder(var x: Int, var y: Int): Builder<Foo> {
-        override fun build(): Foo = Foo(x, y)
-    }
-}
-
-fun test() {
-    val foo1 = Foo(x = 1, y = 2)
-    val foo2 = foo1.copy { y = 3 } // this doesn't work
-    foo2 checkType { <!UNRESOLVED_REFERENCE!>_<!><Foo>() }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2754.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2754.kt
index 6b5394796c3..2f773dece20 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2754.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2754.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt4420.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt4420.fir.kt
deleted file mode 100644
index 8952e6ff724..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt4420.fir.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-// !CHECK_TYPE
-//KT-4420 Type inference with type projections
-
-class Foo<T>
-fun <T> Foo<T>.bar(): T = throw Exception()
-
-fun main() {
-    val f: Foo<out String> = Foo()
-    f.bar() checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt4420.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt4420.kt
index 52a57a5ffbf..43548e6a3db 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt4420.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt4420.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 //KT-4420 Type inference with type projections
 
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.fir.kt b/compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.fir.kt
deleted file mode 100644
index 5f534de1211..00000000000
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.fir.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-// !CHECK_TYPE
-
-package g
-
-import java.util.HashSet
-fun <T, C: Collection<T>> convert(src: Collection<T>, dest: C): C = throw Exception("$src $dest")
-
-fun test(l: List<Int>) {
-    //todo should be inferred
-    val r = convert(l, HashSet())
-    r checkType { <!UNRESOLVED_REFERENCE!>_<!><HashSet<Int>>() }
-}
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.kt b/compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.kt
index 0fe2041a8e8..b3631d69542 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.kt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 
 package g
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/typeParameterAsUpperBound.fir.kt b/compiler/testData/diagnostics/tests/inference/upperBounds/typeParameterAsUpperBound.fir.kt
index a88eaaa611f..70c58e281c2 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/typeParameterAsUpperBound.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/typeParameterAsUpperBound.fir.kt
@@ -9,8 +9,8 @@ public fun <T> listOf(t: T): List<T> = TODO()
 
 fun usage(c: List<String>) {
     val cn = c.ifEmpty { null }
-    cn checkType { <!UNRESOLVED_REFERENCE!>_<!><List<String>?>() }
+    cn checkType { _<List<String>?>() }
 
     val cs = c.ifEmpty { listOf("x") }
-    cs checkType { <!UNRESOLVED_REFERENCE!>_<!><List<String>>() }
+    cs checkType { _<List<String>>() }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.fir.kt b/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.fir.kt
index 0c6e0e544ac..a062b91dc38 100644
--- a/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.fir.kt
@@ -2,20 +2,20 @@ package f
 
 object A {
     class LoginFormPage() : Request({
-        val failed = <!UNRESOLVED_REFERENCE!>session<!>.<!UNRESOLVED_REFERENCE!>get<!>("LOGIN_FAILED")
+        val failed = session.get("LOGIN_FAILED")
     })
 }
 
 class B {
     companion object {
         class LoginFormPage() : Request({
-            val failed = <!UNRESOLVED_REFERENCE!>session<!>.<!UNRESOLVED_REFERENCE!>get<!>("LOGIN_FAILED")
+            val failed = session.get("LOGIN_FAILED")
         })
     }
 
     class C {
         class LoginFormPage() : Request({
-            val failed = <!UNRESOLVED_REFERENCE!>session<!>.<!UNRESOLVED_REFERENCE!>get<!>("LOGIN_FAILED")
+            val failed = session.get("LOGIN_FAILED")
         })
     }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/arrayOfStarParametrized.fir.kt b/compiler/testData/diagnostics/tests/j+k/arrayOfStarParametrized.fir.kt
index d18fda6e7fe..cf3299ac494 100644
--- a/compiler/testData/diagnostics/tests/j+k/arrayOfStarParametrized.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/arrayOfStarParametrized.fir.kt
@@ -10,5 +10,5 @@ public class A<T> {
 
 fun foo1(x: A<*>) = x.baz()
 fun foo2(x: A<*>) {
-    x.baz() checkType { <!UNRESOLVED_REFERENCE!>_<!><Array<out A<*>>>() }
+    x.baz() checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Array<out A<*>>>() }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/collectorInference.fir.kt b/compiler/testData/diagnostics/tests/j+k/collectorInference.fir.kt
deleted file mode 100644
index b39362a17a7..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/collectorInference.fir.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-// !WITH_NEW_INFERENCE
-// !CHECK_TYPE
-// SKIP_TXT
-// FULL_JDK
-
-import java.util.stream.Collectors
-import java.util.stream.Stream
-
-fun test(a: Stream<String>) {
-    a.collect(Collectors.toList()) checkType { <!UNRESOLVED_REFERENCE!>_<!><MutableList<String>>() }
-    // actually the inferred type is platform
-    a.collect(Collectors.toList()) checkType { <!UNRESOLVED_REFERENCE!>_<!><List<String?>>() }
-}
-
diff --git a/compiler/testData/diagnostics/tests/j+k/collectorInference.kt b/compiler/testData/diagnostics/tests/j+k/collectorInference.kt
index 75e51dc97ec..4cf347e6fb1 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectorInference.kt
+++ b/compiler/testData/diagnostics/tests/j+k/collectorInference.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // SKIP_TXT
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructor/classTypeParameterInferredFromArgument.fir.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructor/classTypeParameterInferredFromArgument.fir.kt
index bab46b386aa..1042d4ef213 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructor/classTypeParameterInferredFromArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructor/classTypeParameterInferredFromArgument.fir.kt
@@ -9,8 +9,8 @@ public class A<E> {
 // FILE: main.kt
 
 fun test(x: List<Int>, y: List<String>) {
-    A("", x) checkType { <!UNRESOLVED_REFERENCE!>_<!><A<Any?>>() }
-    A("", y) checkType { <!UNRESOLVED_REFERENCE!>_<!><A<String?>>() }
+    A("", x) checkType { <!INAPPLICABLE_CANDIDATE!>_<!><A<Any?>>() }
+    A("", y) checkType { _<A<String?>>() }
 
     <!INAPPLICABLE_CANDIDATE!>A<!><CharSequence, String>("", x)
     A<CharSequence, String>("", y)
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructor/innerClass.fir.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructor/innerClass.fir.kt
index 7dc1379b776..0e66f764eab 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructor/innerClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructor/innerClass.fir.kt
@@ -10,9 +10,9 @@ public class Outer<T> {
 
 // FILE: main.kt
 fun test(x: List<Int>, y: List<String>) {
-    Outer<Int>().Inner("", y, 1) checkType { <!UNRESOLVED_REFERENCE!>_<!><Outer<Int>.Inner<String>>() }
+    Outer<Int>().Inner("", y, 1) checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Outer<Int>.Inner<String>>() }
     Outer<Int>().<!INAPPLICABLE_CANDIDATE!>Inner<!><CharSequence, String, Int>("", y, 1) <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Outer<Int>.Inner<CharSequence>>() }
 
-    Outer<Int>().Inner("", x, 1) checkType { <!UNRESOLVED_REFERENCE!>_<!><Outer<Int>.Inner<Any>>() }
+    Outer<Int>().Inner("", x, 1) checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Outer<Int>.Inner<Any>>() }
     Outer<Int>().<!INAPPLICABLE_CANDIDATE!>Inner<!><CharSequence, String, Int>("", x, 1)
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/kt36856.fir.kt b/compiler/testData/diagnostics/tests/j+k/kt36856.fir.kt
index 7bd185c421e..3be6d64511f 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt36856.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/kt36856.fir.kt
@@ -14,6 +14,6 @@ class Foo<T>
 fun main(foo1: Foo<Boolean>, foo2: Foo<String>) {
     val x = object : Test() {} // FE exception is thrown here
 
-    x.with(foo1) checkType { <!UNRESOLVED_REFERENCE!>_<!><Boolean>() }
-    x.with(foo2) checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    x.with(foo1) checkType { _<Boolean>() }
+    x.with(foo2) checkType { _<String>() }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/wrongVarianceInJava.fir.kt b/compiler/testData/diagnostics/tests/j+k/wrongVarianceInJava.fir.kt
index f9f04ca3148..51c01f1e910 100644
--- a/compiler/testData/diagnostics/tests/j+k/wrongVarianceInJava.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/wrongVarianceInJava.fir.kt
@@ -19,6 +19,6 @@ class In<in F> {
 }
 
 fun test() {
-    A.foo().x() checkType { <!UNRESOLVED_REFERENCE!>_<!><Any?>() }
+    A.foo().x() checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Any?>() }
     A.bar().y(null)
 }
diff --git a/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.fir.kt b/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.fir.kt
index 4058881faf7..ccb9320dfbe 100644
--- a/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.fir.kt
+++ b/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.fir.kt
@@ -21,7 +21,7 @@ fun test() {
     checkSubtype<Int>(d)
 
     val e = id(9223372036854775807)
-    e checkType { <!UNRESOLVED_REFERENCE!>_<!><Long>() }
+    e checkType { _<Long>() }
 
     val f: Byte = either(1, 2)
 
@@ -32,7 +32,7 @@ fun test() {
     <!INAPPLICABLE_CANDIDATE!>otherGeneric<!>(1)
 
     val r = either(1, "")
-    r checkType { <!UNRESOLVED_REFERENCE!>_<!><Any>() }
+    r checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Any>() }
 
     use(a, b, c, d, e, f, g, r)
 }
@@ -48,7 +48,7 @@ fun testExactBound(invS: Inv<String>, invI: Inv<Int>, invB: Inv<Byte>) {
     exactBound(1, invI)
 
     val b = exactBound(1, invB)
-    b checkType { <!UNRESOLVED_REFERENCE!>_<!><Byte>() }
+    b checkType { _<Byte>() }
 }
 
 interface Cov<out T>
@@ -57,10 +57,10 @@ fun <T> lowerBound(t: T, l : Cov<T>): T = throw Exception("$t $l")
 
 fun testLowerBound(cov: Cov<String>, covN: Cov<Number>) {
     val r = lowerBound(1, cov)
-    r checkType { <!UNRESOLVED_REFERENCE!>_<!><Any>() }
+    r checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Any>() }
 
     val n = lowerBound(1, covN)
-    n checkType { <!UNRESOLVED_REFERENCE!>_<!><Number>() }
+    n checkType { _<Number>() }
 }
 
 interface Contr<in T>
@@ -71,8 +71,8 @@ fun testUpperBound(contrS: Contr<String>, contrB: Contr<Byte>, contrN: Contr<Num
     <!INAPPLICABLE_CANDIDATE!>upperBound<!>(1, contrS)
 
     val n = upperBound(1, contrN)
-    n checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    n checkType { _<Int>() }
 
     val b = upperBound(1, contrB)
-    b checkType { <!UNRESOLVED_REFERENCE!>_<!><Byte>() }
+    b checkType { _<Byte>() }
 }
diff --git a/compiler/testData/diagnostics/tests/overload/defaultParameters.fir.kt b/compiler/testData/diagnostics/tests/overload/defaultParameters.fir.kt
index 1a28b795288..c4b41b2f79e 100644
--- a/compiler/testData/diagnostics/tests/overload/defaultParameters.fir.kt
+++ b/compiler/testData/diagnostics/tests/overload/defaultParameters.fir.kt
@@ -28,28 +28,28 @@ fun wrong(a: String = "", b: Int = 1) {}
 
 fun test() {
     val a = simple()
-    a checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    a checkType { _<Int>() }
 
     val b = simple(1)
-    b checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    b checkType { _<String>() }
 
     val c = twoDefault()
-    c checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    c checkType { _<Int>() }
 
     val d = twoDefault(1)
-    d checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    d checkType { _<Int>() }
 
     val e = twoDefault(1, "")
-    e checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    e checkType { _<String>() }
 
     val f = withGeneric(3)
-    f checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    f checkType { _<Int>() }
 
     val g = discriminateGeneric(1)
-    g checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    g checkType { _<String>() }
 
     val h = withDefaultGeneric("")
-    h checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    h checkType { _<Int>() }
 
     withDefaults(1)
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.fir.kt
index 83c5ac36b0a..739c9e166f4 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.fir.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.fir.kt
@@ -22,6 +22,6 @@ fun <T> out(t: T): Out<MutableList<T>> = null!!
 
 fun test(a: Out<Nothing>, b: Out<MutableList<J>>) {
     val v = f(a, b, out(J.j()))
-    v checkType { <!UNRESOLVED_REFERENCE!>_<!><MutableList<J>>() }
-    v checkType { <!UNRESOLVED_REFERENCE!>_<!><MutableList<J?>>() }
+    v checkType { _<MutableList<J>>() }
+    v checkType { <!INAPPLICABLE_CANDIDATE!>_<!><MutableList<J?>>() }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/platformTypes/inference.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/inference.fir.kt
deleted file mode 100644
index ea06d3c395c..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/inference.fir.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-// !CHECK_TYPE
-
-// FILE: foo/Base.java
-
-package foo;
-
-public interface Base<T> {}
-
-// FILE: foo/HS.java
-
-package foo;
-
-public class HS<T> extends Base<T> {}
-
-// FILE: k.kt
-
-import foo.*;
-
-fun <T, C: Base<T>> convert(src: HS<T>, dest: C): C = throw Exception("$src $dest")
-
-fun test(l: HS<Int>) {
-    //todo should be inferred
-    val r = convert(l, HS())
-    r checkType { <!UNRESOLVED_REFERENCE!>_<!><HS<Int>>() }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/platformTypes/inference.kt b/compiler/testData/diagnostics/tests/platformTypes/inference.kt
index f6818460b8b..07d7264c93a 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/inference.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/inference.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 
 // FILE: foo/Base.java
diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/explicitGetterType.fir.kt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/explicitGetterType.fir.kt
index 2e8bcf7bad6..3e5e552b101 100644
--- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/explicitGetterType.fir.kt
+++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/explicitGetterType.fir.kt
@@ -12,7 +12,7 @@ fun <E> bar(): List<E> = null!!
 
 
 fun baz() {
-    x checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
-    y checkType { <!UNRESOLVED_REFERENCE!>_<!><List<Int>>() }
-    z checkType { <!UNRESOLVED_REFERENCE!>_<!><List<Int>>() }
+    x checkType { _<String>() }
+    y checkType { _<List<Int>>() }
+    z checkType { _<List<Int>>() }
 }
diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/members.fir.kt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/members.fir.kt
index 59e36b0d91f..d755fd6ec1a 100644
--- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/members.fir.kt
+++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/members.fir.kt
@@ -12,11 +12,11 @@ fun <E> id(x: E) = x
 fun <E> l(x: E): List<E> = null!!
 
 fun foo(a: A) {
-    a.x checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    a.y checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    a.y2 checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    a.z checkType { <!UNRESOLVED_REFERENCE!>_<!><List<String>>() }
-    a.z2 checkType { <!UNRESOLVED_REFERENCE!>_<!><List<List<String>>>() }
+    a.x checkType { _<Int>() }
+    a.y checkType { _<Int>() }
+    a.y2 checkType { _<Int>() }
+    a.z checkType { _<List<String>>() }
+    a.z2 checkType { _<List<List<String>>>() }
 
     with(a) {
         1.u checkType { _<Int>() }
diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/nullAsNothing.fir.kt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/nullAsNothing.fir.kt
index 0ac6589f0c1..d43acd3a5f7 100644
--- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/nullAsNothing.fir.kt
+++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/nullAsNothing.fir.kt
@@ -4,6 +4,6 @@ val x get() = null
 val y get() = null!!
 
 fun foo() {
-    x checkType { <!UNRESOLVED_REFERENCE!>_<!><Nothing?>() }
-    y checkType { <!UNRESOLVED_REFERENCE!>_<!><Nothing>() }
+    x checkType { _<Nothing?>() }
+    y checkType { _<Nothing>() }
 }
diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/overrides.fir.kt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/overrides.fir.kt
index c329821e32d..5fcf7b94f99 100644
--- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/overrides.fir.kt
+++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/overrides.fir.kt
@@ -18,20 +18,20 @@ class C : B(), A {
     override var y
         get() = super.y
         set(value) {
-            value checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
+            value checkType { _<String>() }
         }
 
     override var z
         get() = ""
         set(value) {
-            value checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
+            value checkType { _<String>() }
         }
 }
 
 fun foo(c: C) {
-    c.x checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    c.y checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
-    c.z checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    c.x checkType { _<Int>() }
+    c.y checkType { _<String>() }
+    c.z checkType { _<String>() }
 
     c.y = ""
     c.y = 1
diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/topLevel.fir.kt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/topLevel.fir.kt
index fee3f677993..a28d20cf58a 100644
--- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/topLevel.fir.kt
+++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/topLevel.fir.kt
@@ -11,11 +11,11 @@ fun <E> id(x: E) = x
 fun <E> l(x: E): List<E> = null!!
 
 fun foo() {
-    x checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    y checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    y2 checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    z checkType { <!UNRESOLVED_REFERENCE!>_<!><List<String>>() }
-    z2 checkType { <!UNRESOLVED_REFERENCE!>_<!><List<List<String>>>() }
+    x checkType { _<Int>() }
+    y checkType { _<Int>() }
+    y2 checkType { _<Int>() }
+    z checkType { _<List<String>>() }
+    z2 checkType { _<List<List<String>>>() }
 
-    1.u checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    1.u checkType { _<Int>() }
 }
diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/vars.fir.kt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/vars.fir.kt
index d8e9261d7f7..8b45beb2913 100644
--- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/vars.fir.kt
+++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/vars.fir.kt
@@ -2,7 +2,7 @@
 var x
     get() = 1
     set(q) {
-        q checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+        q checkType { _<Int>() }
     }
 
 var noSetter
@@ -10,8 +10,8 @@ var noSetter
 
 
 fun foo() {
-    x checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    noSetter checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    x checkType { _<Int>() }
+    noSetter checkType { _<Int>() }
 
     x = 1
     x = ""
diff --git a/compiler/testData/diagnostics/tests/regressions/kt442.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt442.fir.kt
index 0e1d3c624ef..acdf2880dc0 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt442.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt442.fir.kt
@@ -26,6 +26,6 @@ infix fun <T> T.with(f :  T.() -> Unit) {
 
 fun main() {
     val a = 1 with {
-        <!UNRESOLVED_REFERENCE!>plus<!>(1)
+        plus(1)
     }
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/inferenceInLinkedLambdas.fir.kt b/compiler/testData/diagnostics/tests/resolve/inferenceInLinkedLambdas.fir.kt
deleted file mode 100644
index fd41b8a4972..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/inferenceInLinkedLambdas.fir.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// !CHECK_TYPE
-
-fun <T, R> foo(first: () -> T, second: (T) -> R): R = throw Exception()
-fun test() {
-    val r = foo( { 4 }, { "${it + 1}" } )
-    r checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/inferenceInLinkedLambdas.kt b/compiler/testData/diagnostics/tests/resolve/inferenceInLinkedLambdas.kt
index b6e7f1bc6dd..b7db8fc0528 100644
--- a/compiler/testData/diagnostics/tests/resolve/inferenceInLinkedLambdas.kt
+++ b/compiler/testData/diagnostics/tests/resolve/inferenceInLinkedLambdas.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
 
diff --git a/compiler/testData/diagnostics/tests/resolve/priority/kt10510.fir.kt b/compiler/testData/diagnostics/tests/resolve/priority/kt10510.fir.kt
deleted file mode 100644
index 383c6940e68..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/priority/kt10510.fir.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-// !CHECK_TYPE
-// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
-
-class ClassA {
-    fun method1() = this
-
-    fun String.method2() {
-        method1() checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
-        this.method1() checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
-    }
-}
-
-fun String.method1() = this
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/resolve/priority/kt10510.kt b/compiler/testData/diagnostics/tests/resolve/priority/kt10510.kt
index 3f37e2d061a..5793c8fdae4 100644
--- a/compiler/testData/diagnostics/tests/resolve/priority/kt10510.kt
+++ b/compiler/testData/diagnostics/tests/resolve/priority/kt10510.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/resolve/priority/kt9965.fir.kt b/compiler/testData/diagnostics/tests/resolve/priority/kt9965.fir.kt
deleted file mode 100644
index 0be29b963af..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/priority/kt9965.fir.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-// !CHECK_TYPE
-// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
-
-enum class Foo {
-    FOO;
-
-    companion object {
-        fun valueOf(something: String) = 2
-
-        fun values() = 1
-    }
-}
-
-fun test() {
-    Foo.values() checkType { <!UNRESOLVED_REFERENCE!>_<!><Array<Foo>>() }
-    Foo.Companion.values() checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-
-    Foo.valueOf("") checkType { <!UNRESOLVED_REFERENCE!>_<!><Foo>() }
-    Foo.Companion.valueOf("") checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/resolve/priority/kt9965.kt b/compiler/testData/diagnostics/tests/resolve/priority/kt9965.kt
index 593d66c0c29..8a44af3b138 100644
--- a/compiler/testData/diagnostics/tests/resolve/priority/kt9965.kt
+++ b/compiler/testData/diagnostics/tests/resolve/priority/kt9965.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/resolve/priority/localExtVsNonLocalExt.fir.kt b/compiler/testData/diagnostics/tests/resolve/priority/localExtVsNonLocalExt.fir.kt
deleted file mode 100644
index f268f5f6600..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/priority/localExtVsNonLocalExt.fir.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-// !CHECK_TYPE
-// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
-
-
-class A
-
-fun A.foo() = this
-
-fun test(a: A) {
-    fun A.foo() = 3
-
-    a.foo() checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    with(a) {
-        foo() checkType { _<Int>() }
-    }
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/priority/localExtVsNonLocalExt.kt b/compiler/testData/diagnostics/tests/resolve/priority/localExtVsNonLocalExt.kt
index cfee1159917..803fc56e02d 100644
--- a/compiler/testData/diagnostics/tests/resolve/priority/localExtVsNonLocalExt.kt
+++ b/compiler/testData/diagnostics/tests/resolve/priority/localExtVsNonLocalExt.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/resolve/priority/memberVsLocalExt.fir.kt b/compiler/testData/diagnostics/tests/resolve/priority/memberVsLocalExt.fir.kt
index 1bd8872c5b0..4142abaa394 100644
--- a/compiler/testData/diagnostics/tests/resolve/priority/memberVsLocalExt.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/priority/memberVsLocalExt.fir.kt
@@ -9,7 +9,7 @@ class A {
 fun test(a: A) {
     fun A.foo() = 4
 
-    a.foo() checkType { <!UNRESOLVED_REFERENCE!>_<!><A>() }
+    a.foo() checkType { _<A>() }
 
     with(a) {
         foo() checkType { _<A>() }
diff --git a/compiler/testData/diagnostics/tests/resolve/priority/staticVsImplicitReceiverMember.fir.kt b/compiler/testData/diagnostics/tests/resolve/priority/staticVsImplicitReceiverMember.fir.kt
deleted file mode 100644
index 959f6d53415..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/priority/staticVsImplicitReceiverMember.fir.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-// !CHECK_TYPE
-// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
-
-// FILE: A.java
-public class A {
-    public static void foo() {}
-}
-
-// FILE: 1.kt
-
-class C {
-    fun foo() = this
-
-    inner class B : A() {
-        fun test() {
-            foo() checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Unit>() }
-        }
-    }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/resolve/priority/staticVsImplicitReceiverMember.kt b/compiler/testData/diagnostics/tests/resolve/priority/staticVsImplicitReceiverMember.kt
index 0d2b4d5060c..122901780e1 100644
--- a/compiler/testData/diagnostics/tests/resolve/priority/staticVsImplicitReceiverMember.kt
+++ b/compiler/testData/diagnostics/tests/resolve/priority/staticVsImplicitReceiverMember.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/resolve/priority/synthesizedMembersVsExtension.fir.kt b/compiler/testData/diagnostics/tests/resolve/priority/synthesizedMembersVsExtension.fir.kt
index 1e7e5cd98fc..1780db676c2 100644
--- a/compiler/testData/diagnostics/tests/resolve/priority/synthesizedMembersVsExtension.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/priority/synthesizedMembersVsExtension.fir.kt
@@ -6,5 +6,5 @@ operator fun A.component1(): String = ""
 
 fun test(a: A) {
     val (b) = a
-    b checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    b checkType { _<Int>() }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/resolve/priority/syntheticPropertiesVsExtensions.fir.kt b/compiler/testData/diagnostics/tests/resolve/priority/syntheticPropertiesVsExtensions.fir.kt
deleted file mode 100644
index 4ef52eb8488..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/priority/syntheticPropertiesVsExtensions.fir.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-// !CHECK_TYPE
-// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
-
-// FILE: A.java
-public class A {
-    public A getFoo() { return 3; }
-}
-
-// FILE: 1.kt
-
-private val A.foo: Int get() = 4
-
-fun test(a: A) {
-    a.foo checkType { <!UNRESOLVED_REFERENCE!>_<!><A>() }
-    with(a) {
-        foo checkType { _<A>() }
-    }
-}
-
-class B {
-    private val A.foo: B get() = this@B
-
-    fun test(a: A) {
-        a.foo checkType { <!INAPPLICABLE_CANDIDATE!>_<!><A>() }
-        with(a) {
-            foo checkType { _<A>() }
-        }
-    }
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/priority/syntheticPropertiesVsExtensions.kt b/compiler/testData/diagnostics/tests/resolve/priority/syntheticPropertiesVsExtensions.kt
index 4efbd0051f2..2965520b27e 100644
--- a/compiler/testData/diagnostics/tests/resolve/priority/syntheticPropertiesVsExtensions.kt
+++ b/compiler/testData/diagnostics/tests/resolve/priority/syntheticPropertiesVsExtensions.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/samConversions/OverloadPriority.fir.kt b/compiler/testData/diagnostics/tests/samConversions/OverloadPriority.fir.kt
index d89c9c184f1..08666e38507 100644
--- a/compiler/testData/diagnostics/tests/samConversions/OverloadPriority.fir.kt
+++ b/compiler/testData/diagnostics/tests/samConversions/OverloadPriority.fir.kt
@@ -27,5 +27,5 @@ fun test(j: J) {
     j.<!AMBIGUITY!>bas<!>({ <!UNRESOLVED_REFERENCE!>it<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Any>() }; "" }, "") <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
 
     // NI: TODO
-    j.bar { it checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Any>() }; "" } checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    j.bar { it checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Any>() }; "" } checkType { _<Int>() }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/samConversions/OverloadPriorityKT.fir.kt b/compiler/testData/diagnostics/tests/samConversions/OverloadPriorityKT.fir.kt
index a7eea3f18fe..9e798e39854 100644
--- a/compiler/testData/diagnostics/tests/samConversions/OverloadPriorityKT.fir.kt
+++ b/compiler/testData/diagnostics/tests/samConversions/OverloadPriorityKT.fir.kt
@@ -26,5 +26,5 @@ fun test(k: K) {
     k.<!AMBIGUITY!>bas<!> { <!UNRESOLVED_REFERENCE!>it<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Any?>() }; "" } <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
 
     // NI: TODO
-    k.bar { it checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Any>() }; "" } checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    k.bar { it checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Any>() }; "" } checkType { _<Int>() }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt1275.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/inference/kt1275.fir.kt
index 3e8b55e329b..879f4905bec 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt1275.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt1275.fir.kt
@@ -4,8 +4,8 @@ fun foo(s : String?, b : Boolean) {
     if (s == null) return
 
     val s1 = if (b) "" else s
-    s1 checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    s1 checkType { _<String>() }
 
     val s2 = s
-    s2 checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    s2 checkType { _<String>() }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt30927.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/kt30927.fir.kt
index 9ae3e219581..c696612aea0 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/kt30927.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/kt30927.fir.kt
@@ -8,8 +8,8 @@ fun case_0() {
         this as Int
         this // error in NI: required Int, found Any?; just inferred to Any? in OI
     }
-    y checkType { <!UNRESOLVED_REFERENCE!>_<!><Any?>() }
-    y checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    y checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Any?>() }
+    y checkType { _<Int>() }
 }
 
 fun case_1(z: Any?) {
@@ -20,8 +20,8 @@ fun case_1(z: Any?) {
             else -> return@run ""
         }
     }
-    y checkType { <!UNRESOLVED_REFERENCE!>_<!><Any?>() }
-    y checkType { <!UNRESOLVED_REFERENCE!>_<!><kotlin.String>() }
+    y checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Any?>() }
+    y checkType { _<kotlin.String>() }
     // y is inferred to Any?
 }
 
@@ -33,7 +33,7 @@ fun case_2(z: Any?) {
             else -> return@run ""
         }
     }
-    y checkType { <!UNRESOLVED_REFERENCE!>_<!><kotlin.String>() }
+    y checkType { _<kotlin.String>() }
     // y is inferred to String
 }
 
@@ -45,7 +45,7 @@ fun case_3(z: Any?) {
             else -> return@let ""
         }
     }
-    y checkType { <!UNRESOLVED_REFERENCE!>_<!><Any?>() }
-    y checkType { <!UNRESOLVED_REFERENCE!>_<!><kotlin.String>() }
+    y checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Any?>() }
+    y checkType { _<kotlin.String>() }
     // y is inferred to String
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolution.fir.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolution.fir.kt
index 26b40b35e3b..2f03f7e41dc 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolution.fir.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolution.fir.kt
@@ -11,26 +11,26 @@ public class A {
 // FILE: 1.kt
 fun fn() {}
 fun x(a: A, r: Runnable) {
-    a.foo(::fn) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    a.foo {} checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    a.foo(::fn) checkType { _<Int>() }
+    a.foo {} checkType { _<Int>() }
 
-    a.foo(null) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    a.foo(Runnable { }) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    a.foo(r) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    a.foo(null) checkType { _<Int>() }
+    a.foo(Runnable { }) checkType { _<Int>() }
+    a.foo(r) checkType { _<Int>() }
 
-    a.foo(123) checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
-    a.foo("") checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    a.foo(123) checkType { _<String>() }
+    a.foo("") checkType { _<String>() }
 
-    a.bar(::fn) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    a.bar {} checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    a.bar(::fn) checkType { _<Int>() }
+    a.bar {} checkType { _<Int>() }
 
-    a.bar(r) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    a.bar(r) checkType { _<Int>() }
 
     a.<!AMBIGUITY!>bar<!>(null)
 
-    a.bar(null as Runnable?) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    a.bar(null as CharSequence?) checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    a.bar(null as Runnable?) checkType { _<Int>() }
+    a.bar(null as CharSequence?) checkType { _<String>() }
 
-    a.bar("") checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    a.bar("") checkType { _<String>() }
     a.<!INAPPLICABLE_CANDIDATE!>bar<!>(123)
 }
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStatic.fir.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStatic.fir.kt
index 8010a01b4a1..6f8ef36d796 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStatic.fir.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStatic.fir.kt
@@ -11,26 +11,26 @@ public class A {
 // FILE: 1.kt
 fun fn() {}
 fun x(r: Runnable) {
-    A.foo(::fn) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    A.foo {} checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    A.foo(::fn) checkType { _<Int>() }
+    A.foo {} checkType { _<Int>() }
 
-    A.foo(null) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    A.foo(Runnable { }) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    A.foo(r) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    A.foo(null) checkType { _<Int>() }
+    A.foo(Runnable { }) checkType { _<Int>() }
+    A.foo(r) checkType { _<Int>() }
 
-    A.foo(123) checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
-    A.foo("") checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    A.foo(123) checkType { _<String>() }
+    A.foo("") checkType { _<String>() }
 
-    A.bar(::fn) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    A.bar {} checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    A.bar(::fn) checkType { _<Int>() }
+    A.bar {} checkType { _<Int>() }
 
-    A.bar(r) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    A.bar(r) checkType { _<Int>() }
 
     A.<!AMBIGUITY!>bar<!>(null)
 
-    A.bar(null as Runnable?) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    A.bar(null as CharSequence?) checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    A.bar(null as Runnable?) checkType { _<Int>() }
+    A.bar(null as CharSequence?) checkType { _<String>() }
 
-    A.bar("") checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    A.bar("") checkType { _<String>() }
     A.<!INAPPLICABLE_CANDIDATE!>bar<!>(123)
 }
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStaticWithoutRefinedSams.fir.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStaticWithoutRefinedSams.fir.kt
index 5861cef2797..227af6c4a05 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStaticWithoutRefinedSams.fir.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStaticWithoutRefinedSams.fir.kt
@@ -12,26 +12,26 @@ public class A {
 // FILE: 1.kt
 fun fn() {}
 fun x(r: Runnable) {
-    A.foo(::fn) checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
-    A.foo {} checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    A.foo(::fn) checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
+    A.foo {} checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
 
-    A.foo(null) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    A.foo(Runnable { }) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    A.foo(r) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    A.foo(null) checkType { _<Int>() }
+    A.foo(Runnable { }) checkType { _<Int>() }
+    A.foo(r) checkType { _<Int>() }
 
-    A.foo(123) checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
-    A.foo("") checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    A.foo(123) checkType { _<String>() }
+    A.foo("") checkType { _<String>() }
 
-    A.bar(::fn) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    A.bar {} checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    A.bar(::fn) checkType { _<Int>() }
+    A.bar {} checkType { _<Int>() }
 
-    A.bar(r) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    A.bar(r) checkType { _<Int>() }
 
     A.<!AMBIGUITY!>bar<!>(null)
 
-    A.bar(null as Runnable?) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    A.bar(null as CharSequence?) checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    A.bar(null as Runnable?) checkType { _<Int>() }
+    A.bar(null as CharSequence?) checkType { _<String>() }
 
-    A.bar("") checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    A.bar("") checkType { _<String>() }
     A.<!INAPPLICABLE_CANDIDATE!>bar<!>(123)
 }
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionWithoutRefinedSams.fir.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionWithoutRefinedSams.fir.kt
index 4f02afb50ed..6408291a5f0 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionWithoutRefinedSams.fir.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionWithoutRefinedSams.fir.kt
@@ -12,26 +12,26 @@ public class A {
 // FILE: 1.kt
 fun fn() {}
 fun x(a: A, r: Runnable) {
-    a.foo(::fn) checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
-    a.foo {} checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    a.foo(::fn) checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
+    a.foo {} checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
 
-    a.foo(null) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    a.foo(Runnable { }) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    a.foo(r) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    a.foo(null) checkType { _<Int>() }
+    a.foo(Runnable { }) checkType { _<Int>() }
+    a.foo(r) checkType { _<Int>() }
 
-    a.foo(123) checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
-    a.foo("") checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    a.foo(123) checkType { _<String>() }
+    a.foo("") checkType { _<String>() }
 
-    a.bar(::fn) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    a.bar {} checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    a.bar(::fn) checkType { _<Int>() }
+    a.bar {} checkType { _<Int>() }
 
-    a.bar(r) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    a.bar(r) checkType { _<Int>() }
 
     a.<!AMBIGUITY!>bar<!>(null)
 
-    a.bar(null as Runnable?) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    a.bar(null as CharSequence?) checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    a.bar(null as Runnable?) checkType { _<Int>() }
+    a.bar(null as CharSequence?) checkType { _<String>() }
 
-    a.bar("") checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    a.bar("") checkType { _<String>() }
     a.<!INAPPLICABLE_CANDIDATE!>bar<!>(123)
 }
diff --git a/compiler/testData/diagnostics/tests/typealias/constructorCallThroughPrivateAlias.fir.kt b/compiler/testData/diagnostics/tests/typealias/constructorCallThroughPrivateAlias.fir.kt
index 777b7a75749..1475e2951eb 100644
--- a/compiler/testData/diagnostics/tests/typealias/constructorCallThroughPrivateAlias.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/constructorCallThroughPrivateAlias.fir.kt
@@ -11,7 +11,7 @@ private typealias A3 = B
 fun A3(x: Any) = "OK"
 
 fun bar() {
-    A3("") checkType { <!UNRESOLVED_REFERENCE!>_<!><B>() }
+    A3("") checkType { _<B>() }
 }
 
 // FILE: main.kt
@@ -23,7 +23,7 @@ fun baz() {
     a.A1("") // resolved to B constructor, OK
     a.A2("") // resolved to B constructor, INVISIBLE_MEMBER because type alias is private, OK
 
-    a.A3("") checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    a.A3("") checkType { _<String>() }
 
     val x: a.A2 = B("") // A2 is unresolved because it's private in file, OK
 }
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorVsFunction.fir.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorVsFunction.fir.kt
deleted file mode 100644
index f4b3547a87d..00000000000
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorVsFunction.fir.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !CHECK_TYPE
-// FILE: a.kt
-class B(x: String)
-
-typealias A1 = B
-private typealias A2 = B
-private typealias A3 = B
-
-fun A3(x: Any) = "OK"
-
-fun bar() {
-    A3("") checkType { <!UNRESOLVED_REFERENCE!>_<!><B>() }
-}
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorVsFunction.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorVsFunction.kt
index bef167d4c92..12db48ae768 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorVsFunction.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorVsFunction.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 // !CHECK_TYPE
 // FILE: a.kt
diff --git a/compiler/testData/diagnostics/tests/varargs/varargsAndOut1.fir.kt b/compiler/testData/diagnostics/tests/varargs/varargsAndOut1.fir.kt
deleted file mode 100644
index 04f8ff3f045..00000000000
--- a/compiler/testData/diagnostics/tests/varargs/varargsAndOut1.fir.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-// !CHECK_TYPE
-
-fun test(vararg a: String) {
-    a checkType { <!UNRESOLVED_REFERENCE!>_<!><Array<out String>>() }
-
-    foo(a) checkType { <!UNRESOLVED_REFERENCE!>_<!><Array<out String>>() }
-}
-
-fun <T> test1(vararg t: T) {
-    t checkType { <!UNRESOLVED_REFERENCE!>_<!><Array<out T>>() }
-}
-
-fun <T> foo(a: Array<T>): Array<T> = a
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/varargs/varargsAndOut1.kt b/compiler/testData/diagnostics/tests/varargs/varargsAndOut1.kt
index 4a3277928a8..4cb9f3691ef 100644
--- a/compiler/testData/diagnostics/tests/varargs/varargsAndOut1.kt
+++ b/compiler/testData/diagnostics/tests/varargs/varargsAndOut1.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 
 fun test(vararg a: String) {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/builtins/arraysAreCloneable.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/builtins/arraysAreCloneable.fir.kt
deleted file mode 100644
index b6e40ce955e..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/builtins/arraysAreCloneable.fir.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-// !CHECK_TYPE
-
-fun foo(x: Cloneable) = x
-
-fun test() {
-    foo(arrayOf(""))
-    foo(intArrayOf())
-    foo(longArrayOf())
-    foo(shortArrayOf())
-    foo(byteArrayOf())
-    foo(charArrayOf())
-    foo(doubleArrayOf())
-    foo(floatArrayOf())
-    foo(booleanArrayOf())
-
-    arrayOf("").clone() checkType { <!UNRESOLVED_REFERENCE!>_<!><Array<String>>() }
-    intArrayOf().clone() checkType { <!UNRESOLVED_REFERENCE!>_<!><IntArray>() }
-    longArrayOf().clone() checkType { <!UNRESOLVED_REFERENCE!>_<!><LongArray>() }
-    shortArrayOf().clone() checkType { <!UNRESOLVED_REFERENCE!>_<!><ShortArray>() }
-    byteArrayOf().clone() checkType { <!UNRESOLVED_REFERENCE!>_<!><ByteArray>() }
-    charArrayOf().clone() checkType { <!UNRESOLVED_REFERENCE!>_<!><CharArray>() }
-    doubleArrayOf().clone() checkType { <!UNRESOLVED_REFERENCE!>_<!><DoubleArray>() }
-    floatArrayOf().clone() checkType { <!UNRESOLVED_REFERENCE!>_<!><FloatArray>() }
-    booleanArrayOf().clone() checkType { <!UNRESOLVED_REFERENCE!>_<!><BooleanArray>() }
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/builtins/arraysAreCloneable.kt b/compiler/testData/diagnostics/testsWithStdLib/builtins/arraysAreCloneable.kt
index 8059c4900ae..67866110c4e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/builtins/arraysAreCloneable.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/builtins/arraysAreCloneable.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 
 fun foo(x: Cloneable) = x
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/dsl/errors/nonLambdaLiteralAsArgument.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/dsl/errors/nonLambdaLiteralAsArgument.fir.kt
index 8744ec7d62e..ea05aa00cde 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/dsl/errors/nonLambdaLiteralAsArgument.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/dsl/errors/nonLambdaLiteralAsArgument.fir.kt
@@ -10,6 +10,6 @@ fun passLambdaValue(l: ContractBuilder.() -> Unit) {
 
 fun passAnonymousFunction(x: Boolean) {
     contract(fun ContractBuilder.() {
-        <!UNRESOLVED_REFERENCE!>returns<!>() <!UNRESOLVED_REFERENCE!>implies<!> x
+        returns() implies x
     })
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt3458.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt3458.fir.kt
deleted file mode 100644
index 8fc7524f41e..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt3458.fir.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-// !CHECK_TYPE
-
-import java.io.File
-
-fun test() {
-    val dir = File("dir")
-    val files = dir.listFiles()?.toList() ?: listOf() // error
-    files checkType { <!UNRESOLVED_REFERENCE!>_<!><List<File>>() }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt3458.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt3458.kt
index 03cf7f8b523..79482e64012 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt3458.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/kt3458.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 
 import java.io.File
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt4975.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt4975.fir.kt
deleted file mode 100644
index 7a9267a731e..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt4975.fir.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-// !CHECK_TYPE
-
-fun <T> bar(f: () -> T) : T = f()
-
-fun test(map: MutableMap<Int, Int>) {
-    val r = bar {
-        map[1] = 2
-    }
-    r checkType { <!UNRESOLVED_REFERENCE!>_<!><Unit>() }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt4975.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt4975.kt
index 921a68f7936..c4fc78afd46 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt4975.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/kt4975.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 
 fun <T> bar(f: () -> T) : T = f()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers.fir.kt
index 17ace407e31..2a3392183b7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers.fir.kt
@@ -36,9 +36,9 @@ fun A.forEach() = ""
 fun A.forEach(s: String) {}
 
 fun test(a: A) {
-    a.forEach() checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    a.forEach() checkType { _<String>() }
 
-    a.forEach(1) checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    a.forEach(1) checkType { _<Int>() }
 
     a.forEach("")
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers2.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers2.fir.kt
index 09624f556de..dc9fba5def3 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers2.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers2.fir.kt
@@ -17,7 +17,7 @@ class B {
     fun A.forEach() = this@B
 
     fun test(a: A) {
-        a.forEach() checkType { <!INAPPLICABLE_CANDIDATE!>_<!><A>() } // todo
+        a.forEach() checkType { _<A>() } // todo
 
         with(a) {
             forEach() checkType { _<A>() } // todo
@@ -34,7 +34,7 @@ fun test2(a: A) {
     @kotlin.internal.HidesMembers
     fun A.forEach(i: Int) = ""
 
-    a.forEach() checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    a.forEach() checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
     a.forEach(1)
 
     with(a) {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/samAgainstFunctionalType.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/samAgainstFunctionalType.fir.kt
index c4068183517..ba53fff0680 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/samAgainstFunctionalType.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/samAgainstFunctionalType.fir.kt
@@ -25,6 +25,6 @@ public class StaticOverrides {
 
 fun test() {
     StaticOverrides.A.<!AMBIGUITY!>foo<!> {} <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Boolean>() }
-    StaticOverrides.B.foo {} checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
-    StaticOverrides.C.foo {} checkType { <!UNRESOLVED_REFERENCE!>_<!><Boolean>() }
+    StaticOverrides.B.foo {} checkType { _<String>() }
+    StaticOverrides.C.foo {} checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Boolean>() }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/unsupportedFeature.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/unsupportedFeature.fir.kt
index 3f1d73aa51d..ac552db0129 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/unsupportedFeature.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/unsupportedFeature.fir.kt
@@ -44,7 +44,7 @@ fun foo(x: List<String>, y: Throwable, z: A3) {
     x.stream()
     java.util.ArrayList<String>().stream()
 
-    y.fillInStackTrace() checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    y.fillInStackTrace() checkType { _<Int>() }
 
     HashMap<String, Int>().getOrDefault(Any(), null)
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/varargs/kt3213.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/varargs/kt3213.fir.kt
deleted file mode 100644
index 33f8c6d3900..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/varargs/kt3213.fir.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-// !CHECK_TYPE
-
-fun test(a: Array<out String>) {
-    val b = a.toList()
-
-    b checkType { <!UNRESOLVED_REFERENCE!>_<!><List<String>>() }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/varargs/kt3213.kt b/compiler/testData/diagnostics/testsWithStdLib/varargs/kt3213.kt
index 2ba6c1b72f4..e648c102456 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/varargs/kt3213.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/varargs/kt3213.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 
 fun test(a: Array<out String>) {