diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/32.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/32.kt
index c4b300ccca2..70ac0b8d0f3 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/32.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/32.kt
@@ -21,8 +21,8 @@ fun stringArg(number: String) {}
  */
 fun case_1(x: Int?) {
     if (x == null) {
-        stringArg(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String")!><!ALWAYS_NULL!>x<!>!!<!>)
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int? & kotlin.Nothing")!>x<!>
+        <!UNREACHABLE_CODE!>stringArg(<!><!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Nothing")!><!ALWAYS_NULL!>x<!>!!<!><!UNREACHABLE_CODE!>)<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int? & kotlin.Nothing"), UNREACHABLE_CODE!>x<!>
     }
 }
 
@@ -33,8 +33,8 @@ fun case_1(x: Int?) {
  */
 fun case_2(x: Int?, y: Nothing?) {
     if (x == <!DEBUG_INFO_CONSTANT!>y<!>) {
-        stringArg(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String")!><!ALWAYS_NULL!>x<!>!!<!>)
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int? & kotlin.Nothing")!>x<!>
+        <!UNREACHABLE_CODE!>stringArg(<!><!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Nothing")!><!ALWAYS_NULL!>x<!>!!<!><!UNREACHABLE_CODE!>)<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int? & kotlin.Nothing"), UNREACHABLE_CODE!>x<!>
     }
 }
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/33.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/33.kt
index 477fd3756b8..19c57b0dc3c 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/33.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/33.kt
@@ -95,6 +95,6 @@ fun case_6() {
         null!!
     }
 
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?"), UNINITIALIZED_VARIABLE!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>x<!>.<!DEBUG_INFO_UNRESOLVED_WITH_TARGET, UNRESOLVED_REFERENCE_WRONG_RECEIVER!>minus<!>(10.0)
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Double")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Double"), DEBUG_INFO_SMARTCAST!>x<!>.minus(10.0)
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/35.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/35.kt
index 917f40abca0..b72a2835930 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/35.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/35.kt
@@ -43,7 +43,7 @@ fun case_2(x: Any?) {
  */
 fun case_3(x: Any?) {
     while (true) {
-        x ?: return ?: <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>x<!>
+        x ?: return <!USELESS_ELVIS!>?: <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>x<!><!>
     }
 
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?"), UNREACHABLE_CODE!>x<!>
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/36.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/36.kt
index 1161c2964fe..88abace7073 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/36.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/36.kt
@@ -88,7 +88,7 @@ fun case_5(x: Any?) {
 fun case_6(x: Any?) {
     var y = x ?: null!!
     while (false || y is Number) {
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>x<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Number")!>y<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Number"), DEBUG_INFO_SMARTCAST!>y<!>.toByte()
     }
@@ -102,7 +102,7 @@ fun case_6(x: Any?) {
 fun case_7(x: Any?, z: Any) {
     var y = x ?: null!!
     while (false || y === z) {
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>x<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>y<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>y<!>.equals(10)
     }
@@ -116,7 +116,7 @@ fun case_7(x: Any?, z: Any) {
 fun case_8(x: Any?, z: Any) {
     var y = x ?: null!!
     y == z || return
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>x<!>
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>y<!>
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>y<!>.equals(10)
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/37.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/37.kt
index 7117529817c..bed3cfa3584 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/37.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/37.kt
@@ -43,7 +43,7 @@ fun case_2(a: Any?) {
  */
 fun case_3(x: Int?) {
     while (true) {
-        x ?: return ?: <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?"), DEBUG_INFO_SMARTCAST!>x<!>
+        x ?: return <!USELESS_ELVIS!>?: <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?"), DEBUG_INFO_SMARTCAST!>x<!><!>
     }
 
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?"), UNREACHABLE_CODE!>x<!>