diff --git a/nj2k/testData/newJ2k/annotations/annotationFromConstructorParamToProperty.kt b/nj2k/testData/newJ2k/annotations/annotationFromConstructorParamToProperty.kt
index b5148e804a8..891176122e8 100644
--- a/nj2k/testData/newJ2k/annotations/annotationFromConstructorParamToProperty.kt
+++ b/nj2k/testData/newJ2k/annotations/annotationFromConstructorParamToProperty.kt
@@ -1,6 +1,3 @@
 internal annotation class A
-
 internal annotation class B
-
-class U(@field:B @param:A
-        var i: Int)
\ No newline at end of file
+class U(@field:B @param:A var i: Int)
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/annotations/annotationInterface3.kt b/nj2k/testData/newJ2k/annotations/annotationInterface3.kt
index cdd81f855f9..776d1164e23 100644
--- a/nj2k/testData/newJ2k/annotations/annotationInterface3.kt
+++ b/nj2k/testData/newJ2k/annotations/annotationInterface3.kt
@@ -1,12 +1,7 @@
 internal annotation class Anon(val value: String) {
-
-    enum class E {
-        A, B
-    }
-
+    enum class E { A, B }
     companion object {
-
-        val field = E.A
+        var field = E.A
     }
 }
 
diff --git a/nj2k/testData/newJ2k/annotations/jetbrainsNotNull.kt b/nj2k/testData/newJ2k/annotations/jetbrainsNotNull.kt
index cc333df3af9..57a6607c8f8 100644
--- a/nj2k/testData/newJ2k/annotations/jetbrainsNotNull.kt
+++ b/nj2k/testData/newJ2k/annotations/jetbrainsNotNull.kt
@@ -2,7 +2,13 @@
 // !specifyLocalVariableTypeByDefault: true
 package test
 
-class Test(internal var myStr: String) {
+class Test(str: String) {
+    internal var myStr = "String2"
+
+    init {
+        myStr = str
+    }
+
     fun sout(str: String) {
         // UNNECESSARY_NOT_NULL_ASSERTION heuristic does not work any more, instead we can skip generating !! altogether
         println(str)
diff --git a/nj2k/testData/newJ2k/annotations/jetbrainsNullable.kt b/nj2k/testData/newJ2k/annotations/jetbrainsNullable.kt
index 970a29f0d9a..1fa41beb399 100644
--- a/nj2k/testData/newJ2k/annotations/jetbrainsNullable.kt
+++ b/nj2k/testData/newJ2k/annotations/jetbrainsNullable.kt
@@ -1,7 +1,13 @@
 // !specifyLocalVariableTypeByDefault: true
 package test
 
-class Test(internal var myStr: String?) {
+class Test(str: String?) {
+    internal var myStr: String? = "String2"
+
+    init {
+        myStr = str
+    }
+
     fun sout(str: String?) {
         println(str)
     }
diff --git a/nj2k/testData/newJ2k/annotations/modifiersToAnnotationsFromPropertyAccessors.kt b/nj2k/testData/newJ2k/annotations/modifiersToAnnotationsFromPropertyAccessors.kt
index f555efb3b2a..d8ecfb24dfe 100644
--- a/nj2k/testData/newJ2k/annotations/modifiersToAnnotationsFromPropertyAccessors.kt
+++ b/nj2k/testData/newJ2k/annotations/modifiersToAnnotationsFromPropertyAccessors.kt
@@ -1,11 +1,9 @@
 class WithModifiersOnAccessors {
-
     @get:Synchronized
     @set:Synchronized
     var sync = 0
-
     @get:Strictfp
-    val strict = 0.0
+    var strict = 0.0
 
     @Synchronized
     private fun methSync() {
@@ -14,4 +12,5 @@ class WithModifiersOnAccessors {
     @Strictfp
     protected fun methStrict() {
     }
+
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/anonymousBlock/oneStaticAnonBlock.kt b/nj2k/testData/newJ2k/anonymousBlock/oneStaticAnonBlock.kt
index 0feb5f165bc..b1b37adf639 100644
--- a/nj2k/testData/newJ2k/anonymousBlock/oneStaticAnonBlock.kt
+++ b/nj2k/testData/newJ2k/anonymousBlock/oneStaticAnonBlock.kt
@@ -1,5 +1,5 @@
 internal object Test {
-    var str: String
+    var str: String? = null
 
     init {
         str = "Ola"
diff --git a/nj2k/testData/newJ2k/boxedType/kt-671.kt b/nj2k/testData/newJ2k/boxedType/kt-671.kt
index 5785c1962b9..c6936f66b6a 100644
--- a/nj2k/testData/newJ2k/boxedType/kt-671.kt
+++ b/nj2k/testData/newJ2k/boxedType/kt-671.kt
@@ -1,9 +1,7 @@
-package demo
-
 internal class Test {
     fun test() {
         val i = Integer.valueOf(100)
         val s: Short = 3
-        val ss = java.lang.Short.valueOf(s)
+        val ss = s
     }
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/class/ClassShadowing.java b/nj2k/testData/newJ2k/class/ClassShadowing.java
index 18f9b2b5f71..0372bd79350 100644
--- a/nj2k/testData/newJ2k/class/ClassShadowing.java
+++ b/nj2k/testData/newJ2k/class/ClassShadowing.java
@@ -2,15 +2,15 @@ package test;
 
 import java.lang.String;
 
-public class Short {
-        public Short(String s){}
-	public static Short valueOf(String value) {return new Short(value);}
+public class Integer {
+	public Integer(String s){}
+	public static Integer valueOf(String value) {return new Integer(value);}
 }
 
 class Test {
 	public static void test() {
-		Short.valueOf("1");
-		test.Short.valueOf("1");
-		java.lang.Short.valueOf("1");
+		Integer.valueOf("1");
+		test.Integer.valueOf("1");
+		java.lang.Integer.valueOf("1");
 	}
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/class/ClassShadowing.kt b/nj2k/testData/newJ2k/class/ClassShadowing.kt
index adffbe38d8f..8d0dd358dbf 100644
--- a/nj2k/testData/newJ2k/class/ClassShadowing.kt
+++ b/nj2k/testData/newJ2k/class/ClassShadowing.kt
@@ -1,17 +1,17 @@
 package test
 
-class Short(s: String?) {
+class Integer(s: String?) {
     companion object {
-        fun valueOf(value: String): Short {
-            return Short(value)
+        fun valueOf(value: String): Integer {
+            return Integer(value)
         }
     }
 }
 
 internal object Test {
     fun test() {
-        Short.valueOf("1")
-        Short.valueOf("1")
-        java.lang.Short.valueOf("1")
+        Integer.valueOf("1")
+        Integer.valueOf("1")
+        java.lang.Integer.valueOf("1")
     }
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/comments/commentInsideCall.kt b/nj2k/testData/newJ2k/comments/commentInsideCall.kt
index b09ef69eb6c..5cdd6ae8a1c 100644
--- a/nj2k/testData/newJ2k/comments/commentInsideCall.kt
+++ b/nj2k/testData/newJ2k/comments/commentInsideCall.kt
@@ -5,9 +5,8 @@ object Test {
     fun main(args: Array<String>) {
         println()// Comment
 
-        Test
-                // Comment1
-                .foo()
+        // Comment1
+        foo()
                 // Comment2
                 .indexOf("s")
     }
diff --git a/nj2k/testData/newJ2k/comments/comments2.kt b/nj2k/testData/newJ2k/comments/comments2.kt
index 3ae2e71c03a..82eff953126 100644
--- a/nj2k/testData/newJ2k/comments/comments2.kt
+++ b/nj2k/testData/newJ2k/comments/comments2.kt
@@ -28,6 +28,6 @@ internal class A {
     fun foo(param1: String?, param2: String?, param3: String?) {}
 
     companion object {
-        /*it's public*/const /*and static*/ val/*and final*/ C = 1
+        /*it's public*/ /*and static*/ const val/*and final*/ C = 1
     }
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/comments/commentsForConstructors.kt b/nj2k/testData/newJ2k/comments/commentsForConstructors.kt
index b3687498752..a970d50d42f 100644
--- a/nj2k/testData/newJ2k/comments/commentsForConstructors.kt
+++ b/nj2k/testData/newJ2k/comments/commentsForConstructors.kt
@@ -1,19 +1,23 @@
-internal class A// this is a primary constructor
-@JvmOverloads constructor(p: Int = 1) {
+internal class A @JvmOverloads constructor(p: Int = 1) {
     private val v: Int
+// this is a secondary constructor 1
 
+
+    // this is a primary constructor
     init {
         v = 1
     } // end of primary constructor body
 
+
+    // end of secondary constructor 1 body
+
     // this is a secondary constructor 2
     constructor(s: String) : this(s.length) {} // end of secondary constructor 2 body
-}// this is a secondary constructor 1
-// end of secondary constructor 1 body
+}
 
-internal class B// this constructor will disappear
-(private val x: Int) // end of constructor body
-{
+internal class B // this constructor will disappear
+// end of constructor body
+(private val x: Int) {
 
     fun foo() {}
 }
@@ -30,8 +34,7 @@ internal class CtorComment {
     }
 }
 
-/*
+internal class CtorComment2 /*
      * The magic of comments
      */
-// single line magic comments
-internal class CtorComment2
\ No newline at end of file
+// single line magic comments
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/comments/fieldsInitializedFromParams.kt b/nj2k/testData/newJ2k/comments/fieldsInitializedFromParams.kt
index 1f5217e6a2a..70c9e3cedda 100644
--- a/nj2k/testData/newJ2k/comments/fieldsInitializedFromParams.kt
+++ b/nj2k/testData/newJ2k/comments/fieldsInitializedFromParams.kt
@@ -1,6 +1,6 @@
-internal class C(private val p1 // field p1
-                 : Int /* parameter p1 */,
-                 /**
-                  * Field myP2
-                  */
-                 private val myP2: Int, /* Field p3 */  var p3: Int)
\ No newline at end of file
+internal class C(// field p1
+        private val p1: Int /* parameter p1 */,
+        /**
+         * Field myP2
+         */
+        private val myP2: Int, /* Field p3 */var p3: Int)
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/constructors/constructorAnnotations.kt b/nj2k/testData/newJ2k/constructors/constructorAnnotations.kt
index ca06e1c5cec..bfd5b6941e8 100644
--- a/nj2k/testData/newJ2k/constructors/constructorAnnotations.kt
+++ b/nj2k/testData/newJ2k/constructors/constructorAnnotations.kt
@@ -1,15 +1,11 @@
 import javaApi.Anon5
 
-internal class A @Anon5(10)
-constructor(private val a: Int, private val b: Int) {
+internal class A @Anon5(10) constructor(private val a: Int, private val b: Int) {
 
     @Deprecated("") // this constructor will not be replaced by default parameter value in primary because of this annotation
     constructor(a: Int) : this(a, 1) {
     }
 }
 
-internal class B @Anon5(11)
-constructor()
-
-internal class C @Anon5(12)
-private constructor()
\ No newline at end of file
+internal class B @Anon5(11) constructor()
+internal class C @Anon5(12) private constructor()
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/constructors/fieldsInitializedFromParamsAnnotations.kt b/nj2k/testData/newJ2k/constructors/fieldsInitializedFromParamsAnnotations.kt
index 83c11a3ce31..765be574382 100644
--- a/nj2k/testData/newJ2k/constructors/fieldsInitializedFromParamsAnnotations.kt
+++ b/nj2k/testData/newJ2k/constructors/fieldsInitializedFromParamsAnnotations.kt
@@ -1 +1,4 @@
-internal class C(@Deprecated("") private val p1: Int, private val myP2: Int, @SuppressWarnings("x") var p3: Int)
\ No newline at end of file
+// ERROR: This annotation is not applicable to target 'value parameter' and use site target '@field'
+// ERROR: This annotation is not applicable to target 'value parameter' and use site target '@param'
+// ERROR: This annotation is not applicable to target 'value parameter' and use site target '@param'
+internal class C(@field:Deprecated("") private val p1: Int, @param:Deprecated("") private val myP2: Int, @param:Deprecated("") var p3: Int) 
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/detectProperties/AbstractPropertyPrivateSetter.kt b/nj2k/testData/newJ2k/detectProperties/AbstractPropertyPrivateSetter.kt
index 0f4f08ee5af..4e2d9cc7a9a 100644
--- a/nj2k/testData/newJ2k/detectProperties/AbstractPropertyPrivateSetter.kt
+++ b/nj2k/testData/newJ2k/detectProperties/AbstractPropertyPrivateSetter.kt
@@ -1,6 +1,6 @@
 package test
 
-import kotlinApi.KotlinClassAbstractProperty
+import kotlinApi.*
 
 class KotlinClassAbstractPropertyImpl : KotlinClassAbstractProperty() {
     override var isVisible = false
@@ -9,4 +9,4 @@ class KotlinClassAbstractPropertyImpl : KotlinClassAbstractProperty() {
     private fun test() {
         isVisible = true
     }
-}
+}
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/detectProperties/AnonymousClass.kt b/nj2k/testData/newJ2k/detectProperties/AnonymousClass.kt
index 34ab7e7e816..3e19d72ce03 100644
--- a/nj2k/testData/newJ2k/detectProperties/AnonymousClass.kt
+++ b/nj2k/testData/newJ2k/detectProperties/AnonymousClass.kt
@@ -1,11 +1,10 @@
 class X {
     internal fun foo() {
         val runnable: Runnable = object : Runnable {
-            val value = 10
-
+            var value = 10
             override fun run() {
                 println(value)
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/detectProperties/AssignFieldInsideSetter2.kt b/nj2k/testData/newJ2k/detectProperties/AssignFieldInsideSetter2.kt
index 89cf9e8335e..d7231027588 100644
--- a/nj2k/testData/newJ2k/detectProperties/AssignFieldInsideSetter2.kt
+++ b/nj2k/testData/newJ2k/detectProperties/AssignFieldInsideSetter2.kt
@@ -1,12 +1,16 @@
 class C {
-    var x = ""
-        internal
-        set(x) {
-            println("setter invoked")
-            if (other != null) {
-                other!!.x = x
-            }
-            field = x
-        }
+    private var x = ""
     internal var other: C? = null
-}
\ No newline at end of file
+
+    fun getX(): String {
+        return x
+    }
+
+    internal fun setX(x: String) {
+        println("setter invoked")
+        if (other != null) {
+            other!!.x = x
+        }
+        this.x = x
+    }
+}
diff --git a/nj2k/testData/newJ2k/detectProperties/Comments.kt b/nj2k/testData/newJ2k/detectProperties/Comments.kt
index e761c61a339..fd5b2ce2087 100644
--- a/nj2k/testData/newJ2k/detectProperties/Comments.kt
+++ b/nj2k/testData/newJ2k/detectProperties/Comments.kt
@@ -1,23 +1,25 @@
-internal class A(// comment for field2 getter
-        // comment for field2 setter
-        var field2: Int // comment for field2
-) {
-    // Comment for field1
-    // Comment for field1 getter
+internal class A(// comment for field2 setter
+        // comment for field2 getter
+        // comment for field2
+        var field2: Int) {
     /**
      * Comment for field1 setter
      */
+    // Comment for field1 getter
+    // Comment for field1
     var field1 = 0
 
-    // comment before field3
-    var field3 = 0 // comment for field3
-    // comment for field3 getter
     // comment for field3 setter
+    // comment for field3 getter
+    // comment before field3
+    var field3 // comment for field3
+            = 0
 
-    // comment for getProperty
     // comment for setProperty
+    // end of setProperty
+    // comment for getProperty
+    // end of getProperty
     var property: Int
         get() = 1
-        set(value) {} // end of getProperty
-    // end of setProperty
+        set(value) {}
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/detectProperties/DataClass.kt b/nj2k/testData/newJ2k/detectProperties/DataClass.kt
index 4af7c675759..4d7ddfbec5f 100644
--- a/nj2k/testData/newJ2k/detectProperties/DataClass.kt
+++ b/nj2k/testData/newJ2k/detectProperties/DataClass.kt
@@ -1,6 +1,5 @@
 class Test(var id: String, val name: String, val age: Int) {
-
     init {
         println(age)
     }
-}
+}
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/detectProperties/DataClassWithAnnotations.java b/nj2k/testData/newJ2k/detectProperties/DataClassWithAnnotations.java
index b649308913e..d2b54cc8804 100644
--- a/nj2k/testData/newJ2k/detectProperties/DataClassWithAnnotations.java
+++ b/nj2k/testData/newJ2k/detectProperties/DataClassWithAnnotations.java
@@ -1,20 +1,23 @@
-@interface TestAnnotation {
-}
+@interface TestAnnotationField {}
+@interface TestAnnotationParam {}
+@interface TestAnnotationGet {}
+@interface TestAnnotationSet {}
+
 
 public class Test {
-    @TestAnnotation
+    @TestAnnotationField
     private String arg;
 
-    public Test(@TestAnnotation String arg) {
+    public Test(@TestAnnotationParam String arg) {
         this.arg = arg;
     }
 
-    @TestAnnotation
+    @TestAnnotationGet
     public String getArg() {
         return arg;
     }
 
-    @TestAnnotation
+    @TestAnnotationSet
     public void setArg(String arg) {
         this.arg = arg;
     }
diff --git a/nj2k/testData/newJ2k/detectProperties/DataClassWithAnnotations.kt b/nj2k/testData/newJ2k/detectProperties/DataClassWithAnnotations.kt
index 4b7777fa515..5b813d10987 100644
--- a/nj2k/testData/newJ2k/detectProperties/DataClassWithAnnotations.kt
+++ b/nj2k/testData/newJ2k/detectProperties/DataClassWithAnnotations.kt
@@ -1,3 +1,7 @@
-internal annotation class TestAnnotation
-
-class Test(@field:TestAnnotation @set:TestAnnotation @get:TestAnnotation @param:TestAnnotation var arg: String)
\ No newline at end of file
+internal annotation class TestAnnotationField
+internal annotation class TestAnnotationParam
+internal annotation class TestAnnotationGet
+internal annotation class TestAnnotationSet
+class Test(@field:TestAnnotationField @set:TestAnnotationSet
+           @get:TestAnnotationGet
+           @param:TestAnnotationParam var arg: String)
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/detectProperties/DataClassWithMutableField.kt b/nj2k/testData/newJ2k/detectProperties/DataClassWithMutableField.kt
index 2a28f153689..e1b933a129f 100644
--- a/nj2k/testData/newJ2k/detectProperties/DataClassWithMutableField.kt
+++ b/nj2k/testData/newJ2k/detectProperties/DataClassWithMutableField.kt
@@ -7,6 +7,6 @@ class Test(count: Int) {
     }
 
     fun inc() {
-        count++
+        this.count++
     }
 }
diff --git a/nj2k/testData/newJ2k/detectProperties/DifferentFieldNameAndSuperClass.kt b/nj2k/testData/newJ2k/detectProperties/DifferentFieldNameAndSuperClass.kt
index 9729ae9a5ba..4f4367c2530 100644
--- a/nj2k/testData/newJ2k/detectProperties/DifferentFieldNameAndSuperClass.kt
+++ b/nj2k/testData/newJ2k/detectProperties/DifferentFieldNameAndSuperClass.kt
@@ -1,2 +1,9 @@
-open class Base internal constructor(val x: Int)
-internal class Derived(b: Base) : Base(b.x)
\ No newline at end of file
+open class Base internal constructor(x: Int) {
+    var x = 42
+
+    init {
+        this.x = x
+    }
+}
+
+internal class Derived(b: Base) : Base(b.x)
diff --git a/nj2k/testData/newJ2k/detectProperties/FieldUsagesInFactoryMethods.kt b/nj2k/testData/newJ2k/detectProperties/FieldUsagesInFactoryMethods.kt
index 0edba186137..e0f244ee9cf 100644
--- a/nj2k/testData/newJ2k/detectProperties/FieldUsagesInFactoryMethods.kt
+++ b/nj2k/testData/newJ2k/detectProperties/FieldUsagesInFactoryMethods.kt
@@ -1,5 +1,5 @@
 internal class C(val arg1: Int) {
-    val arg2: Int
+    var arg2: Int
     var arg3: Int
 
     constructor(arg1: Int, arg2: Int, arg3: Int) : this(arg1) {
@@ -16,4 +16,5 @@ internal class C(val arg1: Int) {
         arg2 = 0
         arg3 = 0
     }
-}
+
+}
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect2.kt b/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect2.kt
index fd71d6209f9..1f29f00e24a 100644
--- a/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect2.kt
+++ b/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect2.kt
@@ -13,4 +13,4 @@ class C {
     internal fun foo() {
         println("x = $x")
     }
-}
+}
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/detectProperties/InInterface.kt b/nj2k/testData/newJ2k/detectProperties/InInterface.kt
index a93678eb26c..149b9cac50b 100644
--- a/nj2k/testData/newJ2k/detectProperties/InInterface.kt
+++ b/nj2k/testData/newJ2k/detectProperties/InInterface.kt
@@ -6,4 +6,4 @@ internal interface I {
     fun setSomething4(value: String?)
     val something5: Int
     fun setSomething5(value: Int): Int
-}
+}
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/detectProperties/IsPrefix.kt b/nj2k/testData/newJ2k/detectProperties/IsPrefix.kt
index 75c4d66ce05..c163da19458 100644
--- a/nj2k/testData/newJ2k/detectProperties/IsPrefix.kt
+++ b/nj2k/testData/newJ2k/detectProperties/IsPrefix.kt
@@ -1,18 +1,13 @@
-// ERROR: Property must be initialized
-// ERROR: Property must be initialized
-// ERROR: Property must be initialized
 internal interface I {
     val isSomething1: Boolean
-
     val isSomething2: Boolean?
-
     val isSomething3: Int
-
-    var isSomething4: Boolean
-
-    var isSomething5: Boolean
-
-    var something6: Boolean
+    fun isSomething4(): Boolean
+    fun setSomething4(value: Boolean)
+    fun isSomething5(): Boolean
+    fun setSomething5(value: Boolean)
+    fun getSomething6(): Boolean
+    fun setSomething6(value: Boolean)
 }
 
 internal abstract class C : I {
@@ -20,15 +15,10 @@ internal abstract class C : I {
         get() = true
         set(b) {}
 
-    override var isSomething4: Boolean
-        get() = false
-        set
+    override fun isSomething4(): Boolean {
+        return false
+    }
 
-    override var isSomething5: Boolean
-        get
-        set(value) {}
-
-    override var something6: Boolean
-        get
-        set(value) {}
+    override fun setSomething5(value: Boolean) {}
+    override fun setSomething6(value: Boolean) {}
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/detectProperties/Overrides.kt b/nj2k/testData/newJ2k/detectProperties/Overrides.kt
index e7a942b2e66..b768899e80d 100644
--- a/nj2k/testData/newJ2k/detectProperties/Overrides.kt
+++ b/nj2k/testData/newJ2k/detectProperties/Overrides.kt
@@ -1,23 +1,17 @@
-// ERROR: Property must be initialized
-// ERROR: Property must be initialized
 internal interface I {
     val something1: Int
-
     val something2: Int
-
     var something3: Int
-
-    var something4: Int
-
-    var something5: Int
-
+    fun getSomething4(): Int
+    fun setSomething4(value: Int)
+    fun getSomething5(): Int
+    fun setSomething5(value: Int)
     fun setSomething6(value: Int)
 }
 
 internal interface I1 : I {
-
-    val something6: Int
     fun setSomething1(value: Int)
+    val something6: Int
 }
 
 internal open class B {
@@ -40,7 +34,7 @@ internal open class B {
 }
 
 internal abstract class C(override val something1: Int) : B(), I {
-    private var mySomething6: Int = 0
+    private var mySomething6 = 0
 
     override val something2: Int
         get() = 0
@@ -49,15 +43,18 @@ internal abstract class C(override val something1: Int) : B(), I {
         get() = 0
         set(value) {}
 
-    override var something4: Int
-        get() = 0
-        set
+    override fun getSomething4(): Int {
+        return 0
+    }
 
-    override var something5: Int
-        get
-        set(value) {
+    override fun setSomething5(value: Int) {}
+    fun getSomething6(): Int {
+        return mySomething6
+    }
 
-        }
+    override fun setSomething6(value: Int) {
+        mySomething6 = value
+    }
 
     override val fromB1: String
         get() = super.fromB1
@@ -70,8 +67,8 @@ internal abstract class C(override val something1: Int) : B(), I {
 
     override var fromB3: String
         get() = super.fromB3
-        set(value: String) {
-            super.fromB3 = value
+        set(fromB3) {
+            super.fromB3 = fromB3
         }
 
     override var fromB4: String
@@ -80,18 +77,11 @@ internal abstract class C(override val something1: Int) : B(), I {
             super.fromB4 = value
         }
 
-    val fromB5: String
-        get() = ""
-
-    fun getSomething6(): Int {
-        return mySomething6
-    }
-
-    override fun setSomething6(value: Int) {
-        mySomething6 = value
+    fun getFromB5(): String {
+        return ""
     }
 
     override fun setFromB5(value: String) {
         super.setFromB5(value)
     }
-}
+}
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/detectProperties/OverridesOfExternalCode.kt b/nj2k/testData/newJ2k/detectProperties/OverridesOfExternalCode.kt
index 8a36f23bfaa..76ba4b495c7 100644
--- a/nj2k/testData/newJ2k/detectProperties/OverridesOfExternalCode.kt
+++ b/nj2k/testData/newJ2k/detectProperties/OverridesOfExternalCode.kt
@@ -1,6 +1,6 @@
-import kotlinApi.KotlinClassWithProperties
-import javaApi.JavaClassWithProperties
 import javaApi.JavaClassDerivedFromKotlinClassWithProperties
+import javaApi.JavaClassWithProperties
+import kotlinApi.KotlinClassWithProperties
 
 internal open class A : KotlinClassWithProperties() {
     override var someVar1: String
@@ -11,8 +11,8 @@ internal open class A : KotlinClassWithProperties() {
 
     override var someVar2: String
         get() = super.someVar2
-        set(value: String) {
-            super.someVar2 = value
+        set(someVar2) {
+            super.someVar2 = someVar2
         }
 
     override var someVar3: String
@@ -23,8 +23,8 @@ internal open class A : KotlinClassWithProperties() {
 
     override var someVar4: String
         get() = super.someVar4
-        set(value: String) {
-            super.someVar4 = value
+        set(someVar4) {
+            super.someVar4 = someVar4
         }
 
     override val someVal: String
@@ -76,19 +76,17 @@ internal class B : JavaClassWithProperties() {
 internal class C : A() {
     override var someVar1: String
         get() = super.someVar1
-        set(value: String) {
-            super.someVar1 = value
+        set(someVar1) {
+            super.someVar1 = someVar1
         }
 }
 
 internal class D : JavaClassDerivedFromKotlinClassWithProperties() {
-    override var someVar1: String
-        get() = "a"
-        set(value: String) {
-            super.someVar1 = value
-        }
+    override fun getSomeVar1(): String? {
+        return "a"
+    }
 
-    override var someVar2: String
+    override var someVar2: String?
         get() = super.someVar2
         set(value) {}
 
diff --git a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect3.kt b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect3.kt
index 282742f6f79..3f0265232b3 100644
--- a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect3.kt
+++ b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect3.kt
@@ -1,11 +1,11 @@
 class C {
-    protected var x: String? = ""
+    protected var x = ""
 
-    fun getX(): String? {
+    fun getX(): String {
         return x
     }
 
-    fun setX(x: String?) {
+    fun setX(x: String) {
         println("setter invoked")
         this.x = x
     }
diff --git a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect5.kt b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect5.kt
index 82005503a40..a2adae89393 100644
--- a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect5.kt
+++ b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect5.kt
@@ -4,4 +4,4 @@ class C {
             println("setter invoked")
             field = x
         }
-}
+}
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/enum/primaryPrivateConstructor.java b/nj2k/testData/newJ2k/enum/primaryPrivateConstructor.java
index c9d3583c317..845e2ff0dac 100644
--- a/nj2k/testData/newJ2k/enum/primaryPrivateConstructor.java
+++ b/nj2k/testData/newJ2k/enum/primaryPrivateConstructor.java
@@ -2,12 +2,13 @@
 package demo;
 
 enum Color {
- private int code;
+    private int code;
 
- private Color(int c) {
-   code = c;
- }
+    private Color(int c) {
+        code = c;
+    }
 
- public int getCode() {
-   return code;
- }
\ No newline at end of file
+    public int getCode() {
+        return code;
+    }
+}
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/function/extendsBaseWhichExtendsObject.kt b/nj2k/testData/newJ2k/function/extendsBaseWhichExtendsObject.kt
index e9befb48f85..c2b45e1516e 100644
--- a/nj2k/testData/newJ2k/function/extendsBaseWhichExtendsObject.kt
+++ b/nj2k/testData/newJ2k/function/extendsBaseWhichExtendsObject.kt
@@ -1,6 +1,6 @@
 // ERROR: Unresolved reference: clone
 // ERROR: Unresolved reference: finalize
-internal class Test : Base(), Cloneable {
+internal class Test : Base() {
     override fun hashCode(): Int {
         return super.hashCode()
     }
@@ -43,7 +43,7 @@ internal open class Base : Cloneable {
     }
 
     @Throws(Throwable::class)
-    protected open fun finalize() {
+    protected override fun finalize() {
         super.finalize()
     }
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/function/overrideObject.kt b/nj2k/testData/newJ2k/function/overrideObject.kt
index 6940c30c9f2..f6859681cce 100644
--- a/nj2k/testData/newJ2k/function/overrideObject.kt
+++ b/nj2k/testData/newJ2k/function/overrideObject.kt
@@ -17,7 +17,7 @@ internal class X : Cloneable {
     }
 }
 
-internal class Y : Thread(), Cloneable {
+internal class Y : Thread() {
     @Throws(CloneNotSupportedException::class)
     override fun clone(): Any {
         return super.clone()
diff --git a/nj2k/testData/newJ2k/function/varVararg.kt b/nj2k/testData/newJ2k/function/varVararg.kt
index 3c9c25ec025..4a87cdc05e2 100644
--- a/nj2k/testData/newJ2k/function/varVararg.kt
+++ b/nj2k/testData/newJ2k/function/varVararg.kt
@@ -1,7 +1,7 @@
 package demo
 
 internal class Test {
-    fun test(vararg args: Any?) {
+    fun test(vararg args: Any) {
         var args = args
         args = arrayOf(1, 2, 3)
     }
diff --git a/nj2k/testData/newJ2k/issues/kt-1048.kt b/nj2k/testData/newJ2k/issues/kt-1048.kt
index 0722e9e63cc..1db71aef218 100644
--- a/nj2k/testData/newJ2k/issues/kt-1048.kt
+++ b/nj2k/testData/newJ2k/issues/kt-1048.kt
@@ -1,17 +1,14 @@
-// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : Any!, V : Any!>() Please specify it explicitly.
-// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : Any!, V : Any!>() Please specify it explicitly.
-import java.util.HashMap
-
-internal class G<T : String>(t: T)
-
+// ERROR: The integer literal does not conform to the expected type CapturedType(*)
+// ERROR: The integer literal does not conform to the expected type CapturedType(*)
+internal class G<T : String?>(t: T?)
 class Java {
     internal fun test() {
-        val m = HashMap()
-        m.put(1, 1)
+        val m: HashMap<*, *> = HashMap<Any?, Any?>()
+        m[1] = 1
     }
 
     internal fun test2() {
-        val m = HashMap()
+        val m: HashMap<*, *> = HashMap<Any?, Any?>()
         val g = G("")
         val g2 = G("")
     }
diff --git a/nj2k/testData/newJ2k/issues/kt-794.kt b/nj2k/testData/newJ2k/issues/kt-794.kt
index 92b6418c974..08212a3ec06 100644
--- a/nj2k/testData/newJ2k/issues/kt-794.kt
+++ b/nj2k/testData/newJ2k/issues/kt-794.kt
@@ -1,7 +1,4 @@
 internal class Test {
     val int: Int
-        get() {
-            val b: Byte = 10
-            return b.toInt()
-        }
+        get() = 10
 }
\ 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 691474add09..eb216f695a1 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 ignoreTestAnnotationFromConstructorParamToProperty() throws Exception {
+        public void testAnnotationFromConstructorParamToProperty() throws Exception {
             runTest("nj2k/testData/newJ2k/annotations/annotationFromConstructorParamToProperty.java");
         }
 
@@ -67,7 +67,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("annotationInterface3.java")
-        public void ignoreTestAnnotationInterface3() throws Exception {
+        public void testAnnotationInterface3() throws Exception {
             runTest("nj2k/testData/newJ2k/annotations/annotationInterface3.java");
         }
 
@@ -150,7 +150,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("oneStaticAnonBlock.java")
-        public void ignoreTestOneStaticAnonBlock() throws Exception {
+        public void testOneStaticAnonBlock() throws Exception {
             runTest("nj2k/testData/newJ2k/anonymousBlock/oneStaticAnonBlock.java");
         }
     }
@@ -632,7 +632,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("Boxing.java")
-        public void ignoreTestBoxing() throws Exception {
+        public void testBoxing() throws Exception {
             runTest("nj2k/testData/newJ2k/boxedType/Boxing.java");
         }
 
@@ -662,7 +662,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("kt-671.java")
-        public void ignoreTestKt_671() throws Exception {
+        public void testKt_671() throws Exception {
             runTest("nj2k/testData/newJ2k/boxedType/kt-671.java");
         }
 
@@ -982,7 +982,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("commentInsideCall.java")
-        public void ignoreTestCommentInsideCall() throws Exception {
+        public void testCommentInsideCall() throws Exception {
             runTest("nj2k/testData/newJ2k/comments/commentInsideCall.java");
         }
 
@@ -997,7 +997,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("commentsForConstructors.java")
-        public void ignoreTestCommentsForConstructors() throws Exception {
+        public void testCommentsForConstructors() throws Exception {
             runTest("nj2k/testData/newJ2k/comments/commentsForConstructors.java");
         }
 
@@ -1007,12 +1007,12 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("fieldsInitializedFromParams.java")
-        public void ignoreTestFieldsInitializedFromParams() throws Exception {
+        public void testFieldsInitializedFromParams() throws Exception {
             runTest("nj2k/testData/newJ2k/comments/fieldsInitializedFromParams.java");
         }
 
         @TestMetadata("removeNoInspectionComment.java")
-        public void ignoreTestRemoveNoInspectionComment() throws Exception {
+        public void testRemoveNoInspectionComment() throws Exception {
             runTest("nj2k/testData/newJ2k/comments/removeNoInspectionComment.java");
         }
     }
@@ -1128,7 +1128,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("fieldsInitializedFromParamsAnnotations.java")
-        public void ignoreTestFieldsInitializedFromParamsAnnotations() throws Exception {
+        public void testFieldsInitializedFromParamsAnnotations() throws Exception {
             runTest("nj2k/testData/newJ2k/constructors/fieldsInitializedFromParamsAnnotations.java");
         }
 
@@ -1372,7 +1372,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("Comments.java")
-        public void ignoreTestComments() throws Exception {
+        public void testComments() throws Exception {
             runTest("nj2k/testData/newJ2k/detectProperties/Comments.java");
         }
 
@@ -1387,7 +1387,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("DataClassWithAnnotations.java")
-        public void ignoreTestDataClassWithAnnotations() throws Exception {
+        public void testDataClassWithAnnotations() throws Exception {
             runTest("nj2k/testData/newJ2k/detectProperties/DataClassWithAnnotations.java");
         }
 
@@ -1502,7 +1502,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("IsPrefix.java")
-        public void ignoreTestIsPrefix() throws Exception {
+        public void testIsPrefix() throws Exception {
             runTest("nj2k/testData/newJ2k/detectProperties/IsPrefix.java");
         }
 
@@ -1522,12 +1522,12 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("Overrides.java")
-        public void ignoreTestOverrides() throws Exception {
+        public void testOverrides() throws Exception {
             runTest("nj2k/testData/newJ2k/detectProperties/Overrides.java");
         }
 
         @TestMetadata("OverridesOfExternalCode.java")
-        public void ignoreTestOverridesOfExternalCode() throws Exception {
+        public void testOverridesOfExternalCode() throws Exception {
             runTest("nj2k/testData/newJ2k/detectProperties/OverridesOfExternalCode.java");
         }
 
@@ -1557,7 +1557,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("SetterWithSideEffect3.java")
-        public void ignoreTestSetterWithSideEffect3() throws Exception {
+        public void testSetterWithSideEffect3() throws Exception {
             runTest("nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect3.java");
         }
 
@@ -1741,7 +1741,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("enumConstantIsNotNull.java")
-        public void ignoreTestEnumConstantIsNotNull() throws Exception {
+        public void testEnumConstantIsNotNull() throws Exception {
             runTest("nj2k/testData/newJ2k/enum/enumConstantIsNotNull.java");
         }
 
@@ -1902,7 +1902,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("valOrVar.java")
-        public void ignoreTestValOrVar() throws Exception {
+        public void testValOrVar() throws Exception {
             runTest("nj2k/testData/newJ2k/field/valOrVar.java");
         }
 
@@ -2231,7 +2231,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("nonStaticMembersWithComments.java")
-        public void ignoreTestNonStaticMembersWithComments() throws Exception {
+        public void testNonStaticMembersWithComments() throws Exception {
             runTest("nj2k/testData/newJ2k/formatting/nonStaticMembersWithComments.java");
         }
 
@@ -2241,7 +2241,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("staticAndNonStaticMembersWithComments.java")
-        public void ignoreTestStaticAndNonStaticMembersWithComments() throws Exception {
+        public void testStaticAndNonStaticMembersWithComments() throws Exception {
             runTest("nj2k/testData/newJ2k/formatting/staticAndNonStaticMembersWithComments.java");
         }
 
@@ -2260,7 +2260,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("abstractMethod.java")
-        public void ignoreTestAbstractMethod() throws Exception {
+        public void testAbstractMethod() throws Exception {
             runTest("nj2k/testData/newJ2k/function/abstractMethod.java");
         }
 
@@ -2354,7 +2354,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("nativeMethods.java")
-        public void ignoreTestNativeMethods() throws Exception {
+        public void testNativeMethods() throws Exception {
             runTest("nj2k/testData/newJ2k/function/nativeMethods.java");
         }
 
@@ -2434,7 +2434,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("varVararg.java")
-        public void ignoreTestVarVararg() throws Exception {
+        public void testVarVararg() throws Exception {
             runTest("nj2k/testData/newJ2k/function/varVararg.java");
         }
     }
@@ -2642,7 +2642,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("comments.java")
-        public void ignoreTestComments() throws Exception {
+        public void testComments() throws Exception {
             runTest("nj2k/testData/newJ2k/issues/comments.java");
         }
 
@@ -2657,7 +2657,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("kt-1048.java")
-        public void ignoreTestKt_1048() throws Exception {
+        public void testKt_1048() throws Exception {
             runTest("nj2k/testData/newJ2k/issues/kt-1048.java");
         }
 
@@ -2727,7 +2727,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("kt-792.java")
-        public void ignoreTestKt_792() throws Exception {
+        public void testKt_792() throws Exception {
             runTest("nj2k/testData/newJ2k/issues/kt-792.java");
         }
 
@@ -2737,7 +2737,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("kt-794.java")
-        public void ignoreTestKt_794() throws Exception {
+        public void testKt_794() throws Exception {
             runTest("nj2k/testData/newJ2k/issues/kt-794.java");
         }
 
@@ -2857,7 +2857,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("unfinishedReferenceExpression.java")
-        public void ignoreTestUnfinishedReferenceExpression() throws Exception {
+        public void testUnfinishedReferenceExpression() throws Exception {
             runTest("nj2k/testData/newJ2k/issues/unfinishedReferenceExpression.java");
         }
     }
@@ -3084,7 +3084,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("octal.java")
-        public void ignoreTestOctal() throws Exception {
+        public void testOctal() throws Exception {
             runTest("nj2k/testData/newJ2k/literalExpression/octal.java");
         }
 
@@ -3215,7 +3215,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("stringMethods.java")
-        public void ignoreTestStringMethods() throws Exception {
+        public void testStringMethods() throws Exception {
             runTest("nj2k/testData/newJ2k/methodCallExpression/stringMethods.java");
         }
 
@@ -3384,7 +3384,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("newAnonymousClass.java")
-        public void ignoreTestNewAnonymousClass() throws Exception {
+        public void testNewAnonymousClass() throws Exception {
             runTest("nj2k/testData/newJ2k/newClassExpression/newAnonymousClass.java");
         }
 
@@ -3512,7 +3512,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("MethodResultInitializesNullableField.java")
-        public void ignoreTestMethodResultInitializesNullableField() throws Exception {
+        public void testMethodResultInitializesNullableField() throws Exception {
             runTest("nj2k/testData/newJ2k/nullability/MethodResultInitializesNullableField.java");
         }
 
@@ -3649,7 +3649,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("AccessorToDrop.java")
-        public void ignoreTestAccessorToDrop() throws Exception {
+        public void testAccessorToDrop() throws Exception {
             runTest("nj2k/testData/newJ2k/overloads/AccessorToDrop.java");
         }
 
@@ -3780,7 +3780,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("AnonymousObject.java")
-        public void ignoreTestAnonymousObject() throws Exception {
+        public void testAnonymousObject() throws Exception {
             runTest("nj2k/testData/newJ2k/postProcessing/AnonymousObject.java");
         }
 
@@ -3795,7 +3795,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("IfToElvis.java")
-        public void ignoreTestIfToElvis() throws Exception {
+        public void testIfToElvis() throws Exception {
             runTest("nj2k/testData/newJ2k/postProcessing/IfToElvis.java");
         }
 
@@ -3805,7 +3805,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         }
 
         @TestMetadata("java8MapForEachWithFullJdk.java")
-        public void ignoreTestJava8MapForEachWithFullJdk() throws Exception {
+        public void testJava8MapForEachWithFullJdk() throws Exception {
             runTest("j2k/testData/fileOrElement/postProcessing/java8MapForEachWithFullJdk.java");
         }