diff --git a/analysis/analysis-api/testData/referenceResolve/AnnotationInsideFunction.kt b/analysis/analysis-api/testData/referenceResolve/AnnotationInsideFunction.kt
index f870c0b2db7..2d14528ee9b 100644
--- a/analysis/analysis-api/testData/referenceResolve/AnnotationInsideFunction.kt
+++ b/analysis/analysis-api/testData/referenceResolve/AnnotationInsideFunction.kt
@@ -3,7 +3,7 @@ package test
 annotation class Annotation
 
 fun test() {
-  <caret>Annotation fun some() {
+  @<caret>Annotation fun some() {
   }
 }
 
diff --git a/analysis/analysis-api/testData/referenceResolve/AnnotationInsideFunction.txt b/analysis/analysis-api/testData/referenceResolve/AnnotationInsideFunction.txt
index 250d2c2d88a..8e739eef099 100644
--- a/analysis/analysis-api/testData/referenceResolve/AnnotationInsideFunction.txt
+++ b/analysis/analysis-api/testData/referenceResolve/AnnotationInsideFunction.txt
@@ -1,2 +1,2 @@
 Resolved to:
-0: (in test) annotation class Annotation
+0: (in test.Annotation) constructor()
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/AnnotationOnFile.kt b/analysis/analysis-api/testData/referenceResolve/AnnotationOnFile.kt
index f0eecf43979..c673da38d17 100644
--- a/analysis/analysis-api/testData/referenceResolve/AnnotationOnFile.kt
+++ b/analysis/analysis-api/testData/referenceResolve/AnnotationOnFile.kt
@@ -1,4 +1,4 @@
-@file:[kotlin.<caret>Deprecated("message")]
+@file:[kotlin.<caret>Suppress("message")]
 
 package foo
 
diff --git a/analysis/analysis-api/testData/referenceResolve/AnnotationOnFile.txt b/analysis/analysis-api/testData/referenceResolve/AnnotationOnFile.txt
index fb9b52f0f65..1e0bb43ebc2 100644
--- a/analysis/analysis-api/testData/referenceResolve/AnnotationOnFile.txt
+++ b/analysis/analysis-api/testData/referenceResolve/AnnotationOnFile.txt
@@ -1,2 +1,2 @@
 Resolved to:
-0: (in kotlin.Deprecated) constructor(message: kotlin.String, replaceWith: kotlin.ReplaceWith = ..., level: kotlin.DeprecationLevel = ...)
\ No newline at end of file
+0: (in kotlin.Suppress) constructor(vararg names: kotlin.String)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/AnnotationOnFileWithImport.kt b/analysis/analysis-api/testData/referenceResolve/AnnotationOnFileWithImport.kt
index 054a27f6a22..d5295d86159 100644
--- a/analysis/analysis-api/testData/referenceResolve/AnnotationOnFileWithImport.kt
+++ b/analysis/analysis-api/testData/referenceResolve/AnnotationOnFileWithImport.kt
@@ -1,6 +1,6 @@
-@file:[<caret>D("message")]
+@file:[<caret>S("message")]
 
 package foo
 
-import kotlin.Deprecated as D
+import kotlin.Suppress as S
 
diff --git a/analysis/analysis-api/testData/referenceResolve/AnnotationOnFileWithImport.txt b/analysis/analysis-api/testData/referenceResolve/AnnotationOnFileWithImport.txt
index fb9b52f0f65..1e0bb43ebc2 100644
--- a/analysis/analysis-api/testData/referenceResolve/AnnotationOnFileWithImport.txt
+++ b/analysis/analysis-api/testData/referenceResolve/AnnotationOnFileWithImport.txt
@@ -1,2 +1,2 @@
 Resolved to:
-0: (in kotlin.Deprecated) constructor(message: kotlin.String, replaceWith: kotlin.ReplaceWith = ..., level: kotlin.DeprecationLevel = ...)
\ No newline at end of file
+0: (in kotlin.Suppress) constructor(vararg names: kotlin.String)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/AnnotationParameter.kt b/analysis/analysis-api/testData/referenceResolve/AnnotationParameter.kt
index 201466a57f8..d8da199d18e 100644
--- a/analysis/analysis-api/testData/referenceResolve/AnnotationParameter.kt
+++ b/analysis/analysis-api/testData/referenceResolve/AnnotationParameter.kt
@@ -3,6 +3,8 @@ package testing
 annotation class Annotation<T>(val clazz: Class<T>)
 class ATest
 
-@[Annotation<ATest>(javaClass<<caret>ATest>())]
+class A<T>
+
+@[Annotation<ATest>(A<<caret>ATest>())]
 class BTest
 
diff --git a/analysis/analysis-api/testData/referenceResolve/AnnotationTypeParameter.kt b/analysis/analysis-api/testData/referenceResolve/AnnotationTypeParameter.kt
index 61ead0405cc..657ba1183d1 100644
--- a/analysis/analysis-api/testData/referenceResolve/AnnotationTypeParameter.kt
+++ b/analysis/analysis-api/testData/referenceResolve/AnnotationTypeParameter.kt
@@ -3,6 +3,6 @@ package testing
 annotation class Annotation<T>(val clazz: Class<T>)
 class ATest
 
-@[Annotation<<caret>ATest>(ATest::class.java)]
+@[Annotation<<caret>ATest>(ATest::class)]
 class BTest
 
diff --git a/analysis/analysis-api/testData/referenceResolve/ClassObjectClassLiteralReferenceWithField.kt b/analysis/analysis-api/testData/referenceResolve/ClassObjectClassLiteralReferenceWithField.kt
index 5950e1439e2..c1e595e1419 100644
--- a/analysis/analysis-api/testData/referenceResolve/ClassObjectClassLiteralReferenceWithField.kt
+++ b/analysis/analysis-api/testData/referenceResolve/ClassObjectClassLiteralReferenceWithField.kt
@@ -2,7 +2,7 @@ package t
 
 class A {
     companion object Named {
-        val i: Int
+        val i: Int = 10
     }
 }
 
diff --git a/analysis/analysis-api/testData/referenceResolve/CtrlClickResolve.kt b/analysis/analysis-api/testData/referenceResolve/CtrlClickResolve.kt
index c8dfb91474a..4506651842f 100644
--- a/analysis/analysis-api/testData/referenceResolve/CtrlClickResolve.kt
+++ b/analysis/analysis-api/testData/referenceResolve/CtrlClickResolve.kt
@@ -1,9 +1,9 @@
 package ctrl_click
 
-fun IntArray(vararg content : Int) : IntArray = content
-fun <T> array(vararg t : T) : Array<T> = t
+fun IntArray(vararg content : String) : Array<out String> = content
+inline fun <reified T> array(vararg t : T) : Array<T> = arrayOf(*t)
 
 fun main(args : Array<String>) {
-    var a = <caret>IntArray(array(1, 2, 3))
+    var a = <caret>IntArray(*array("1", "2", "3"))
 }
 
diff --git a/analysis/analysis-api/testData/referenceResolve/CtrlClickResolve.txt b/analysis/analysis-api/testData/referenceResolve/CtrlClickResolve.txt
index c353cb9413e..af1c4fdcee8 100644
--- a/analysis/analysis-api/testData/referenceResolve/CtrlClickResolve.txt
+++ b/analysis/analysis-api/testData/referenceResolve/CtrlClickResolve.txt
@@ -1,2 +1,2 @@
 Resolved to:
-0: (in ctrl_click) fun IntArray(vararg content: kotlin.Int): kotlin.IntArray
+0: (in ctrl_click) fun IntArray(vararg content: kotlin.String): kotlin.Array<out kotlin.String>
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/DefaultObjectInShortReferenceFormCall.kt b/analysis/analysis-api/testData/referenceResolve/DefaultObjectInShortReferenceFormCall.kt
index 361c3d863a4..bd12f692567 100644
--- a/analysis/analysis-api/testData/referenceResolve/DefaultObjectInShortReferenceFormCall.kt
+++ b/analysis/analysis-api/testData/referenceResolve/DefaultObjectInShortReferenceFormCall.kt
@@ -2,7 +2,7 @@ package t
 
 class A {
     companion object Companion {
-        fun test()
+        fun test() {}
     }
 }
 
diff --git a/analysis/analysis-api/testData/referenceResolve/InObjectClassObject.kt b/analysis/analysis-api/testData/referenceResolve/InObjectClassObject.kt
index 21a808e42d3..943c7893536 100644
--- a/analysis/analysis-api/testData/referenceResolve/InObjectClassObject.kt
+++ b/analysis/analysis-api/testData/referenceResolve/InObjectClassObject.kt
@@ -3,7 +3,7 @@ package test
 class A
 
 object b {
-    companion object {
+    class object {
         val x = <caret>A()
     }
 }
diff --git a/analysis/analysis-api/testData/referenceResolve/JavaConstructorNotNullParameter.kt b/analysis/analysis-api/testData/referenceResolve/JavaConstructorNotNullParameter.kt
index 541f419343b..ce172c728c5 100644
--- a/analysis/analysis-api/testData/referenceResolve/JavaConstructorNotNullParameter.kt
+++ b/analysis/analysis-api/testData/referenceResolve/JavaConstructorNotNullParameter.kt
@@ -1,7 +1,7 @@
 // FILE: main.kt
 class A {
     fun foo() {
-        <caret>JavaClass()
+        <caret>JavaClass("")
     }
 }
 
diff --git a/analysis/analysis-api/testData/referenceResolve/NamedClassObject.kt b/analysis/analysis-api/testData/referenceResolve/NamedClassObject.kt
index 7fa65b388a7..5817fa0f087 100644
--- a/analysis/analysis-api/testData/referenceResolve/NamedClassObject.kt
+++ b/analysis/analysis-api/testData/referenceResolve/NamedClassObject.kt
@@ -2,7 +2,7 @@ package a
 
 class A {
     companion object Named {
-        val i: Int
+        val i: Int = 1
     }
 }
 
diff --git a/analysis/analysis-api/testData/referenceResolve/SyntheticProperty.kt b/analysis/analysis-api/testData/referenceResolve/SyntheticProperty.kt
index 5355b499986..7a7692decca 100644
--- a/analysis/analysis-api/testData/referenceResolve/SyntheticProperty.kt
+++ b/analysis/analysis-api/testData/referenceResolve/SyntheticProperty.kt
@@ -13,7 +13,7 @@ fun JavaClass.foo(javaClass: JavaClass) {
 }
 
 // FILE: JavaClass.java
-class JavaClass {
+public class JavaClass {
     public int getSomething() { return 1; }
     public void setSomething(int value) {}
 }
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/TypeArgumentBeforeDot.kt b/analysis/analysis-api/testData/referenceResolve/TypeArgumentBeforeDot.kt
index 8285eb8c131..bf7f49a4a2c 100644
--- a/analysis/analysis-api/testData/referenceResolve/TypeArgumentBeforeDot.kt
+++ b/analysis/analysis-api/testData/referenceResolve/TypeArgumentBeforeDot.kt
@@ -1,5 +1,5 @@
 class Generic<T> {
-    class Nested
+    inner class Nested
 }
 
 class C {
diff --git a/analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/inSource/getMultipleDeclarations.kt b/analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/inSource/getMultipleDeclarations.kt
index ab9e5c80fa1..6f0116ed918 100644
--- a/analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/inSource/getMultipleDeclarations.kt
+++ b/analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/inSource/getMultipleDeclarations.kt
@@ -12,4 +12,10 @@ interface Zoo {
   operator fun setValue(p1: Any?, p2: Any?, p3: Any?)
 }
 
-class Baz: Foo, Bar, Zoo
\ No newline at end of file
+class Baz: Foo, Bar, Zoo {
+  override fun getValue(p1: Any?, p2: Any?): Int = TODO("")
+
+  override fun setValue(p1: Any?, p2: Any?, p3: Any?) {
+    TODO("")
+  }
+}
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/inSource/getMultipleDeclarations.txt b/analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/inSource/getMultipleDeclarations.txt
index 8b85075e873..e66bf2e9412 100644
--- a/analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/inSource/getMultipleDeclarations.txt
+++ b/analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/inSource/getMultipleDeclarations.txt
@@ -1,3 +1,3 @@
 Resolved to:
-0: (in Baz) open operator fun getValue(p1: kotlin.Any?, p2: kotlin.Any?): kotlin.Int
-1: (in Zoo) operator fun setValue(p1: kotlin.Any?, p2: kotlin.Any?, p3: kotlin.Any?)
+0: (in Baz) override operator fun getValue(p1: kotlin.Any?, p2: kotlin.Any?): kotlin.Int
+1: (in Baz) override operator fun setValue(p1: kotlin.Any?, p2: kotlin.Any?, p3: kotlin.Any?)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/inSource/getOneFakeOverride.kt b/analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/inSource/getOneFakeOverride.kt
index a33446a847d..8d2b278508d 100644
--- a/analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/inSource/getOneFakeOverride.kt
+++ b/analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/inSource/getOneFakeOverride.kt
@@ -1,4 +1,4 @@
-var x : Int <caret>by Baz()
+val x : Int <caret>by Baz()
 
 interface Foo {
   operator fun getValue(p1: Any?, p2: Any?): Int = 1
diff --git a/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/allExtensions.kt b/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/allExtensions.kt
index 6f72eed0a5e..99670458956 100644
--- a/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/allExtensions.kt
+++ b/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/allExtensions.kt
@@ -3,9 +3,10 @@ fun test(f: Foo) {
 }
 
 interface Foo
-fun Foo.iterator(): Iterator
+fun Foo.iterator(): Iterator = TODO()
 
 interface Iterator
 
-fun Iterator.next(): Any
-fun Iterator.hasNext(): Boolean
+fun Iterator.next(): Any= TODO()
+fun Iterator.hasNext(): Boolean = TODO()
+
diff --git a/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/allMembers.kt b/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/allMembers.kt
index fa95c90db00..b95bce84f48 100644
--- a/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/allMembers.kt
+++ b/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/allMembers.kt
@@ -3,12 +3,12 @@ fun test(f: Foo) {
 }
 
 interface Foo {
-  fun iterator(): Iterator
+    operator fun iterator(): Iterator
 }
 
 interface Iterator {
-  fun next(): Any
-  fun hasNext(): Boolean
+  operator fun next(): Any
+  operator fun hasNext(): Boolean
 }
 
 // MULTIRESOLVE
diff --git a/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/allMembers.txt b/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/allMembers.txt
index 280e8d4d306..a45f9955ef1 100644
--- a/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/allMembers.txt
+++ b/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/allMembers.txt
@@ -1,4 +1,4 @@
 Resolved to:
-0: (in Foo) fun iterator(): Iterator
-1: (in Iterator) fun hasNext(): kotlin.Boolean
-2: (in Iterator) fun next(): kotlin.Any
+0: (in Foo) operator fun iterator(): Iterator
+1: (in Iterator) operator fun hasNext(): kotlin.Boolean
+2: (in Iterator) operator fun next(): kotlin.Any
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/nextMissing.kt b/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/nextMissing.kt
index ceaf90b5f09..e657ad71419 100644
--- a/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/nextMissing.kt
+++ b/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/nextMissing.kt
@@ -3,11 +3,11 @@ fun test(f: Foo) {
 }
 
 interface Foo {
-  fun iterator(): Iterator
+    operator fun iterator(): Iterator
 }
 
 interface Iterator {
-  fun hasNext(): Boolean
+    operator fun hasNext(): Boolean
 }
 
 // MULTIRESOLVE
diff --git a/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/nextMissing.txt b/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/nextMissing.txt
index 7db0272e1f2..724baa24da5 100644
--- a/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/nextMissing.txt
+++ b/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/nextMissing.txt
@@ -1,3 +1,3 @@
 Resolved to:
-0: (in Foo) fun iterator(): Iterator
-1: (in Iterator) fun hasNext(): kotlin.Boolean
+0: (in Foo) operator fun iterator(): Iterator
+1: (in Iterator) operator fun hasNext(): kotlin.Boolean
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/invoke/noParams.kt b/analysis/analysis-api/testData/referenceResolve/invoke/noParams.kt
index 82919ddaa36..3e06f8be183 100644
--- a/analysis/analysis-api/testData/referenceResolve/invoke/noParams.kt
+++ b/analysis/analysis-api/testData/referenceResolve/invoke/noParams.kt
@@ -1,5 +1,5 @@
 class Foo {
-  fun invoke(vararg a: Any) {}
+  operator fun invoke(vararg a: Any) {}
 }
 
 fun test(f: Foo) {
diff --git a/analysis/analysis-api/testData/referenceResolve/invoke/noParams.txt b/analysis/analysis-api/testData/referenceResolve/invoke/noParams.txt
index 07a32ac1e6e..8150a844f84 100644
--- a/analysis/analysis-api/testData/referenceResolve/invoke/noParams.txt
+++ b/analysis/analysis-api/testData/referenceResolve/invoke/noParams.txt
@@ -1,2 +1,2 @@
 Resolved to:
-0: (in Foo) fun invoke(vararg a: kotlin.Any)
+0: (in Foo) operator fun invoke(vararg a: kotlin.Any)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/invoke/noParamsRPar.kt b/analysis/analysis-api/testData/referenceResolve/invoke/noParamsRPar.kt
index 7af0ba874d6..90361b714ff 100644
--- a/analysis/analysis-api/testData/referenceResolve/invoke/noParamsRPar.kt
+++ b/analysis/analysis-api/testData/referenceResolve/invoke/noParamsRPar.kt
@@ -1,5 +1,5 @@
 class Foo {
-  fun invoke(vararg a: Any) {}
+ operator fun invoke(vararg a: Any) {}
 }
 
 fun test(f: Foo) {
diff --git a/analysis/analysis-api/testData/referenceResolve/invoke/noParamsRPar.txt b/analysis/analysis-api/testData/referenceResolve/invoke/noParamsRPar.txt
index 07a32ac1e6e..8150a844f84 100644
--- a/analysis/analysis-api/testData/referenceResolve/invoke/noParamsRPar.txt
+++ b/analysis/analysis-api/testData/referenceResolve/invoke/noParamsRPar.txt
@@ -1,2 +1,2 @@
 Resolved to:
-0: (in Foo) fun invoke(vararg a: kotlin.Any)
+0: (in Foo) operator fun invoke(vararg a: kotlin.Any)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/invoke/oneParam.kt b/analysis/analysis-api/testData/referenceResolve/invoke/oneParam.kt
index 1271c005c4a..0da698b0932 100644
--- a/analysis/analysis-api/testData/referenceResolve/invoke/oneParam.kt
+++ b/analysis/analysis-api/testData/referenceResolve/invoke/oneParam.kt
@@ -1,5 +1,5 @@
 class Foo {
-  fun invoke(vararg a: Any) {}
+  operator fun invoke(vararg a: Any) {}
 }
 
 fun test(f: Foo) {
diff --git a/analysis/analysis-api/testData/referenceResolve/invoke/oneParam.txt b/analysis/analysis-api/testData/referenceResolve/invoke/oneParam.txt
index 07a32ac1e6e..8150a844f84 100644
--- a/analysis/analysis-api/testData/referenceResolve/invoke/oneParam.txt
+++ b/analysis/analysis-api/testData/referenceResolve/invoke/oneParam.txt
@@ -1,2 +1,2 @@
 Resolved to:
-0: (in Foo) fun invoke(vararg a: kotlin.Any)
+0: (in Foo) operator fun invoke(vararg a: kotlin.Any)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/invoke/oneParamRPar.kt b/analysis/analysis-api/testData/referenceResolve/invoke/oneParamRPar.kt
index 0ada9d79e7b..ebbb041dab9 100644
--- a/analysis/analysis-api/testData/referenceResolve/invoke/oneParamRPar.kt
+++ b/analysis/analysis-api/testData/referenceResolve/invoke/oneParamRPar.kt
@@ -1,5 +1,5 @@
 class Foo {
-  fun invoke(vararg a: Any) {}
+  operator fun invoke(vararg a: Any) {}
 }
 
 fun test(f: Foo) {
diff --git a/analysis/analysis-api/testData/referenceResolve/invoke/oneParamRPar.txt b/analysis/analysis-api/testData/referenceResolve/invoke/oneParamRPar.txt
index 07a32ac1e6e..8150a844f84 100644
--- a/analysis/analysis-api/testData/referenceResolve/invoke/oneParamRPar.txt
+++ b/analysis/analysis-api/testData/referenceResolve/invoke/oneParamRPar.txt
@@ -1,2 +1,2 @@
 Resolved to:
-0: (in Foo) fun invoke(vararg a: kotlin.Any)
+0: (in Foo) operator fun invoke(vararg a: kotlin.Any)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/packageReference/javaPackageFirstQualifier.kt b/analysis/analysis-api/testData/referenceResolve/packageReference/javaPackageFirstQualifier.kt
index f15858d8bbc..7e506ef3a00 100644
--- a/analysis/analysis-api/testData/referenceResolve/packageReference/javaPackageFirstQualifier.kt
+++ b/analysis/analysis-api/testData/referenceResolve/packageReference/javaPackageFirstQualifier.kt
@@ -1,3 +1,3 @@
 fun x() {
-    val z = jav<caret>a.util.ArrayList()
+    val z = jav<caret>a.util.ArrayList<Int>()
 }
diff --git a/analysis/analysis-api/testData/referenceResolve/packageReference/javaPackageSecondQualifier.kt b/analysis/analysis-api/testData/referenceResolve/packageReference/javaPackageSecondQualifier.kt
index 1102c3a398c..36d95330338 100644
--- a/analysis/analysis-api/testData/referenceResolve/packageReference/javaPackageSecondQualifier.kt
+++ b/analysis/analysis-api/testData/referenceResolve/packageReference/javaPackageSecondQualifier.kt
@@ -1,3 +1,3 @@
 fun x() {
-    val z = java.uti<caret>l.ArrayList()
+    val z = java.uti<caret>l.ArrayList<Int>()
 }
diff --git a/analysis/analysis-api/testData/referenceResolve/packageReference/kotlinPackageFirstQualifier.kt b/analysis/analysis-api/testData/referenceResolve/packageReference/kotlinPackageFirstQualifier.kt
index 1f6f2401e42..01ca984bf68 100644
--- a/analysis/analysis-api/testData/referenceResolve/packageReference/kotlinPackageFirstQualifier.kt
+++ b/analysis/analysis-api/testData/referenceResolve/packageReference/kotlinPackageFirstQualifier.kt
@@ -1,3 +1,3 @@
 fun x() {
-    val z = kotli<caret>n.text.toString()
+    val z = kotli<caret>n.text.charset("UTF8")
 }
diff --git a/analysis/analysis-api/testData/referenceResolve/packageReference/kotlinPackageSecondQualifier.kt b/analysis/analysis-api/testData/referenceResolve/packageReference/kotlinPackageSecondQualifier.kt
index 81312e9ab36..1f89ac2b5e1 100644
--- a/analysis/analysis-api/testData/referenceResolve/packageReference/kotlinPackageSecondQualifier.kt
+++ b/analysis/analysis-api/testData/referenceResolve/packageReference/kotlinPackageSecondQualifier.kt
@@ -1,3 +1,3 @@
 fun x() {
-    val z = kotlin.tex<caret>t.toString()
+    val z = kotlin.tex<caret>t.charset("UTF8")
 }
diff --git a/analysis/analysis-api/testData/referenceResolve/parameterByName.kt b/analysis/analysis-api/testData/referenceResolve/parameterByName.kt
index 61cc6121cc4..fe14d204ecb 100644
--- a/analysis/analysis-api/testData/referenceResolve/parameterByName.kt
+++ b/analysis/analysis-api/testData/referenceResolve/parameterByName.kt
@@ -1,4 +1,4 @@
-fun sum(aa: Int, bb: Int) = a + b
+fun sum(aa: Int, bb: Int) = aa + bb
 
 fun main() {
     println(sum(b<caret>b = 1, aa = 2))
diff --git a/analysis/analysis-api/testData/referenceResolve/thisWithLabelToProperty_caretAtLabel.kt b/analysis/analysis-api/testData/referenceResolve/thisWithLabelToProperty_caretAtLabel.kt
index ac3a622d582..630de88e7d4 100644
--- a/analysis/analysis-api/testData/referenceResolve/thisWithLabelToProperty_caretAtLabel.kt
+++ b/analysis/analysis-api/testData/referenceResolve/thisWithLabelToProperty_caretAtLabel.kt
@@ -1,6 +1,6 @@
 class Foo {
     val String.foo : Any
     get() {
-        this@f<caret>oo
+        return this@f<caret>oo
     }
 }
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/thisWithLabelToProperty_caretAtThis.kt b/analysis/analysis-api/testData/referenceResolve/thisWithLabelToProperty_caretAtThis.kt
index 03e2e387e73..ea21d4a3331 100644
--- a/analysis/analysis-api/testData/referenceResolve/thisWithLabelToProperty_caretAtThis.kt
+++ b/analysis/analysis-api/testData/referenceResolve/thisWithLabelToProperty_caretAtThis.kt
@@ -1,6 +1,6 @@
 class Foo {
     val String.foo : Any
     get() {
-        t<caret>his@foo
+        return t<caret>his@foo
     }
 }
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/typeParameter/multipleBounds.kt b/analysis/analysis-api/testData/referenceResolve/typeParameter/multipleBounds.kt
index 6366bef461f..d6b914451e4 100644
--- a/analysis/analysis-api/testData/referenceResolve/typeParameter/multipleBounds.kt
+++ b/analysis/analysis-api/testData/referenceResolve/typeParameter/multipleBounds.kt
@@ -1 +1 @@
-fun <T> function(t: <caret>T) where T : Int, T : Long = TODO()
+fun <T> function(t: <caret>T) where T : Int, T : Sequence<Int> = TODO()