diff --git a/idea/testData/codeInsight/overrideImplement/propagationKJK/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/propagationKJK/foo/Impl.kt.after
index dc7fc6eda69..2171acf633c 100644
--- a/idea/testData/codeInsight/overrideImplement/propagationKJK/foo/Impl.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/propagationKJK/foo/Impl.kt.after
@@ -1,7 +1,7 @@
 package foo
 
 class Impl : Bar() {
-    override fun f(): Any? {
+    override fun f(): Any {
         <selection><caret>return super.f()</selection>
     }
 }
diff --git a/idea/testData/intentions/specifyTypeExplicitly/loopParameter.kt.after b/idea/testData/intentions/specifyTypeExplicitly/loopParameter.kt.after
index a0d6772e37e..32f4f937299 100644
--- a/idea/testData/intentions/specifyTypeExplicitly/loopParameter.kt.after
+++ b/idea/testData/intentions/specifyTypeExplicitly/loopParameter.kt.after
@@ -3,7 +3,7 @@
 import java.util.HashMap
 
 fun foo(map : HashMap<String, Int>) {
-    for (entry: MutableMap.MutableEntry<String, Int>?<caret> in map.entrySet()) {
+    for (entry: MutableMap.MutableEntry<String, Int><caret> in map.entrySet()) {
 
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/changeSignature/addParameterNotAvailableForLibrary.kt b/idea/testData/quickfix/changeSignature/addParameterNotAvailableForLibrary.kt
index 923b47d9e29..b69c7577f90 100644
--- a/idea/testData/quickfix/changeSignature/addParameterNotAvailableForLibrary.kt
+++ b/idea/testData/quickfix/changeSignature/addParameterNotAvailableForLibrary.kt
@@ -1,5 +1,5 @@
 // "class org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix" "false"
-// ERROR: Too many arguments for public open fun equals(other: kotlin.Any!): kotlin.Boolean defined in java.lang.Object
+// ERROR: Too many arguments for public open fun equals(other: kotlin.Any?): kotlin.Boolean defined in java.lang.Object
 
 fun f(d: java.lang.Object) {
     d.equals("a", <caret>"b")
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/returnTypeCandidates/javaAnnotatedNotNull.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/returnTypeCandidates/javaAnnotatedNotNull.kt.after
index c9fd0689e12..8beb976a4dc 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/returnTypeCandidates/javaAnnotatedNotNull.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/returnTypeCandidates/javaAnnotatedNotNull.kt.after
@@ -4,4 +4,4 @@ fun test() {
     val s = s()
 }
 
-private fun s(): String = J.notNull()
\ No newline at end of file
+private fun s() = J.notNull()
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/returnTypeCandidates/javaAnnotatedNullable.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/returnTypeCandidates/javaAnnotatedNullable.kt.after
index e7b5d46d31b..12f66019646 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/returnTypeCandidates/javaAnnotatedNullable.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/returnTypeCandidates/javaAnnotatedNullable.kt.after
@@ -3,4 +3,4 @@ fun test() {
     val s = s()
 }
 
-private fun s(): String? = J.nullable()
\ No newline at end of file
+private fun s() = J.nullable()
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt.after
index a357e3394ad..d4af32e7b7a 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt.after
@@ -15,4 +15,4 @@ class Foo<T> {
     }
 }
 
-private fun <T> Foo<T>.t(l: String): T = map[l]
\ No newline at end of file
+private fun <T> Foo<T>.t(l: String) = map[l]
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterResolvableInTargetScope.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterResolvableInTargetScope.kt.after
index 31579c65aca..56b4d7bb3f2 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterResolvableInTargetScope.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterResolvableInTargetScope.kt.after
@@ -11,5 +11,5 @@ class Foo<T> {
         return t(l)
     }
 
-    private fun t(l: String): T = map[l]
+    private fun t(l: String) = map[l]
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/introduceProperty/typeParameterNotResolvableInTargetScope.kt.after b/idea/testData/refactoring/introduceProperty/typeParameterNotResolvableInTargetScope.kt.after
index bd6e251b5e4..b9961b8e82a 100644
--- a/idea/testData/refactoring/introduceProperty/typeParameterNotResolvableInTargetScope.kt.after
+++ b/idea/testData/refactoring/introduceProperty/typeParameterNotResolvableInTargetScope.kt.after
@@ -3,7 +3,7 @@
 
 import java.util.*
 
-private val <T> Foo<T>.t: T
+private val <T> Foo<T>.t: T?
     get() = map[""]
 
 // SIBLING: