diff --git a/nj2k/testData/newJ2k/arrayType/arrayInitializationStatementWithDimension3d.kt b/nj2k/testData/newJ2k/arrayType/arrayInitializationStatementWithDimension3d.kt
index c92369fb13f..33b7baeb2f6 100644
--- a/nj2k/testData/newJ2k/arrayType/arrayInitializationStatementWithDimension3d.kt
+++ b/nj2k/testData/newJ2k/arrayType/arrayInitializationStatementWithDimension3d.kt
@@ -1 +1 @@
-val d3 = Array<Array<IntArray>>(5) { arrayOfNulls(5) }
\ No newline at end of file
+val d3: Array<Array<IntArray>> = Array(5) { arrayOfNulls(5) }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/arrayType/d2StringEmptyArray.kt b/nj2k/testData/newJ2k/arrayType/d2StringEmptyArray.kt
index 0db72939b6b..85c3f5b072e 100644
--- a/nj2k/testData/newJ2k/arrayType/d2StringEmptyArray.kt
+++ b/nj2k/testData/newJ2k/arrayType/d2StringEmptyArray.kt
@@ -1 +1 @@
-val ss = Array<Array<String>>(5) { arrayOfNulls(5) }
\ No newline at end of file
+val ss: Array<Array<String>> = Array(5) { arrayOfNulls(5) }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/arrayType/d3StringEmptyArray.kt b/nj2k/testData/newJ2k/arrayType/d3StringEmptyArray.kt
index 14d4dd69cf5..5f994cdd840 100644
--- a/nj2k/testData/newJ2k/arrayType/d3StringEmptyArray.kt
+++ b/nj2k/testData/newJ2k/arrayType/d3StringEmptyArray.kt
@@ -1 +1 @@
-val sss = Array(5) { Array<Array<String>>(5) { arrayOfNulls(5) } }
\ No newline at end of file
+val sss: Array<Array<Array<String>>> = Array(5) { Array(5) { arrayOfNulls(5) } }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/function/java8MRSamConstructor.kt b/nj2k/testData/newJ2k/function/java8MRSamConstructor.kt
index 614040e4181..c12324bcd09 100644
--- a/nj2k/testData/newJ2k/function/java8MRSamConstructor.kt
+++ b/nj2k/testData/newJ2k/function/java8MRSamConstructor.kt
@@ -42,7 +42,7 @@ internal class Java8Class {
     }
 
     fun testMemberFunctionThroughClass() {
-        val memberFunFromClass: JFunction2<Java8Class, Int> = JFunction2 { obj: Java8Class -> obj.memberFun() }
+        val memberFunFromClass = JFunction2 { obj: Java8Class -> obj.memberFun() }
         memberFunFromClass.foo(Java8Class())
         MethodReferenceHelperClass.staticFun2 { obj: Java8Class -> obj.memberFun() }
         h.memberFun2 { obj: Java8Class -> obj.memberFun() }
@@ -54,23 +54,19 @@ internal class Java8Class {
         memberFunFromSameClass.foo()
         MethodReferenceHelperClass.staticFun0 { obj.memberFun() }
         h.memberFun0 { obj.memberFun() }
-
         val anotherObj = Test()
         val memFunFromAnotherClass = JFunction0 { anotherObj.memberFun() }
         memFunFromAnotherClass.foo()
         MethodReferenceHelperClass.staticFun0 { anotherObj.memberFun() }
         h.memberFun0 { anotherObj.memberFun() }
-
         val memberFunThroughObj1 = JFunction0 { field.memberFun() }
         memberFunThroughObj1.foo()
         MethodReferenceHelperClass.staticFun0 { field.memberFun() }
         h.memberFun0 { field.memberFun() }
-
         val memberFunThroughObj2 = JFunction0 { Test.field.memberFun() }
         memberFunThroughObj2.foo()
         MethodReferenceHelperClass.staticFun0 { Test.field.memberFun() }
         h.memberFun0 { Test.field.memberFun() }
-
         val memberFunThroughObj3 = JFunction0 { Test.staticFun().memberFun() }
         memberFunThroughObj3.foo()
         MethodReferenceHelperClass.staticFun0 { Test.staticFun().memberFun() }
@@ -90,7 +86,7 @@ internal class Java8Class {
         constructorAnotherClass.foo()
         MethodReferenceHelperClass.staticFun0 { Test() }
         h.memberFun0 { Test() }
-        val constructorAnotherClassWithParam: JFunction2<Int, Test> = JFunction2 { i: Int -> Test(i) }
+        val constructorAnotherClassWithParam = JFunction2 { i: Int -> Test(i) }
         constructorAnotherClassWithParam.foo(1)
         MethodReferenceHelperClass.staticFun2 { i: Int -> Test(i) }
         h.memberFun2 { i: Int -> Test(i) }
@@ -105,18 +101,18 @@ internal class Java8Class {
     }
 
     fun testLibraryFunctions() {
-        val memberFunFromClass: JFunction2<String, Int> = JFunction2 { obj: String -> obj.length }
+        val memberFunFromClass = JFunction2 { obj: String -> obj.length }
         memberFunFromClass.foo("str")
         Thread(Runnable { println() }).start()
         Runnable { println() }.run()
     }
 
     fun testOverloads() {
-        val constructorWithoutParams: JFunction1<String> = JFunction1 { Test.testOverloads() }
+        val constructorWithoutParams = JFunction1 { Test.testOverloads() }
         constructorWithoutParams.foo()
         MethodReferenceHelperClass.staticFun1 { Test.testOverloads() }
         h.memberFun1 { Test.testOverloads() }
-        val constructorWithParam: JFunction2<Int, String> = JFunction2 { i: Int -> Test.testOverloads(i) }
+        val constructorWithParam = JFunction2 { i: Int -> Test.testOverloads(i) }
         constructorWithParam.foo(2)
         MethodReferenceHelperClass.staticFun2 { i: Int -> Test.testOverloads(i) }
         h.memberFun2 { i: Int -> Test.testOverloads(i) }
@@ -134,7 +130,6 @@ internal class Java8Class {
     }
 
     companion object {
-
         fun staticFun(): Int {
             return 1
         }
diff --git a/nj2k/testData/newJ2k/methodCallExpression/collectionsMethods2.kt b/nj2k/testData/newJ2k/methodCallExpression/collectionsMethods2.kt
index 4c43efe0a19..5e49d79c4c9 100644
--- a/nj2k/testData/newJ2k/methodCallExpression/collectionsMethods2.kt
+++ b/nj2k/testData/newJ2k/methodCallExpression/collectionsMethods2.kt
@@ -2,7 +2,7 @@ import java.util.*
 
 internal class A {
     fun foo() {
-        val list = listOf<String?>(null)
-        val set = setOf<String?>(null)
+        val list: List<String?> = listOf(null)
+        val set: Set<String?> = setOf(null)
     }
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/nullability/nullableField.kt b/nj2k/testData/newJ2k/nullability/nullableField.kt
index b81005ee889..97a314d14b6 100644
--- a/nj2k/testData/newJ2k/nullability/nullableField.kt
+++ b/nj2k/testData/newJ2k/nullability/nullableField.kt
@@ -35,8 +35,8 @@ class Test {
     }
 
     fun test7() {
-        val list: MutableList<Int> = ArrayList()
-        list.remove(myIntProp!!)
+        val list: MutableList<Int?> = ArrayList()
+        list.remove(myIntProp)
     }
 
     fun foo1(s: String) {}