diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/comments.kt b/plugins/kapt3/kapt3-compiler/testData/converter/comments.kt
index 5419e8a5e58..1a7ac54de55 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/comments.kt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/comments.kt
@@ -11,7 +11,7 @@ class Test {
     fun method(a: String) {}
 
     /** prop. */
-    val prop: String = ""
+    const val prop: String = ""
 
     /** prop2. */
     @Anno
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt b/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt
index 026e636ae83..919c8c5ca17 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt
@@ -56,13 +56,13 @@ public final class Test {
      * prop.
      */
     @org.jetbrains.annotations.NotNull()
-    private final java.lang.String prop = "";
+    public final java.lang.String prop = "";
 
     /**
      * prop2.
      */
     @org.jetbrains.annotations.NotNull()
-    private final java.lang.String prop2 = "";
+    private final java.lang.String prop2 = null;
 
     /**
      * method().
@@ -83,11 +83,6 @@ public final class Test {
     java.lang.String a) {
     }
 
-    @org.jetbrains.annotations.NotNull()
-    public final java.lang.String getProp() {
-        return null;
-    }
-
     @Anno()
     public static void prop2$annotations() {
     }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt
index 7d77c0ee665..c1946ddb44e 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt
@@ -21,7 +21,7 @@ public abstract interface Intf {
 
     @kotlin.Metadata()
     public static final class Companion {
-        private static final int BLACK = 1;
+        private static final int BLACK = 0;
         public static final int WHITE = 2;
 
         public final int getBLACK() {
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/fileFacadeJvmName.kt b/plugins/kapt3/kapt3-compiler/testData/converter/fileFacadeJvmName.kt
index 759d547a637..998dabbd6e7 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/fileFacadeJvmName.kt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/fileFacadeJvmName.kt
@@ -5,4 +5,4 @@ package a.b.c
 
 fun foo() {}
 
-val bar = 3
\ No newline at end of file
+const val bar = 3
\ No newline at end of file
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/fileFacadeJvmName.txt b/plugins/kapt3/kapt3-compiler/testData/converter/fileFacadeJvmName.txt
index 0d794c32fab..7d6df94c44b 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/fileFacadeJvmName.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/fileFacadeJvmName.txt
@@ -8,12 +8,8 @@ public final class FacadeName {
     public FacadeName() {
         super();
     }
-    private static final int bar = 3;
+    public static final int bar = 3;
 
     public static final void foo() {
     }
-
-    public static final int getBar() {
-        return 0;
-    }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.kt b/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.kt
index c3568428905..301150261e0 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.kt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.kt
@@ -5,7 +5,7 @@ class Test {
     fun ignoredFun() {}
 
     @KaptIgnored @get:KaptIgnored
-    val ignoredProperty: String = ""
+    const val ignoredProperty: String = ""
 
     fun nonIgnoredFun() {}
 
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt
index c109935d67b..dc8a43e7bf2 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt
@@ -3,9 +3,9 @@ import java.lang.System;
 @kotlin.Metadata()
 public final class Test {
     @org.jetbrains.annotations.NotNull()
-    private final java.lang.String ignoredProperty = "";
+    public final java.lang.String ignoredProperty = "";
     @org.jetbrains.annotations.NotNull()
-    private final java.lang.String nonIgnoredProperty = "";
+    private final java.lang.String nonIgnoredProperty = null;
 
     public final void nonIgnoredFun() {
     }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.kt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.kt
index 001c0ed76a1..b6dccdb66f5 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.kt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.kt
@@ -3,11 +3,11 @@ class JvmStaticTest {
         @JvmStatic
         val one = 1
 
-        val two = 2
+        const val two = 2
 
         const val c: Char = 'C'
     }
 
-    val three: Byte = 3.toByte()
-    val d: Char = 'D'
+    const val three: Byte = 3.toByte()
+    const val d: Char = 'D'
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt
index 62bccab71ae..ef5ca87e84d 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt
@@ -2,21 +2,13 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class JvmStaticTest {
-    private final byte three = (byte)3;
-    private final char d = 'D';
-    private static final int one = 1;
-    private static final int two = 2;
+    public final byte three = (byte)3;
+    public final char d = 'D';
+    private static final int one = 0;
+    public static final int two = 2;
     public static final char c = 'C';
     public static final JvmStaticTest.Companion Companion = null;
 
-    public final byte getThree() {
-        return 0;
-    }
-
-    public final char getD() {
-        return '\u0000';
-    }
-
     public JvmStaticTest() {
         super();
     }
@@ -35,10 +27,6 @@ public final class JvmStaticTest {
             return 0;
         }
 
-        public final int getTwo() {
-            return 0;
-        }
-
         private Companion() {
             super();
         }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt
index 07e90091af6..724afb5006f 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt
@@ -3,7 +3,7 @@ import java.lang.System;
 @kotlin.Metadata()
 public final class Test {
     @org.jetbrains.annotations.NotNull()
-    private static final java.lang.String test = "";
+    private static final java.lang.String test = null;
     public static final Test.A A = null;
 
     public Test() {
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt b/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt
index 73e9d91ae0d..e4bddbd527c 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt
@@ -2,7 +2,7 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class CrashMe {
-    private final int resources = 1;
+    private final int resources = 0;
 
     public final int getResources() {
         return 0;
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt
index 3ba828dc35e..06a3c57d1e1 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt
@@ -29,7 +29,7 @@ import java.lang.System;
 @kotlin.Metadata()
 public final class Modifiers {
     @org.jetbrains.annotations.NotNull()
-    private final transient java.lang.String transientField = "";
+    private final transient java.lang.String transientField = null;
     @org.jetbrains.annotations.NotNull()
     private volatile java.lang.String volatileField;
 
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt
index 47115b22c55..8dbe0fef30e 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt
@@ -87,7 +87,7 @@ public final class Test<G extends java.lang.Object> {
     @org.jetbrains.annotations.NotNull()
     private final java.lang.Object m = null;
     @org.jetbrains.annotations.NotNull()
-    private final java.lang.String n = "";
+    private final java.lang.String n = null;
     @org.jetbrains.annotations.NotNull()
     public java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends error.NonExistentClass>>>>>>>>>> o11;
     @org.jetbrains.annotations.NotNull()
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt b/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt
index ea84001dfe8..a29b48cfc4b 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt
@@ -25,7 +25,7 @@ import java.lang.System;
 @kotlin.Metadata()
 public final class Test {
     @org.jetbrains.annotations.NotNull()
-    private final java.lang.String prop = "A";
+    private final java.lang.String prop = null;
 
     @Anno2()
     @Anno()
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt b/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt
index 2779b066bb0..4f5a6acadb1 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt
@@ -184,7 +184,7 @@ import java.lang.System;
 @kotlin.Metadata()
 public final class Test {
     @org.jetbrains.annotations.NotNull()
-    private final java.lang.String value = "";
+    private final java.lang.String value = null;
 
     @lib.Anno(value = "3", construct = {"C"})
     @lib.Anno(value = "2", construct = {"A", "B"})
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.kt b/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.kt
index cc8c37b980b..e83faceadc3 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.kt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.kt
@@ -10,6 +10,8 @@ fun <X : CharSequence, T : List<out X>> topLevelGenericFunction(): T? {
 
 val topLevelProperty = 2
 
+const val topLevelConstProperty = 2
+
 val topLevelProperty2: String
     get() = ""
 
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.txt b/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.txt
index 80af641c135..bcd6097428f 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.txt
@@ -21,7 +21,8 @@ public final class TopLevelKt {
     public TopLevelKt() {
         super();
     }
-    private static final int topLevelProperty = 2;
+    private static final int topLevelProperty = 0;
+    public static final int topLevelConstProperty = 2;
 
     @org.jetbrains.annotations.Nullable()
     public static final java.lang.String topLevelFunction() {