diff --git a/nj2k/testData/newJ2k/annotations/jetbrainsNullable.kt b/nj2k/testData/newJ2k/annotations/jetbrainsNullable.kt
index ff38c4a4cd7..970a29f0d9a 100644
--- a/nj2k/testData/newJ2k/annotations/jetbrainsNullable.kt
+++ b/nj2k/testData/newJ2k/annotations/jetbrainsNullable.kt
@@ -1,13 +1,7 @@
 // !specifyLocalVariableTypeByDefault: true
 package test
 
-class Test(str: String?) {
-    internal var myStr: String? = "String2"
-
-    init {
-        myStr = str
-    }
-
+class Test(internal var myStr: String?) {
     fun sout(str: String?) {
         println(str)
     }
@@ -18,7 +12,7 @@ class Test(str: String?) {
 
     fun test() {
         sout("String")
-        val test: String? = "String2"
+        val test: String = "String2"
         sout(test)
         sout(dummy(test))
 
diff --git a/nj2k/testData/newJ2k/boxedType/kt-671.java b/nj2k/testData/newJ2k/boxedType/kt-671.java
index c0ba6a8bc30..c4d1d3737d3 100644
--- a/nj2k/testData/newJ2k/boxedType/kt-671.java
+++ b/nj2k/testData/newJ2k/boxedType/kt-671.java
@@ -1,5 +1,3 @@
-package demo;
-
 class Test {
   void test() {
     Integer i = Integer.valueOf(100);
diff --git a/nj2k/testData/newJ2k/foreachStatement/enhancedForWithBlock.kt b/nj2k/testData/newJ2k/foreachStatement/enhancedForWithBlock.kt
index b4263caa473..3d7510bac00 100644
--- a/nj2k/testData/newJ2k/foreachStatement/enhancedForWithBlock.kt
+++ b/nj2k/testData/newJ2k/foreachStatement/enhancedForWithBlock.kt
@@ -1,4 +1,4 @@
-for (n in list!!) {
+for (n in list) {
     var i = 1
     i++
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/foreachStatement/enhancedForWithEmptyBlock.kt b/nj2k/testData/newJ2k/foreachStatement/enhancedForWithEmptyBlock.kt
index 417bc89477a..69ca8ed72fd 100644
--- a/nj2k/testData/newJ2k/foreachStatement/enhancedForWithEmptyBlock.kt
+++ b/nj2k/testData/newJ2k/foreachStatement/enhancedForWithEmptyBlock.kt
@@ -1,2 +1,2 @@
-for (n in list!!) {
+for (n in list) {
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/foreachStatement/enhancedForWithExpression.kt b/nj2k/testData/newJ2k/foreachStatement/enhancedForWithExpression.kt
index a43acf60d65..40ba9a8e4ca 100644
--- a/nj2k/testData/newJ2k/foreachStatement/enhancedForWithExpression.kt
+++ b/nj2k/testData/newJ2k/foreachStatement/enhancedForWithExpression.kt
@@ -1,2 +1,2 @@
 var i = 0
-for (n in list!!) i++
\ No newline at end of file
+for (n in list) i++
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/foreachStatement/enhancedForWithReturn.kt b/nj2k/testData/newJ2k/foreachStatement/enhancedForWithReturn.kt
index 6794953ef53..c32b2454852 100644
--- a/nj2k/testData/newJ2k/foreachStatement/enhancedForWithReturn.kt
+++ b/nj2k/testData/newJ2k/foreachStatement/enhancedForWithReturn.kt
@@ -1 +1 @@
-for (n in list!!) return n
\ No newline at end of file
+for (n in list) return n
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/foreachStatement/nullableIterable.kt b/nj2k/testData/newJ2k/foreachStatement/nullableIterable.kt
index 96cda836fbc..d4d67bf62bd 100644
--- a/nj2k/testData/newJ2k/foreachStatement/nullableIterable.kt
+++ b/nj2k/testData/newJ2k/foreachStatement/nullableIterable.kt
@@ -1,6 +1,5 @@
 internal class A {
-    var list: List<String?>? = null
-
+    var list: List<String>? = null
     fun foo() {
         for (e in list!!) {
             println(e)
diff --git a/nj2k/testData/newJ2k/function/extendsBaseWhichExtendsObject.java b/nj2k/testData/newJ2k/function/extendsBaseWhichExtendsObject.java
index 29d24ef8067..6ee59dea74f 100644
--- a/nj2k/testData/newJ2k/function/extendsBaseWhichExtendsObject.java
+++ b/nj2k/testData/newJ2k/function/extendsBaseWhichExtendsObject.java
@@ -1,5 +1,4 @@
 //file
-package test;
 
 class Test extends Base {
   @Override
diff --git a/nj2k/testData/newJ2k/function/extendsBaseWhichExtendsObject.kt b/nj2k/testData/newJ2k/function/extendsBaseWhichExtendsObject.kt
index 9c30d21b350..e9befb48f85 100644
--- a/nj2k/testData/newJ2k/function/extendsBaseWhichExtendsObject.kt
+++ b/nj2k/testData/newJ2k/function/extendsBaseWhichExtendsObject.kt
@@ -1,8 +1,6 @@
 // ERROR: Unresolved reference: clone
 // ERROR: Unresolved reference: finalize
-package test
-
-internal class Test : Base() {
+internal class Test : Base(), Cloneable {
     override fun hashCode(): Int {
         return super.hashCode()
     }
@@ -26,7 +24,7 @@ internal class Test : Base() {
     }
 }
 
-internal open class Base {
+internal open class Base : Cloneable {
     override fun hashCode(): Int {
         return super.hashCode()
     }
@@ -36,7 +34,7 @@ internal open class Base {
     }
 
     @Throws(CloneNotSupportedException::class)
-    protected open fun clone(): Any {
+    override fun clone(): Any {
         return super.clone()
     }
 
diff --git a/nj2k/testData/newJ2k/function/java8Lambdas.kt b/nj2k/testData/newJ2k/function/java8Lambdas.kt
index ee4b932e2d5..34120b0b315 100644
--- a/nj2k/testData/newJ2k/function/java8Lambdas.kt
+++ b/nj2k/testData/newJ2k/function/java8Lambdas.kt
@@ -1,18 +1,8 @@
-// ERROR: 'return' is not allowed here
-// ERROR: Type mismatch: inferred type is String but Unit was expected
-// ERROR: 'return' is not allowed here
-// ERROR: Type mismatch: inferred type is String but Unit was expected
-// ERROR: 'return' is not allowed here
-// ERROR: Type mismatch: inferred type is String but Unit was expected
 class Java8Class {
     fun foo0(r: Function0<String>) {}
-
     fun foo1(r: Function1<Int, String?>) {}
-
     fun foo2(r: Function2<Int, Int, String>) {}
-
     fun helper() {}
-
     fun foo() {
         foo0 { "42" }
         foo0 { "42" }
@@ -20,62 +10,51 @@ class Java8Class {
             helper()
             "42"
         }
-
-        foo1 { i -> "42" }
-        foo1 { i -> "42" }
+        foo1 { i: Int -> "42" }
+        foo1 { i: Int -> "42" }
         foo1 { i: Int ->
             helper()
             if (i > 1) {
-                return@foo1 "42"
+                return@foo1 null
             }
-
             "43"
         }
-
-        foo2 { i, j -> "42" }
+        foo2 { i: Int, j: Int -> "42" }
         foo2 { i: Int, j: Int ->
             helper()
             "42"
         }
-
-        val f = { i: Int, k: Int ->
+        val f = label@{ i: Int, k: Int ->
             helper()
             if (i > 1) {
-                return "42"
+                return@label "42"
             }
-
             "43"
         }
-
-        val f1 = { i1: Int, k1: Int ->
-            val f2 = { i2: Int, k2: Int ->
+        val f1 = label@{ i1: Int, k1: Int ->
+            val f2 = label@{ i2: Int, k2: Int ->
                 helper()
                 if (i2 > 1) {
-                    return "42"
+                    return@label "42"
                 }
-
                 "43"
             }
             if (i1 > 1) {
-                return f.invoke(i1, k1)
+                return@label f.invoke(i1, k1)
             }
             f.invoke(i1, k1)
         }
-
-        val runnable = { }
-
+        val runnable = Runnable {}
         foo1 { i: Int ->
             if (i > 1) {
                 return@foo1 "42"
             }
-
             foo0 {
                 if (true) {
                     return@foo0 "42"
                 }
                 "43"
             }
-
             "43"
         }
     }
diff --git a/nj2k/testData/newJ2k/function/java8MRKFunctionExpectedType.java b/nj2k/testData/newJ2k/function/java8MRKFunctionExpectedType.java
index 54bd921b8b3..d7ac144a8d8 100644
--- a/nj2k/testData/newJ2k/function/java8MRKFunctionExpectedType.java
+++ b/nj2k/testData/newJ2k/function/java8MRKFunctionExpectedType.java
@@ -79,12 +79,13 @@ class Java8Class {
         constructorWithoutParams.invoke();
 
         Function1<Integer, String> constructorWithParam = Test::testOverloads;
-        constructorWithParam.invoke(2);
+        constructorWithParam.invoke(2) + 42;
     }
 
     public void testGenericFunctions() {
         Function0<List<String>> emptyList = Collections::emptyList;
-        emptyList.invoke();
+        List<String> list = emptyList.invoke();
+        list.get(0);
     }
 
     public static int staticFun() { return 1; }
diff --git a/nj2k/testData/newJ2k/function/java8MRKFunctionExpectedType.kt b/nj2k/testData/newJ2k/function/java8MRKFunctionExpectedType.kt
index 42692d3e808..423f25cab90 100644
--- a/nj2k/testData/newJ2k/function/java8MRKFunctionExpectedType.kt
+++ b/nj2k/testData/newJ2k/function/java8MRKFunctionExpectedType.kt
@@ -1,8 +1,5 @@
-// ERROR: Type inference failed: Not enough information to infer parameter T in fun <T> emptyList(): List<T> Please specify it explicitly.
 package test
 
-import java.util.Collections
-
 internal class Test {
     fun memberFun(): Int {
         return 1
@@ -28,10 +25,9 @@ internal class Java8Class {
     private val field = Java8Class()
 
     fun testStaticFunction() {
-        val staticFunFromSameClass = { staticFun() }
+        val staticFunFromSameClass: Function0<*> = { staticFun() }
         staticFunFromSameClass.invoke()
-
-        val staticFunFromAnotherClass = { Test.staticFun() }
+        val staticFunFromAnotherClass: Function0<*> = { Test.staticFun() }
         staticFunFromAnotherClass.invoke()
     }
 
@@ -42,32 +38,28 @@ internal class Java8Class {
 
     fun testMemberFunctionThroughObject() {
         val obj = Java8Class()
-        val memberFunFromSameClass = { obj.memberFun() }
+        val memberFunFromSameClass: Function0<*> = { obj.memberFun() }
         memberFunFromSameClass.invoke()
 
         val anotherObj = Test()
-        val memFunFromAnotherClass = { anotherObj.memberFun() }
+        val memFunFromAnotherClass: Function0<*> = { anotherObj.memberFun() }
         memFunFromAnotherClass.invoke()
-
-        val memberFunThroughObj1 = { field.memberFun() }
+        val memberFunThroughObj1: Function0<*> = { field.memberFun() }
         memberFunThroughObj1.invoke()
-        val memberFunThroughObj2 = { Test.field.memberFun() }
+        val memberFunThroughObj2: Function0<*> = { Test.field.memberFun() }
         memberFunThroughObj2.invoke()
-        val memberFunThroughObj3 = { Test.staticFun().memberFun() }
+        val memberFunThroughObj3: Function0<*> = { Test.staticFun().memberFun() }
         memberFunThroughObj3.invoke()
     }
 
     fun testConstructor() {
-        val constructorSameClass = { Java8Class() }
+        val constructorSameClass: Function0<*> = { Java8Class() }
         constructorSameClass.invoke()
-
-        val qualifiedConstructorSameClass = { test.Java8Class() }
+        val qualifiedConstructorSameClass: Function0<*> = { Java8Class() }
         qualifiedConstructorSameClass.invoke()
-
-        val constructorAnotherClass = { Test() }
+        val constructorAnotherClass: Function0<*> = { Test() }
         constructorAnotherClass.invoke()
-
-        val qualifiedConstructorAnotherClass = { test.Test() }
+        val qualifiedConstructorAnotherClass: Function0<*> = { Test() }
         qualifiedConstructorAnotherClass.invoke()
     }
 
@@ -81,12 +73,13 @@ internal class Java8Class {
         constructorWithoutParams.invoke()
 
         val constructorWithParam = { i: Int -> Test.testOverloads(i) }
-        constructorWithParam.invoke(2)
+        constructorWithParam.invoke(2) + 42
     }
 
     fun testGenericFunctions() {
-        val emptyList = { emptyList() }
-        emptyList.invoke()
+        val emptyList: Function0<kotlin.collections.List<String>> = { emptyList() }
+        val list = emptyList.invoke()
+        list[0]
     }
 
     fun memberFun(): Int {
diff --git a/nj2k/testData/newJ2k/function/java8MRSamConstructor.kt b/nj2k/testData/newJ2k/function/java8MRSamConstructor.kt
index 84c4534531a..614040e4181 100644
--- a/nj2k/testData/newJ2k/function/java8MRSamConstructor.kt
+++ b/nj2k/testData/newJ2k/function/java8MRSamConstructor.kt
@@ -1,7 +1,6 @@
 package test
 
 import javaApi.*
-import java.util.Collections
 
 internal class Test {
     fun memberFun(): Int {
@@ -9,7 +8,6 @@ internal class Test {
     }
 
     constructor(i: Int) : super() {}
-
     constructor() {}
 
     companion object {
@@ -29,17 +27,14 @@ internal class Test {
 }
 
 internal class Test2
-
 internal class Java8Class {
     private val field = Java8Class()
     private val h = MethodReferenceHelperClass()
-
     fun testStaticFunction() {
         val staticFunFromSameClass = JFunction0 { staticFun() }
         staticFunFromSameClass.foo()
         MethodReferenceHelperClass.staticFun0 { staticFun() }
         h.memberFun0 { staticFun() }
-
         val staticFunFromAnotherClass = JFunction0 { Test.staticFun() }
         staticFunFromAnotherClass.foo()
         MethodReferenceHelperClass.staticFun0 { Test.staticFun() }
@@ -47,10 +42,10 @@ internal class Java8Class {
     }
 
     fun testMemberFunctionThroughClass() {
-        val memberFunFromClass = JFunction2<Java8Class, Int> { it.memberFun() }
+        val memberFunFromClass: JFunction2<Java8Class, Int> = JFunction2 { obj: Java8Class -> obj.memberFun() }
         memberFunFromClass.foo(Java8Class())
-        MethodReferenceHelperClass.staticFun2(JFunction2<Java8Class, Int> { it.memberFun() })
-        h.memberFun2(JFunction2<Java8Class, Int> { it.memberFun() })
+        MethodReferenceHelperClass.staticFun2 { obj: Java8Class -> obj.memberFun() }
+        h.memberFun2 { obj: Java8Class -> obj.memberFun() }
     }
 
     fun testMemberFunctionThroughObject() {
@@ -87,27 +82,22 @@ internal class Java8Class {
         constructorSameClass.foo()
         MethodReferenceHelperClass.staticFun0 { Java8Class() }
         h.memberFun0 { Java8Class() }
-
-        val qualifiedConstructorSameClass = JFunction0 { test.Java8Class() }
+        val qualifiedConstructorSameClass = JFunction0 { Java8Class() }
         qualifiedConstructorSameClass.foo()
-        MethodReferenceHelperClass.staticFun0 { test.Java8Class() }
-        h.memberFun0 { test.Java8Class() }
-
+        MethodReferenceHelperClass.staticFun0 { Java8Class() }
+        h.memberFun0 { Java8Class() }
         val constructorAnotherClass = JFunction0 { Test() }
         constructorAnotherClass.foo()
         MethodReferenceHelperClass.staticFun0 { Test() }
         h.memberFun0 { Test() }
-
-        val constructorAnotherClassWithParam = JFunction2<Int, Test> { Test(it) }
+        val constructorAnotherClassWithParam: JFunction2<Int, Test> = JFunction2 { i: Int -> Test(i) }
         constructorAnotherClassWithParam.foo(1)
-        MethodReferenceHelperClass.staticFun2(JFunction2<Int, Test> { Test(it) })
-        h.memberFun2(JFunction2<Int, Test> { Test(it) })
-
-        val qualifiedConstructorAnotherClass = JFunction0 { test.Test() }
+        MethodReferenceHelperClass.staticFun2 { i: Int -> Test(i) }
+        h.memberFun2 { i: Int -> Test(i) }
+        val qualifiedConstructorAnotherClass = JFunction0 { Test() }
         qualifiedConstructorAnotherClass.foo()
-        MethodReferenceHelperClass.staticFun0 { test.Test() }
-        h.memberFun0 { test.Test() }
-
+        MethodReferenceHelperClass.staticFun0 { Test() }
+        h.memberFun0 { Test() }
         val constructorAnotherClassWithoutConstructor = JFunction0 { Test2() }
         constructorAnotherClassWithoutConstructor.foo()
         MethodReferenceHelperClass.staticFun0 { Test2() }
@@ -115,30 +105,28 @@ internal class Java8Class {
     }
 
     fun testLibraryFunctions() {
-        val memberFunFromClass = JFunction2<String, Int> { it.length }
+        val memberFunFromClass: JFunction2<String, Int> = JFunction2 { obj: String -> obj.length }
         memberFunFromClass.foo("str")
-
         Thread(Runnable { println() }).start()
         Runnable { println() }.run()
     }
 
     fun testOverloads() {
-        val constructorWithoutParams = JFunction1 { Test.testOverloads() }
+        val constructorWithoutParams: JFunction1<String> = JFunction1 { Test.testOverloads() }
         constructorWithoutParams.foo()
         MethodReferenceHelperClass.staticFun1 { Test.testOverloads() }
         h.memberFun1 { Test.testOverloads() }
-
-        val constructorWithParam = JFunction2<Int, String> { Test.testOverloads(it) }
+        val constructorWithParam: JFunction2<Int, String> = JFunction2 { i: Int -> Test.testOverloads(i) }
         constructorWithParam.foo(2)
-        MethodReferenceHelperClass.staticFun2(JFunction2<Int, String> { Test.testOverloads(it) })
-        h.memberFun2(JFunction2<Int, String> { Test.testOverloads(it) })
+        MethodReferenceHelperClass.staticFun2 { i: Int -> Test.testOverloads(i) }
+        h.memberFun2 { i: Int -> Test.testOverloads(i) }
     }
 
     fun testGenericFunctions() {
-        val emptyList = JFunction1<List<String>> { emptyList() }
+        val emptyList: JFunction1<kotlin.collections.List<String>> = JFunction1 { emptyList() }
         emptyList.foo()
-        MethodReferenceHelperClass.staticFun1(JFunction1<List<String>> { emptyList() })
-        h.memberFun1(JFunction1<List<String>> { emptyList() })
+        MethodReferenceHelperClass.staticFun1(JFunction1<kotlin.collections.List<String>> { emptyList() })
+        h.memberFun1(JFunction1<kotlin.collections.List<String>> { emptyList() })
     }
 
     fun memberFun(): Int {
diff --git a/nj2k/testData/newJ2k/issues/kt-696.java b/nj2k/testData/newJ2k/issues/kt-696.java
index f10af61c13f..8d0c38a532b 100644
--- a/nj2k/testData/newJ2k/issues/kt-696.java
+++ b/nj2k/testData/newJ2k/issues/kt-696.java
@@ -1,6 +1,4 @@
 //file
-package test;
-
 class Base {
   @Override
   public int hashCode() {
diff --git a/nj2k/testData/newJ2k/issues/kt-696.kt b/nj2k/testData/newJ2k/issues/kt-696.kt
index 0a284403bfd..969dcfd80f2 100644
--- a/nj2k/testData/newJ2k/issues/kt-696.kt
+++ b/nj2k/testData/newJ2k/issues/kt-696.kt
@@ -1,5 +1,3 @@
-package test
-
 internal open class Base {
     override fun hashCode(): Int {
         return super.hashCode()
diff --git a/nj2k/testData/newJ2k/localVariable/autoBangBang.kt b/nj2k/testData/newJ2k/localVariable/autoBangBang.kt
index 076cff468aa..b1ea23613e5 100644
--- a/nj2k/testData/newJ2k/localVariable/autoBangBang.kt
+++ b/nj2k/testData/newJ2k/localVariable/autoBangBang.kt
@@ -1,4 +1,4 @@
-fun foo(i: Int?) {
-    var i1 = i!!
+fun foo(i: Int) {
+    var i1 = i
     i1++
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/methodCallExpression/collectionsMethods.kt b/nj2k/testData/newJ2k/methodCallExpression/collectionsMethods.kt
index c5ececd5925..9521c7623c4 100644
--- a/nj2k/testData/newJ2k/methodCallExpression/collectionsMethods.kt
+++ b/nj2k/testData/newJ2k/methodCallExpression/collectionsMethods.kt
@@ -1,9 +1,11 @@
+import java.util.*
+
 internal class A {
-    fun foo(): Map<String?, String?> {
-        val list1: List<String?> = emptyList()
-        val list2: List<Int?> = listOf(1)
-        val set1: Set<String?> = emptySet()
-        val set2: Set<String?> = setOf("a")
+    fun foo(): Map<String, String> {
+        val list1: List<String> = emptyList()
+        val list2 = listOf(1)
+        val set1: Set<String> = emptySet()
+        val set2 = setOf("a")
         return emptyMap()
     }
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/methodCallExpression/collectionsMethods2.kt b/nj2k/testData/newJ2k/methodCallExpression/collectionsMethods2.kt
index e22979d3554..4c43efe0a19 100644
--- a/nj2k/testData/newJ2k/methodCallExpression/collectionsMethods2.kt
+++ b/nj2k/testData/newJ2k/methodCallExpression/collectionsMethods2.kt
@@ -1,6 +1,8 @@
+import java.util.*
+
 internal class A {
     fun foo() {
-        val list: List<String?> = listOf(null)
-        val set: Set<String?> = setOf(null)
+        val list = listOf<String?>(null)
+        val set = setOf<String?>(null)
     }
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/nullability/Overrides.java b/nj2k/testData/newJ2k/nullability/Overrides.java
index 93a02f5450b..5a8b94dc2ed 100644
--- a/nj2k/testData/newJ2k/nullability/Overrides.java
+++ b/nj2k/testData/newJ2k/nullability/Overrides.java
@@ -11,10 +11,14 @@ class Base {
     }
 
     public String zoo(Object o){ return ""; }
+
+    public String nya(String s) { return s; }
 }
 
 interface I {
     @Nullable String zoo(@Nullable Object o);
+
+    public String nya(String s) { return ""; }
 }
 
 class C extends Base implements I {
@@ -23,4 +27,6 @@ class C extends Base implements I {
     public String bar(String s) { return ""; }
 
     public String zoo(Object o) { return ""; }
+
+    public String nya(String s) { return ""; }
 }
diff --git a/nj2k/testData/newJ2k/nullability/Overrides.kt b/nj2k/testData/newJ2k/nullability/Overrides.kt
index ae0f2827158..ccff331dc4d 100644
--- a/nj2k/testData/newJ2k/nullability/Overrides.kt
+++ b/nj2k/testData/newJ2k/nullability/Overrides.kt
@@ -7,13 +7,20 @@ internal open class Base {
         return if (s != null) s + 1 else null
     }
 
-    open fun zoo(o: Any?): String {
+    open fun zoo(o: Any?): String? {
         return ""
     }
+
+    open fun nya(s: String): String {
+        return s
+    }
 }
 
 internal interface I {
     fun zoo(o: Any?): String?
+    fun nya(s: String): String {
+        return ""
+    }
 }
 
 internal class C : Base(), I {
@@ -25,7 +32,11 @@ internal class C : Base(), I {
         return ""
     }
 
-    override fun zoo(o: Any?): String {
+    override fun zoo(o: Any?): String? {
+        return ""
+    }
+
+    override fun nya(s: String): String {
         return ""
     }
 }
diff --git a/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefaultInFor.kt b/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefaultInFor.kt
index 5a7894c80bc..4b9bc5a2530 100644
--- a/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefaultInFor.kt
+++ b/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefaultInFor.kt
@@ -1,8 +1,9 @@
 // !specifyLocalVariableTypeByDefault: true
-fun foo(list: List<String?>?) {
+
+fun foo(list: List<String>) {
     val array: IntArray = IntArray(10)
     for (i: Int in 0..9) {
         array[i] = i
     }
-    for (s: String? in list!!) print(s)
+    for (s: String in list) print(s)
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/toArray/toArray.kt b/nj2k/testData/newJ2k/toArray/toArray.kt
index a26c08e2770..34f4a8c76ae 100644
--- a/nj2k/testData/newJ2k/toArray/toArray.kt
+++ b/nj2k/testData/newJ2k/toArray/toArray.kt
@@ -2,8 +2,8 @@ import java.util.Arrays
 
 class Foo {
     fun test() {
-        val list: List<String?> = Arrays.asList("a", "b")
+        val list: List<String> = Arrays.asList("a", "b")
         val array1: Array<Any> = list.toTypedArray()
-        val array2: Array<Any> = list.toTypedArray()
+        val array2: Array<Any> = list.toTypedArray<String>()
     }
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/toKotlinClasses/LibraryFunctions.kt b/nj2k/testData/newJ2k/toKotlinClasses/LibraryFunctions.kt
index 32f7dd04e3d..6334d777fe3 100644
--- a/nj2k/testData/newJ2k/toKotlinClasses/LibraryFunctions.kt
+++ b/nj2k/testData/newJ2k/toKotlinClasses/LibraryFunctions.kt
@@ -10,7 +10,7 @@ class TestJava {
         fun main(args: Array<String>) {
             val x: List<String> = ArrayList()
             x.filter { o: String -> o == "a" }
-            val lazy: Lazy<String?> = lazy(LazyThreadSafetyMode.NONE) { "aaa" }
+            val lazy = lazy(LazyThreadSafetyMode.NONE) { "aaa" }
         }
     }
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/typeCastExpression/extendsWildcardCast.kt b/nj2k/testData/newJ2k/typeCastExpression/extendsWildcardCast.kt
index a1a8984ea76..63c3b30c0b5 100644
--- a/nj2k/testData/newJ2k/typeCastExpression/extendsWildcardCast.kt
+++ b/nj2k/testData/newJ2k/typeCastExpression/extendsWildcardCast.kt
@@ -1 +1 @@
-list as List<String?>?
\ No newline at end of file
+list as List<String>?
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/typeCastExpression/superWildcardCast.kt b/nj2k/testData/newJ2k/typeCastExpression/superWildcardCast.kt
index e199d5d5de5..7af8092d7e3 100644
--- a/nj2k/testData/newJ2k/typeCastExpression/superWildcardCast.kt
+++ b/nj2k/testData/newJ2k/typeCastExpression/superWildcardCast.kt
@@ -1 +1 @@
-list as List<in String?>?
\ No newline at end of file
+list as List<in String>?
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/typeParameters/rawTypeCast.kt b/nj2k/testData/newJ2k/typeParameters/rawTypeCast.kt
index aebbcbd9bc2..c8defde55b3 100644
--- a/nj2k/testData/newJ2k/typeParameters/rawTypeCast.kt
+++ b/nj2k/testData/newJ2k/typeParameters/rawTypeCast.kt
@@ -1,10 +1,8 @@
-// ERROR: Type inference failed. Expected type mismatch: inferred type is HashMap<Any?, Any?> but Map<String?, String?> was expected
-import java.util.HashMap
-import java.util.Properties
+import java.util.*
 
 internal object A {
     fun foo(): Map<String?, String?> {
         val props = Properties()
-        return HashMap<Any, Any?>(props as Map<*, *>)
+        return HashMap<Any?, Any?>(props as Map<*, *>)
     }
 }
\ No newline at end of file
diff --git a/nj2k/testData/nullabilityAnalysis/superMethod.kt.after b/nj2k/testData/nullabilityAnalysis/superMethod.kt.after
index 7259026f01e..266c2c118a1 100644
--- a/nj2k/testData/nullabilityAnalysis/superMethod.kt.after
+++ b/nj2k/testData/nullabilityAnalysis/superMethod.kt.after
@@ -6,7 +6,7 @@ open class A () {
 }
 
 class B : A() {
-    override fun foo(x: Int?): Int? {
+    override fun foo(x: Int?): Int {
         return 1
     }
 }
\ No newline at end of file
diff --git a/nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java b/nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java
index fed7b3819fb..14b86752268 100644
--- a/nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java
+++ b/nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java
@@ -52,7 +52,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("annotationFromConstructorParamToProperty.java")
-        public void testAnnotationFromConstructorParamToProperty() throws Exception {
+        public void ignoreTestAnnotationFromConstructorParamToProperty() throws Exception {
             runTest("nj2k/testData/newJ2k/annotations/annotationFromConstructorParamToProperty.java");
         }
 
@@ -107,7 +107,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("jetbrainsNullable.java")
-        public void ignoreTestJetbrainsNullable() throws Exception {
+        public void testJetbrainsNullable() throws Exception {
             runTest("nj2k/testData/newJ2k/annotations/jetbrainsNullable.java");
         }
 
@@ -1007,7 +1007,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("fieldsInitializedFromParams.java")
-        public void testFieldsInitializedFromParams() throws Exception {
+        public void ignoreTestFieldsInitializedFromParams() throws Exception {
             runTest("nj2k/testData/newJ2k/comments/fieldsInitializedFromParams.java");
         }
 
@@ -1382,7 +1382,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("DataClassWithAnnotations.java")
-        public void testDataClassWithAnnotations() throws Exception {
+        public void ignoreTestDataClassWithAnnotations() throws Exception {
             runTest("nj2k/testData/newJ2k/detectProperties/DataClassWithAnnotations.java");
         }
 
@@ -2269,7 +2269,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("extendsBaseWhichExtendsObject.java")
-        public void ignoreTestExtendsBaseWhichExtendsObject() throws Exception {
+        public void testExtendsBaseWhichExtendsObject() throws Exception {
             runTest("nj2k/testData/newJ2k/function/extendsBaseWhichExtendsObject.java");
         }
 
@@ -2289,17 +2289,17 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("java8Lambdas.java")
-        public void ignoreTestJava8Lambdas() throws Exception {
+        public void testJava8Lambdas() throws Exception {
             runTest("nj2k/testData/newJ2k/function/java8Lambdas.java");
         }
 
         @TestMetadata("java8MRKFunctionExpectedType.java")
-        public void ignoreTestJava8MRKFunctionExpectedType() throws Exception {
+        public void testJava8MRKFunctionExpectedType() throws Exception {
             runTest("nj2k/testData/newJ2k/function/java8MRKFunctionExpectedType.java");
         }
 
         @TestMetadata("java8MRSamConstructor.java")
-        public void ignoreTestJava8MRSamConstructor() throws Exception {
+        public void testJava8MRSamConstructor() throws Exception {
             runTest("nj2k/testData/newJ2k/function/java8MRSamConstructor.java");
         }
 
@@ -3311,7 +3311,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("Overrides.java")
-        public void ignoreTestOverrides() throws Exception {
+        public void testOverrides() throws Exception {
             runTest("nj2k/testData/newJ2k/mutableCollections/Overrides.java");
         }
 
@@ -3374,7 +3374,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("newAnonymousClass.java")
-        public void testNewAnonymousClass() throws Exception {
+        public void ignoreTestNewAnonymousClass() throws Exception {
             runTest("nj2k/testData/newJ2k/newClassExpression/newAnonymousClass.java");
         }
 
@@ -3577,7 +3577,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("Overrides.java")
-        public void ignoreTestOverrides() throws Exception {
+        public void testOverrides() throws Exception {
             runTest("nj2k/testData/newJ2k/nullability/Overrides.java");
         }
 
@@ -3770,7 +3770,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("AnonymousObject.java")
-        public void testAnonymousObject() throws Exception {
+        public void ignoreTestAnonymousObject() throws Exception {
             runTest("nj2k/testData/newJ2k/postProcessing/AnonymousObject.java");
         }
 
@@ -3780,7 +3780,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("IfNullReturnToElvis.java")
-        public void ignoreTestIfNullReturnToElvis() throws Exception {
+        public void testIfNullReturnToElvis() throws Exception {
             runTest("nj2k/testData/newJ2k/postProcessing/IfNullReturnToElvis.java");
         }
 
@@ -3985,7 +3985,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("rawGenericMethod.java")
-        public void ignoreTestRawGenericMethod() throws Exception {
+        public void testRawGenericMethod() throws Exception {
             runTest("nj2k/testData/newJ2k/rawGenerics/rawGenericMethod.java");
         }
     }
@@ -4320,7 +4320,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("toArray.java")
-        public void ignoreTestToArray() throws Exception {
+        public void testToArray() throws Exception {
             runTest("nj2k/testData/newJ2k/toArray/toArray.java");
         }
     }
@@ -4668,7 +4668,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("rawTypeCast.java")
-        public void ignoreTestRawTypeCast() throws Exception {
+        public void testRawTypeCast() throws Exception {
             runTest("nj2k/testData/newJ2k/typeParameters/rawTypeCast.java");
         }
 
@@ -4678,7 +4678,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("typeFromOtherFile.java")
-        public void ignoreTestTypeFromOtherFile() throws Exception {
+        public void testTypeFromOtherFile() throws Exception {
             runTest("nj2k/testData/newJ2k/typeParameters/typeFromOtherFile.java");
         }