diff --git a/compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.java b/compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.java
index 91714789fa3..d85c88c6055 100644
--- a/compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.java
+++ b/compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.java
@@ -22,11 +22,6 @@ import java.util.ArrayList;
 import jet.runtime.typeinfo.KotlinSignature;
 
 public class PropertyArrayTypes<T> {
-    @KotlinSignature("fun PropertyArrayTypes(genericTypeParam : T)")
-    public PropertyArrayTypes(T genericTypeParam) {
-        // For initializing genericType field in kotlin
-    }
-
     @KotlinSignature("var arrayOfArrays : Array<Array<String>>")
     public String[][] arrayOfArrays;
 
diff --git a/compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.kt b/compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.kt
index 2a8baa3897b..ee6898c1ca3 100644
--- a/compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.kt
+++ b/compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.kt
@@ -2,8 +2,8 @@ package test
 
 import java.util.*
 
-public open class PropertyArrayTypes<T>(p0 : T) : java.lang.Object() {
-  public var arrayOfArrays : Array<Array<String>> = Array<Array<String>>(0, { Array<String>(0, { "" })})
-  public var array : Array<String> = Array<String>(0, { "" })
-  public var genericArray : Array<T> = Array<T>(0, { p0 })
+public open class PropertyArrayTypes<T>() : java.lang.Object() {
+  public var arrayOfArrays : Array<Array<String>> = null!!
+  public var array : Array<String> = null!!
+  public var genericArray : Array<T> = null!!
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.txt b/compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.txt
index 42bf7d809dc..916091ed0b5 100644
--- a/compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.txt
+++ b/compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.txt
@@ -1,7 +1,7 @@
 namespace test
 
 public open class test.PropertyArrayTypes</*0*/ T : jet.Any?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(/*0*/ p0: T): test.PropertyArrayTypes<T>
+    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.PropertyArrayTypes<T>
     public final var array: jet.Array<jet.String>
     public final var arrayOfArrays: jet.Array<jet.Array<jet.String>>
     public final var genericArray: jet.Array<T>
diff --git a/compiler/testData/loadJava/kotlinSignature/PropertyComplexTypes.java b/compiler/testData/loadJava/kotlinSignature/PropertyComplexTypes.java
index 472fd8ade9e..81592c2697f 100644
--- a/compiler/testData/loadJava/kotlinSignature/PropertyComplexTypes.java
+++ b/compiler/testData/loadJava/kotlinSignature/PropertyComplexTypes.java
@@ -22,11 +22,6 @@ import java.util.ArrayList;
 import jet.runtime.typeinfo.KotlinSignature;
 
 public class PropertyComplexTypes<T> {
-    @KotlinSignature("fun PropertyComplexTypes(genericTypeParam : T)")
-    public PropertyComplexTypes(T genericTypeParam) {
-        // For initializing genericType field in kotlin
-    }
-
     @KotlinSignature("var genericType : T")
     public T genericType;
 
diff --git a/compiler/testData/loadJava/kotlinSignature/PropertyComplexTypes.kt b/compiler/testData/loadJava/kotlinSignature/PropertyComplexTypes.kt
index f7f5d8dd4a2..d50a725eb14 100644
--- a/compiler/testData/loadJava/kotlinSignature/PropertyComplexTypes.kt
+++ b/compiler/testData/loadJava/kotlinSignature/PropertyComplexTypes.kt
@@ -2,9 +2,9 @@ package test
 
 import java.util.*
 
-public open class PropertyComplexTypes<T>(p0 : T) : java.lang.Object() {
-  public var genericType : T = p0
-  public var listDefinedGeneric : ArrayList<String> = ArrayList<String>()
-  public var listGeneric : ArrayList<T> = ArrayList<T>()
-  public var listOfGenericList : ArrayList<ArrayList<T>> = ArrayList<ArrayList<T>>()
+public open class PropertyComplexTypes<T>() : java.lang.Object() {
+  public var genericType : T = null!!
+  public var listDefinedGeneric : ArrayList<String> = null!!
+  public var listGeneric : ArrayList<T> = null!!
+  public var listOfGenericList : ArrayList<ArrayList<T>> = null!!
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/PropertyComplexTypes.txt b/compiler/testData/loadJava/kotlinSignature/PropertyComplexTypes.txt
index edcfab88bdd..695e1100f3a 100644
--- a/compiler/testData/loadJava/kotlinSignature/PropertyComplexTypes.txt
+++ b/compiler/testData/loadJava/kotlinSignature/PropertyComplexTypes.txt
@@ -1,7 +1,7 @@
 namespace test
 
 public open class test.PropertyComplexTypes</*0*/ T : jet.Any?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(/*0*/ p0: T): test.PropertyComplexTypes<T>
+    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.PropertyComplexTypes<T>
     public final var genericType: T
     public final var listDefinedGeneric: java.util.ArrayList<jet.String>
     public final var listGeneric: java.util.ArrayList<T>
diff --git a/compiler/testData/loadJava/kotlinSignature/PropertySimpleType.java b/compiler/testData/loadJava/kotlinSignature/PropertySimpleType.java
index ff819edf2fd..cab744f8f6e 100644
--- a/compiler/testData/loadJava/kotlinSignature/PropertySimpleType.java
+++ b/compiler/testData/loadJava/kotlinSignature/PropertySimpleType.java
@@ -20,15 +20,9 @@ import java.lang.String;
 import jet.runtime.typeinfo.KotlinSignature;
 
 public class PropertySimpleType {
-    @KotlinSignature("val publicFieldVal : String")
-    public String publicFieldVal;
+    @KotlinSignature("val fieldOne : String")
+    public String fieldOne;
 
-    @KotlinSignature("var publicFieldVar : String?")
-    public String publicFieldVar;
-
-    @KotlinSignature("var protectedField : String")
-    protected String protectedField;
-
-    @KotlinSignature("var privateField : String")
-    private String privateField;
+    @KotlinSignature("var fieldTwo : String?")
+    public String fieldTwo;
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/PropertySimpleType.kt b/compiler/testData/loadJava/kotlinSignature/PropertySimpleType.kt
index 9b83868f41b..ac258b34506 100644
--- a/compiler/testData/loadJava/kotlinSignature/PropertySimpleType.kt
+++ b/compiler/testData/loadJava/kotlinSignature/PropertySimpleType.kt
@@ -3,7 +3,6 @@ package test
 import java.util.*
 
 public open class PropertySimpleType : java.lang.Object() {
-  public var publicFieldVal : String = ""
-  public var publicFieldVar : String? = null
-  protected var protectedField : String = ""
+  public var fieldOne : String = ""
+  public var fieldTwo : String? = null
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/PropertySimpleType.txt b/compiler/testData/loadJava/kotlinSignature/PropertySimpleType.txt
index 906914c0aa7..cfdcddc949b 100644
--- a/compiler/testData/loadJava/kotlinSignature/PropertySimpleType.txt
+++ b/compiler/testData/loadJava/kotlinSignature/PropertySimpleType.txt
@@ -2,7 +2,6 @@ namespace test
 
 public open class test.PropertySimpleType : java.lang.Object {
     public final /*constructor*/ fun <init>(): test.PropertySimpleType
-    protected final var protectedField: jet.String
-    public final var publicFieldVal: jet.String
-    public final var publicFieldVar: jet.String?
+    public final var fieldOne: jet.String
+    public final var fieldTwo: jet.String?
 }