diff --git a/j2k/testData/fileOrElement/assertStatement/assertNotNull.java b/j2k/testData/fileOrElement/assertStatement/assertNotNull.java
index 6d77420aa8a..5b1985fd7f4 100644
--- a/j2k/testData/fileOrElement/assertStatement/assertNotNull.java
+++ b/j2k/testData/fileOrElement/assertStatement/assertNotNull.java
@@ -8,6 +8,6 @@ abstract class C {
         int h = s2.hashCode();
     }
 
-    abstract void f(): String;
-    abstract void g(): String;
+    abstract String f();
+    abstract String g();
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/assertStatement/assertNotNull.kt b/j2k/testData/fileOrElement/assertStatement/assertNotNull.kt
index c59c8840802..5f89f3a2754 100644
--- a/j2k/testData/fileOrElement/assertStatement/assertNotNull.kt
+++ b/j2k/testData/fileOrElement/assertStatement/assertNotNull.kt
@@ -3,9 +3,9 @@ internal abstract class C {
         val s1 = f()!!
 
         val s2 = g() ?: error("g should not return null")
-        val h = s2.hashCode()
+        val h = s2!!.hashCode()
     }
 
-    internal abstract fun f()
-    internal abstract fun g()
-}
+    internal abstract fun f(): String?
+    internal abstract fun g(): String?
+}
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/nullability/nullableField.java b/j2k/testData/fileOrElement/nullability/nullableField.java
index d47990c679d..936304e137c 100644
--- a/j2k/testData/fileOrElement/nullability/nullableField.java
+++ b/j2k/testData/fileOrElement/nullability/nullableField.java
@@ -14,19 +14,33 @@ public class Test {
         myIntProp = 1;
     }
 
-    public void test() {
+    public void test1() {
         foo1(myProp);
-        foo2(myProp);
-        foo3(myProp);
+    }
 
+    public void test2() {
+        foo2(myProp);
+    }
+
+    public void test3() {
+        foo3(myProp);
+    }
+
+    public void test4() {
         myProp.charAt(myIntProp);
         System.out.println(myProp);
+    }
 
+    public void test5() {
         boolean b = "aaa".equals(myProp);
         String s = "aaa" + myProp;
+    }
 
+    public void test6() {
         myProp.compareToIgnoreCase(myProp);
+    }
 
+    public void test7() {
         List<Integer> list = new ArrayList<Integer>();
         list.remove(myIntProp);
     }
diff --git a/j2k/testData/fileOrElement/nullability/nullableField.kt b/j2k/testData/fileOrElement/nullability/nullableField.kt
index d7b8c1a5645..4e322a28000 100644
--- a/j2k/testData/fileOrElement/nullability/nullableField.kt
+++ b/j2k/testData/fileOrElement/nullability/nullableField.kt
@@ -11,19 +11,33 @@ class Test {
         myIntProp = 1
     }
 
-    fun test() {
+    fun test1() {
         foo1(myProp!!)
-        foo2(myProp!!)
-        foo3(myProp)
+    }
 
+    fun test2() {
+        foo2(myProp!!)
+    }
+
+    fun test3() {
+        foo3(myProp)
+    }
+
+    fun test4() {
         myProp!![myIntProp!!]
         println(myProp)
+    }
 
+    fun test5() {
         val b = "aaa" == myProp
         val s = "aaa" + myProp!!
+    }
 
+    fun test6() {
         myProp!!.compareTo(myProp!!, ignoreCase = true)
+    }
 
+    fun test7() {
         val list = ArrayList<Int>()
         list.remove(myIntProp!!)
     }