diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/genericFunctionsWithNullableTypes.kt b/compiler/testData/diagnostics/tests/callableReference/generic/genericFunctionsWithNullableTypes.kt
index b3e430d19b8..6c8123287db 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/genericFunctionsWithNullableTypes.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/genericFunctionsWithNullableTypes.kt
@@ -30,7 +30,7 @@ fun <T> test(x: T) {
     <!REIFIED_TYPE_FORBIDDEN_SUBSTITUTION, REIFIED_TYPE_FORBIDDEN_SUBSTITUTION!>baz<!>(null, null, ::foo)
 
     val s3: Pair<Int, String?> = <!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>bar(null, null, ::<!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!>)<!>
-    val s4: Pair<Int?, String> = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>bar(null, null, ::<!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!>)<!>
+    val s4: Pair<Int?, String> = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>bar(null, null, ::<!NI;IMPLICIT_NOTHING_AS_TYPE_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!>)<!>
 
     val s5: Pair<Int, String> = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>bar(1, "", ::foo)<!>
     val (a1: Int, b1: String) = <!COMPONENT_FUNCTION_RETURN_TYPE_MISMATCH!>bar(1, "", ::foo)<!>
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.fir.kt b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.fir.kt
index 2e9264619c7..a41b87bd9e3 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.fir.kt
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.fir.kt
@@ -1,4 +1,5 @@
 // !DIAGNOSTICS: -DEBUG_INFO_SMARTCAST
+// !WITH_NEW_INFERENCE
 fun bar(x: Int) = x + 1
 
 fun foo() {
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.kt b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.kt
index a2a2b5f470d..5192ef84474 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.kt
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.kt
@@ -1,4 +1,5 @@
 // !DIAGNOSTICS: -DEBUG_INFO_SMARTCAST
+// !WITH_NEW_INFERENCE
 fun bar(x: Int) = x + 1
 
 fun foo() {
@@ -12,17 +13,17 @@ fun foo() {
             if (1 > 2) bar(x)
         }
         if (<!SENSELESS_COMPARISON!>x == null<!>) {
-            bar(x)
+            <!NI;UNREACHABLE_CODE!>bar(<!>x<!NI;UNREACHABLE_CODE!>)<!>
         }
-        if (<!SENSELESS_COMPARISON!>x == null<!>) bar(x) else bar(x)
+        if (<!SENSELESS_COMPARISON!>x == null<!>) <!NI;UNREACHABLE_CODE!>bar(<!>x<!NI;UNREACHABLE_CODE!>)<!> else bar(x)
         bar(bar(x))
     } else if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>x<!> == null<!>) {
         bar(<!DEBUG_INFO_CONSTANT, TYPE_MISMATCH!>x<!>)
         if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>x<!> != null<!>) {
-            bar(x)
-            if (<!SENSELESS_COMPARISON!>x == null<!>) bar(x)
-            if (<!SENSELESS_COMPARISON!>x == null<!>) bar(x) else bar(x)
-            bar(bar(x) + bar(x))
+            <!NI;UNREACHABLE_CODE!>bar(<!>x<!NI;UNREACHABLE_CODE!>)<!>
+            <!NI;UNREACHABLE_CODE!>if (<!SENSELESS_COMPARISON!>x == null<!>) bar(x)<!>
+            <!NI;UNREACHABLE_CODE!>if (<!SENSELESS_COMPARISON!>x == null<!>) bar(x) else bar(x)<!>
+            <!NI;UNREACHABLE_CODE!>bar(bar(x) + bar(x))<!>
         } else if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>x<!> == null<!>) {
             bar(<!DEBUG_INFO_CONSTANT, TYPE_MISMATCH!>x<!>)
         }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.fir.kt b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.fir.kt
index 28b3d130b89..3a0a0916cfd 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.fir.kt
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.fir.kt
@@ -1,3 +1,4 @@
+// !WITH_NEW_INFERENCE
 fun bar(x: Int): Int = x + 1
 
 fun foo() {
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.kt b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.kt
index 0589735a2ef..c90ae2af731 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.kt
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.kt
@@ -1,3 +1,4 @@
+// !WITH_NEW_INFERENCE
 fun bar(x: Int): Int = x + 1
 
 fun foo() {
@@ -10,7 +11,7 @@ fun foo() {
         bar(<!DEBUG_INFO_SMARTCAST!>x<!>)
         for (q in a) {
             bar(<!DEBUG_INFO_SMARTCAST!>x<!>)
-            if (<!SENSELESS_COMPARISON!>x == null<!>) bar(<!DEBUG_INFO_SMARTCAST!>x<!>)
+            if (<!SENSELESS_COMPARISON!>x == null<!>) <!NI;UNREACHABLE_CODE!>bar(<!><!DEBUG_INFO_SMARTCAST!>x<!><!NI;UNREACHABLE_CODE!>)<!>
         }
     }
 
diff --git a/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.fir.kt b/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.fir.kt
index 58e4ad63617..80392808388 100644
--- a/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.fir.kt
@@ -1,5 +1,8 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE
 // !WITH_NEW_INFERENCE
 
 fun <T : Any> nullable(): T? = null
 
-val value = nullable<Int>() ?: nullable()
\ No newline at end of file
+fun test() {
+    val value = nullable<Int>() ?: nullable()
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.kt b/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.kt
index 9ac95c8770a..ab85e52ed9a 100644
--- a/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.kt
+++ b/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.kt
@@ -1,5 +1,8 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE
 // !WITH_NEW_INFERENCE
 
 fun <T : Any> nullable(): T? = null
 
-val value = nullable<Int>() ?: <!OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>nullable()<!>
\ No newline at end of file
+fun test() {
+    val value = nullable<Int>() ?: <!OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>nullable()<!>
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.txt b/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.txt
index f0e764ecab4..a8219cad8f0 100644
--- a/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.txt
+++ b/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.txt
@@ -1,4 +1,4 @@
 package
 
-public val value: kotlin.Int
 public fun </*0*/ T : kotlin.Any> nullable(): T?
+public fun test(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.fir.kt b/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.fir.kt
index bad2af8e986..f69ba67ed63 100644
--- a/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.fir.kt
+++ b/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.fir.kt
@@ -1,5 +1,6 @@
 // !LANGUAGE: -AllowAssigningArrayElementsToVarargsInNamedFormForFunctions
 // !DIAGNOSTICS: -UNUSED_PARAMETER
+// !WITH_NEW_INFERENCE
 
 @Retention(AnnotationRetention.SOURCE)
 @Target(AnnotationTarget.EXPRESSION)
diff --git a/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.kt b/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.kt
index deac2b29081..482d6abbb36 100644
--- a/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.kt
+++ b/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.kt
@@ -1,5 +1,6 @@
 // !LANGUAGE: -AllowAssigningArrayElementsToVarargsInNamedFormForFunctions
 // !DIAGNOSTICS: -UNUSED_PARAMETER
+// !WITH_NEW_INFERENCE
 
 @Retention(AnnotationRetention.SOURCE)
 @Target(AnnotationTarget.EXPRESSION)
@@ -19,7 +20,7 @@ fun test_fun(s: String, arr: Array<String>) {
 }
 
 fun test_ann(s: String, arr: Array<String>) {
-    @Ann(<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH, TYPE_MISMATCH!>[""]<!>, x = 1)
+    @Ann(<!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH, TYPE_MISMATCH!>[""]<!>, x = 1)
     foo()
     @Ann(*[""], x = 1)
     foo()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/ArrayOfNothing.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/ArrayOfNothing.fir.kt
index 5965caa70c1..aceb78c572e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/ArrayOfNothing.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/ArrayOfNothing.fir.kt
@@ -1,5 +1,6 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNCHECKED_CAST -USELESS_CAST
 // !LANGUAGE: +ProhibitNonReifiedArraysAsReifiedTypeArguments
+// !WITH_NEW_INFERENCE
 class A<T>
 
 fun test1(
diff --git a/compiler/testData/diagnostics/testsWithStdLib/ArrayOfNothing.kt b/compiler/testData/diagnostics/testsWithStdLib/ArrayOfNothing.kt
index 24fe9880e02..ecd73a325b1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/ArrayOfNothing.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/ArrayOfNothing.kt
@@ -1,5 +1,6 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNCHECKED_CAST -USELESS_CAST
 // !LANGUAGE: +ProhibitNonReifiedArraysAsReifiedTypeArguments
+// !WITH_NEW_INFERENCE
 class A<T>
 
 fun test1(
@@ -50,6 +51,6 @@ fun test6() = <!UNSUPPORTED!>foo<!><Nothing>()
 
 class B<T>(val array: Array<T>)
 
-fun <T> bar() = B<Array<T>>(<!TYPE_PARAMETER_AS_REIFIED_ARRAY!>arrayOf<!>())
+fun <T> bar() = B<Array<T>>(<!NI;TYPE_PARAMETER_AS_REIFIED_ARRAY, TYPE_PARAMETER_AS_REIFIED_ARRAY!>arrayOf<!>())
 
 fun test7() = <!UNSUPPORTED!>bar<!><Nothing>()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.kt
index 4ff8e63652c..7aafbff5bdd 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.kt
@@ -53,7 +53,7 @@ val test6 = <!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
 }
 
 val test7 = <!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
-    yield("baz")
+    yield(<!NI;TYPE_MISMATCH!>"baz"<!>)
     genericExtension<Int>()
 }
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.kt
index 218fb33e0e4..ba3299f2b20 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.kt
@@ -1,4 +1,4 @@
 // !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
-fun foo(first: Array<Any?>, second: Array<Any?>) = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>Pair<!>(first.<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>toCollection<!>(<!NO_VALUE_FOR_PARAMETER!>)<!>, second.<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>toCollection<!>(<!NO_VALUE_FOR_PARAMETER!>)<!>)
\ No newline at end of file
+fun foo(first: Array<Any?>, second: Array<Any?>) = Pair(first.toCollection(<!NO_VALUE_FOR_PARAMETER!>)<!>, second.toCollection(<!NO_VALUE_FOR_PARAMETER!>)<!>)
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.ni.txt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.ni.txt
index e1f0a5b5c7b..71d97fe0ee3 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.ni.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.ni.txt
@@ -1,3 +1,3 @@
 package
 
-public fun foo(/*0*/ first: kotlin.Array<kotlin.Any?>, /*1*/ second: kotlin.Array<kotlin.Any?>): [ERROR : Error function type]
+public fun foo(/*0*/ first: kotlin.Array<kotlin.Any?>, /*1*/ second: kotlin.Array<kotlin.Any?>): kotlin.Pair<kotlin.collections.MutableCollection<in kotlin.Any?>, kotlin.collections.MutableCollection<in kotlin.Any?>>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenericsWithoutRefinedSams.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenericsWithoutRefinedSams.kt
index 6d37ea85e0a..281ea18b652 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenericsWithoutRefinedSams.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenericsWithoutRefinedSams.kt
@@ -22,5 +22,5 @@ class Foo {
 // FILE: 1.kt
 fun test() {
     Foo().foo {} checkType { _<Int>() }
-    Foo().bar {} checkType { <!NI;DEBUG_INFO_UNRESOLVED_WITH_TARGET, NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>_<!><Int>() }
+    Foo().bar {} checkType { _<Int>() }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunctionWithoutRefinedSams.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunctionWithoutRefinedSams.kt
index 3e756fcdd78..544a5019925 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunctionWithoutRefinedSams.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunctionWithoutRefinedSams.kt
@@ -18,5 +18,5 @@ public class Foo {
 
 // FILE: 1.kt
 fun bar() {
-    Foo().test {} checkType { <!NI;DEBUG_INFO_UNRESOLVED_WITH_TARGET, NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>_<!><Int>() }
+    Foo().test {} checkType { _<Int>() }
 }
\ No newline at end of file