diff --git a/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt b/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt
index 0bf67101c44..34bc3e6edf3 100644
--- a/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt
+++ b/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt
@@ -3,4 +3,6 @@ import lib.ArrayFactory
 
 public class Impl : ArrayFactory {
     <caret>
-}
\ No newline at end of file
+}
+
+val array: Array<String>
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after
index 3a4d8f7885d..26ed2a06b70 100644
--- a/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after
@@ -5,4 +5,6 @@ public class Impl : ArrayFactory {
     override fun create(): lib.Array {
         <selection><caret>throw UnsupportedOperationException()</selection>
     }
-}
\ No newline at end of file
+}
+
+val array: Array<String>
\ No newline at end of file
diff --git a/idea/testData/completion/handlers/InsertFqnForJavaClass.kt b/idea/testData/completion/handlers/InsertFqnForJavaClass.kt
index c9bca49c56b..8e6b040b0ba 100644
--- a/idea/testData/completion/handlers/InsertFqnForJavaClass.kt
+++ b/idea/testData/completion/handlers/InsertFqnForJavaClass.kt
@@ -1,5 +1,5 @@
 class SortedSet
 
-fun test() {
+fun test(set: SortedSet) {
   val a = SortedSet<caret>
 }
diff --git a/idea/testData/completion/handlers/InsertFqnForJavaClass.kt.after b/idea/testData/completion/handlers/InsertFqnForJavaClass.kt.after
index 9bd9194d682..f746412689e 100644
--- a/idea/testData/completion/handlers/InsertFqnForJavaClass.kt.after
+++ b/idea/testData/completion/handlers/InsertFqnForJavaClass.kt.after
@@ -2,6 +2,6 @@ import java.util
 
 class SortedSet
 
-fun test() {
+fun test(set: SortedSet) {
   val a = util.SortedSet<caret>
 }
diff --git a/idea/testData/completion/handlers/NonStandardArray.kt b/idea/testData/completion/handlers/NonStandardArray.kt
index e4306630eeb..887218998b7 100644
--- a/idea/testData/completion/handlers/NonStandardArray.kt
+++ b/idea/testData/completion/handlers/NonStandardArray.kt
@@ -1 +1,2 @@
-val x : Arra<caret>
\ No newline at end of file
+val x : Arra<caret>
+val y: Array<String>
\ No newline at end of file
diff --git a/idea/testData/completion/handlers/NonStandardArray.kt.after b/idea/testData/completion/handlers/NonStandardArray.kt.after
index e933f56738a..a89783e3154 100644
--- a/idea/testData/completion/handlers/NonStandardArray.kt.after
+++ b/idea/testData/completion/handlers/NonStandardArray.kt.after
@@ -1,3 +1,4 @@
 import java.lang.reflect
 
-val x : reflect.Array<caret>
\ No newline at end of file
+val x : reflect.Array<caret>
+val y: Array<String>
\ No newline at end of file
diff --git a/idea/testData/intentions/convertAssertToIf/assertErrorOverloaded.kt.after b/idea/testData/intentions/convertAssertToIf/assertErrorOverloaded.kt.after
index 8de87c70cd4..9350e639082 100644
--- a/idea/testData/intentions/convertAssertToIf/assertErrorOverloaded.kt.after
+++ b/idea/testData/intentions/convertAssertToIf/assertErrorOverloaded.kt.after
@@ -1,10 +1,10 @@
 package a
 
-import java.lang
+import java.lang.AssertionError
 
 fun foo() {
     if (!true) {
-        throw lang.AssertionError("text")
+        throw AssertionError("text")
     }
 }
 
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt.after b/idea/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt.after
index 4558f192696..846ca07191a 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt.after
+++ b/idea/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt.after
@@ -1,8 +1,10 @@
+import kotlin.Array
+
 // IS_APPLICABLE: true
 class Array
 
 fun test() {
-    bar<kotlin.Array<out String>, Int, kotlin.Array<out String>>(foo(""), 0, foo(""))
+    bar<Array<out String>, Int, Array<out String>>(foo(""), 0, foo(""))
 }
 
 fun foo(vararg x: String) = x
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt.after b/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt.after
index f155cebca12..052f9e58f84 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt.after
+++ b/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt.after
@@ -1,8 +1,10 @@
+import kotlin.Array
+
 // IS_APPLICABLE: true
 class Array
 
 fun test() {
-    bar<kotlin.Array<out String>>(foo(""))
+    bar<Array<out String>>(foo(""))
 }
 
 fun foo(vararg x: String) = x
diff --git a/idea/testData/intentions/specifyType/stringRedefined.kt.after b/idea/testData/intentions/specifyType/stringRedefined.kt.after
index d3d6f814b4d..3299d9b467e 100644
--- a/idea/testData/intentions/specifyType/stringRedefined.kt.after
+++ b/idea/testData/intentions/specifyType/stringRedefined.kt.after
@@ -1,3 +1,5 @@
+import kotlin.String
+
 class String {}
 
-val x: kotlin.String = ""
\ No newline at end of file
+val x: String = ""
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/nothingToOverride/twoPackages.after.kt b/idea/testData/quickfix/override/nothingToOverride/twoPackages.after.kt
index b776daaa4c4..79087ff32be 100644
--- a/idea/testData/quickfix/override/nothingToOverride/twoPackages.after.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/twoPackages.after.kt
@@ -1,7 +1,9 @@
 // "Change function signature to 'fun f(a: A)'" "true"
 // ERROR: 'f' overrides nothing
 import a.B
+import a.A
+
 class A {}
 class BB : B() {
-    <caret>override fun f(a: a.A) {}
+    override fun f(a: A) {}
 }