diff --git a/compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.java b/compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.java
index d25d62fd274..38853051fbd 100644
--- a/compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.java
+++ b/compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.java
@@ -1,4 +1,4 @@
 package test;
 
-abstract class ClassDoesNotOverrideMethod extends java.util.Date {
+public abstract class ClassDoesNotOverrideMethod extends java.util.Date {
 }
diff --git a/compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.kt b/compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.kt
index 6d972517626..51894a75600 100644
--- a/compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.kt
+++ b/compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.kt
@@ -1,4 +1,4 @@
 package test
 
-abstract class ClassDoesNotOverrideMethod() : java.util.Date() {
+public abstract class ClassDoesNotOverrideMethod() : java.util.Date() {
 }
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypeP.java b/compiler/testData/readJavaBinaryClass/ClassWithTypeP.java
index 034f19c4e15..84b2590138b 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypeP.java
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypeP.java
@@ -1,4 +1,4 @@
 package test;
 
-final class ClassWithTypeParameter<P> {
+public final class ClassWithTypeP<P> {
 }
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypeP.kt b/compiler/testData/readJavaBinaryClass/ClassWithTypeP.kt
index d946164581e..6a103ab234c 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypeP.kt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypeP.kt
@@ -1,4 +1,4 @@
 package test
 
-class ClassWithTypeParameter<P>() : java.lang.Object() {
+public class ClassWithTypeP<P>() : java.lang.Object() {
 }
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.java.pen b/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.java.pen
index ddbeb9b8713..8996b9583d3 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.java.pen
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.java.pen
@@ -1,4 +1,4 @@
 package test;
 
-abstract class ClassTypeTypePRefSuper<P> implements java.lang.Iterable<P> {
+public abstract class ClassTypeTypePRefSuper<P> implements java.lang.Iterable<P> {
 }
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt b/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt
index 4c4b5ed2abd..46d39265bf0 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt
@@ -1,4 +1,4 @@
 package test
 
-abstract class ClassTypeTypePRefSuper<P>() : java.lang.Iterable<P> {
+public abstract class ClassTypeTypePRefSuper<P>() : java.lang.Iterable<P> {
 }
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePP.java b/compiler/testData/readJavaBinaryClass/ClassWithTypePP.java
index 20423487a5b..9b7ef884d09 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePP.java
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePP.java
@@ -1,4 +1,4 @@
 package test;
 
-final class ClassWithTypeParameter<P, Q extends P> {
+public final class ClassWithTypePP<P, Q extends P> {
 }
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePP.kt b/compiler/testData/readJavaBinaryClass/ClassWithTypePP.kt
index ddd26e43e70..cedbf9582a8 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePP.kt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePP.kt
@@ -1,4 +1,4 @@
 package test
 
-class ClassWithTypeParameter<P, Q : P>() : java.lang.Object() {
+public class ClassWithTypePP<P, Q : P>() : java.lang.Object() {
 }
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.java b/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.java
index d67172424f7..eb442d948ef 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.java
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.java
@@ -1,7 +1,4 @@
 package test;
 
-interface Foo<Q> {
-}
-
-class ClassWithTypePRefNext<R extends Foo<P>, P> {
+public class ClassWithTypePRefNext<R extends Iterable<P>, P> {
 }
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.kt b/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.kt
index ffe9e5d4f66..f1782800a51 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.kt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.kt
@@ -1,5 +1,3 @@
 package test
 
-trait Foo<Q> : java.lang.Object
-
-open class ClassWithTypePRefNext<R : Foo<P>?, P>() : java.lang.Object()
+public open class ClassWithTypePRefNext<R : java.lang.Iterable<P>?, P>() : java.lang.Object()
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.java b/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.java
index e28acbc31e1..bb70a3c061c 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.java
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.java
@@ -1,4 +1,4 @@
 package test;
 
-final class ClassWithTypePRefSelf<P extends Enum<P>> {
+public final class ClassWithTypePRefSelf<P extends Enum<P>> {
 }
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.kt b/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.kt
index 9c1bf463829..813e8a8a3b6 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.kt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.kt
@@ -1,4 +1,4 @@
 package test
 
-class ClassWithTypePRefSelf<P : java.lang.Enum<P>?>() : java.lang.Object() {
+public class ClassWithTypePRefSelf<P : java.lang.Enum<P>?>() : java.lang.Object() {
 }
diff --git a/compiler/testData/readJavaBinaryClass/FieldAsVar.java b/compiler/testData/readJavaBinaryClass/FieldAsVar.java
index 9c2662efce4..018ec4654f3 100644
--- a/compiler/testData/readJavaBinaryClass/FieldAsVar.java
+++ b/compiler/testData/readJavaBinaryClass/FieldAsVar.java
@@ -1,5 +1,5 @@
 package test;
 
-final class FieldAsVar {
+public final class FieldAsVar {
     public int f;
 }
diff --git a/compiler/testData/readJavaBinaryClass/FieldAsVar.kt b/compiler/testData/readJavaBinaryClass/FieldAsVar.kt
index 90e52807f76..32007528faf 100644
--- a/compiler/testData/readJavaBinaryClass/FieldAsVar.kt
+++ b/compiler/testData/readJavaBinaryClass/FieldAsVar.kt
@@ -1,5 +1,5 @@
 package test
 
-class FieldAsVar() : java.lang.Object() {
-    var f: Int = 1
+public class FieldAsVar() : java.lang.Object() {
+    public var f: Int = 1
 }
diff --git a/compiler/testData/readJavaBinaryClass/FieldOfArrayType.java b/compiler/testData/readJavaBinaryClass/FieldOfArrayType.java
index 1a4e2e78926..2feb0126767 100644
--- a/compiler/testData/readJavaBinaryClass/FieldOfArrayType.java
+++ b/compiler/testData/readJavaBinaryClass/FieldOfArrayType.java
@@ -1,5 +1,5 @@
 package test;
 
-class FieldOfArrayType {
+public class FieldOfArrayType {
     public java.io.File[] files;
 }
diff --git a/compiler/testData/readJavaBinaryClass/FieldOfArrayType.kt b/compiler/testData/readJavaBinaryClass/FieldOfArrayType.kt
index 85a6eb20329..128ae0d364c 100644
--- a/compiler/testData/readJavaBinaryClass/FieldOfArrayType.kt
+++ b/compiler/testData/readJavaBinaryClass/FieldOfArrayType.kt
@@ -1,5 +1,5 @@
 package test
 
-open class FieldOfArrayType() : java.lang.Object() {
-    var files: Array<java.io.File?>? = null
+public open class FieldOfArrayType() : java.lang.Object() {
+    public var files: Array<java.io.File?>? = null
 }
diff --git a/compiler/testData/readJavaBinaryClass/FinalFieldAsVal.java b/compiler/testData/readJavaBinaryClass/FinalFieldAsVal.java
index 69b7785869d..c4620684e11 100644
--- a/compiler/testData/readJavaBinaryClass/FinalFieldAsVal.java
+++ b/compiler/testData/readJavaBinaryClass/FinalFieldAsVal.java
@@ -1,5 +1,5 @@
 package test;
 
-final class FinalFieldAsVal {
+public final class FinalFieldAsVal {
     public final int f = 1;
 }
diff --git a/compiler/testData/readJavaBinaryClass/FinalFieldAsVal.kt b/compiler/testData/readJavaBinaryClass/FinalFieldAsVal.kt
index 23d150df832..a403b845316 100644
--- a/compiler/testData/readJavaBinaryClass/FinalFieldAsVal.kt
+++ b/compiler/testData/readJavaBinaryClass/FinalFieldAsVal.kt
@@ -1,5 +1,5 @@
 package test
 
-class FinalFieldAsVal() : java.lang.Object() {
-    val f: Int = 1
+public class FinalFieldAsVal() : java.lang.Object() {
+    public val f: Int = 1
 }
diff --git a/compiler/testData/readJavaBinaryClass/InnerClass.java b/compiler/testData/readJavaBinaryClass/InnerClass.java
index bc4683aef06..67b051f315a 100644
--- a/compiler/testData/readJavaBinaryClass/InnerClass.java
+++ b/compiler/testData/readJavaBinaryClass/InnerClass.java
@@ -1,6 +1,6 @@
 package test;
 
-class Outer {
-    class Inner {
+public class InnerClass {
+    public class Inner {
     }
 }
diff --git a/compiler/testData/readJavaBinaryClass/InnerClass.kt b/compiler/testData/readJavaBinaryClass/InnerClass.kt
index e068069479d..e84b7cbb586 100644
--- a/compiler/testData/readJavaBinaryClass/InnerClass.kt
+++ b/compiler/testData/readJavaBinaryClass/InnerClass.kt
@@ -1,5 +1,5 @@
 package test
 
-open class Outer() : java.lang.Object() {
-    open class Inner() : java.lang.Object()
+public open class InnerClass() : java.lang.Object() {
+    public open class Inner() : java.lang.Object()
 }
diff --git a/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.java b/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.java
index 1c48f81e45b..cd5fd53a39c 100644
--- a/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.java
+++ b/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.java
@@ -1,6 +1,6 @@
 package test;
 
-class Outer<P> {
-    class Inner<Q extends P> {
+public class InnerClassReferencesOuterTP<P> {
+    public class Inner<Q extends P> {
     }
 }
diff --git a/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.kt b/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.kt
index fc64e600026..231ff1911d3 100644
--- a/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.kt
+++ b/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.kt
@@ -1,5 +1,5 @@
 package test
 
-open class Outer<P>() : java.lang.Object() {
-    open class Inner<Q : P>() : java.lang.Object()
+public open class InnerClassReferencesOuterTP<P>() : java.lang.Object() {
+    public open class Inner<Q : P>() : java.lang.Object()
 }
diff --git a/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.java b/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.java
index f322543204f..fbaf42d2628 100644
--- a/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.java
+++ b/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.java
@@ -1,12 +1,14 @@
 package test;
 
-interface Trait<P> {
-}
+import java.lang.UnsupportedOperationException;
 
-class Outer<P, Q> {
-    class Inner {
+public class InnerClassesInGeneric<P, Q> {
+    public class Inner {
     }
     
-    class Inner2 extends Inner implements Trait<P> {
+    public class Inner2 extends Inner implements Iterable<P> {
+        public java.util.Iterator<P> iterator() {
+            throw new UnsupportedOperationException();
+        }
     }
 }
diff --git a/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.kt b/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.kt
index 168bcd712e1..68bedbe20b9 100644
--- a/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.kt
+++ b/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.kt
@@ -1,11 +1,12 @@
 package test
 
-trait Trait<P> : java.lang.Object
-
-open class Outer<P, Q>() : java.lang.Object() {
-    open class Inner() : java.lang.Object() {
+public open class InnerClassesInGeneric<P, Q>() : java.lang.Object() {
+    public open class Inner() : java.lang.Object() {
     }
     
-    open class Inner2() : Inner(), Trait<P> {
+    public open class Inner2() : Inner(), java.lang.Iterable<P> {
+        override fun iterator() : java.util.Iterator<P>? {
+            throw UnsupportedOperationException()
+        }
     }
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.java b/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.java
index aa9a92f89ff..0d70c73c704 100644
--- a/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.java
+++ b/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.java
@@ -1,7 +1,7 @@
 package test;
 
-final class Outer<P> {
-    final class Inner {
-        final <Q extends P> void f() {}
+public final class MethodReferencesOuterClassTP<P> {
+    public final class Inner {
+        public final <Q extends P> void f() {}
     }
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.kt b/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.kt
index bc43d5f3fce..1bd15647227 100644
--- a/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.kt
+++ b/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.kt
@@ -1,7 +1,7 @@
 package test
 
-class Outer<P>() : java.lang.Object() {
-    class Inner() : java.lang.Object() {
-        fun f<Q : P>() {}
+public class MethodReferencesOuterClassTP<P>() : java.lang.Object() {
+    public class Inner() : java.lang.Object() {
+        public fun f<Q : P>() {}
     }
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.java b/compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.java
index 6fb68424b6f..2b29ea34fa3 100644
--- a/compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.java
+++ b/compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.java
@@ -1,7 +1,5 @@
 package test;
 
-interface Foo {}
-
-class MethodTypePOneUpperBound {
-    <T extends Foo> void bar() {}
+public class MethodTypePOneUpperBound {
+    public <T extends Cloneable> void bar() {}
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.kt b/compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.kt
index 4554cb65218..2ca41c64c99 100644
--- a/compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.kt
+++ b/compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.kt
@@ -1,7 +1,5 @@
 package test
 
-trait Foo : java.lang.Object
-
-open class MethodTypePOneUpperBound() : java.lang.Object() {
-    open fun <T : Foo?> bar() = #()
+public open class MethodTypePOneUpperBound() : java.lang.Object() {
+    public open fun <T : Cloneable?> bar() : Unit = #()
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.java b/compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.java
index ff53fa28737..01c7462b5e8 100644
--- a/compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.java
+++ b/compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.java
@@ -1,8 +1,5 @@
 package test;
 
-interface Foo {}
-interface Bar {}
-
-class MethodTypePTwoUpperBounds {
-    <T extends Foo & Bar> void foo() {}
+public class MethodTypePTwoUpperBounds {
+    public <T extends Cloneable & Runnable> void foo() {}
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.kt b/compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.kt
index 972ca675fea..9e475eaac76 100644
--- a/compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.kt
+++ b/compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.kt
@@ -1,10 +1,7 @@
 package test
 
-trait Foo : java.lang.Object
-trait Bar : java.lang.Object
-
-open class MethodTypePTwoUpperBounds() : java.lang.Object() {
-    open fun <T> foo(): Unit
-        where T : Foo?, T : Bar?
-    {}
+public open class MethodTypePTwoUpperBounds() : java.lang.Object() {
+    public open fun <T> foo(): Unit where T : Cloneable?, T : Runnable? {
+        override fun run() = throw UnsupportedOperationException()
+    }
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypeP.java b/compiler/testData/readJavaBinaryClass/MethodWithTypeP.java
index 061dfc68e4c..b77207d04ba 100644
--- a/compiler/testData/readJavaBinaryClass/MethodWithTypeP.java
+++ b/compiler/testData/readJavaBinaryClass/MethodWithTypeP.java
@@ -1,5 +1,5 @@
 package test;
 
-final class MethodWithTypeP {
+public final class MethodWithTypeP {
     public final <P> void f() {}
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypeP.kt b/compiler/testData/readJavaBinaryClass/MethodWithTypeP.kt
index 8dbc6c7175c..274c3fe0b30 100644
--- a/compiler/testData/readJavaBinaryClass/MethodWithTypeP.kt
+++ b/compiler/testData/readJavaBinaryClass/MethodWithTypeP.kt
@@ -1,5 +1,5 @@
 package test
 
-class MethodWithTypeP() : java.lang.Object() {
-    fun <P> f() = #()
+public class MethodWithTypeP() : java.lang.Object() {
+    public fun <P> f() : Unit = #()
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypePP.java b/compiler/testData/readJavaBinaryClass/MethodWithTypePP.java
index e593cf9ec52..ca4b2e39e59 100644
--- a/compiler/testData/readJavaBinaryClass/MethodWithTypePP.java
+++ b/compiler/testData/readJavaBinaryClass/MethodWithTypePP.java
@@ -1,5 +1,5 @@
 package test;
 
-final class MethodWithTypePP {
+public final class MethodWithTypePP {
     public final <P, Q extends P> void f() {}
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypePP.kt b/compiler/testData/readJavaBinaryClass/MethodWithTypePP.kt
index 11db3264d9c..0fc1e73f2ab 100644
--- a/compiler/testData/readJavaBinaryClass/MethodWithTypePP.kt
+++ b/compiler/testData/readJavaBinaryClass/MethodWithTypePP.kt
@@ -1,5 +1,5 @@
 package test
 
-class MethodWithTypePP() : java.lang.Object() {
-    fun <P, Q : P> f() = #()
+public class MethodWithTypePP() : java.lang.Object() {
+    public fun <P, Q : P> f() : Unit = #()
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.java b/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.java
index 22ba9198274..184bfd9cfd1 100644
--- a/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.java
+++ b/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.java
@@ -1,5 +1,5 @@
 package test;
 
-class MethodWithTypePRefClassP<P> {
+public class MethodWithTypePRefClassP<P> {
     public final <Q extends P> void f() {}
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.kt b/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.kt
index c9b1c38b9e0..61f6e06ad72 100644
--- a/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.kt
+++ b/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.kt
@@ -1,5 +1,5 @@
 package test
 
-open class MethodWithTypePRefClassP<P>() : java.lang.Object() {
-    fun <Q : P> f() = #()
+public open class MethodWithTypePRefClassP<P>() : java.lang.Object() {
+    public fun <Q : P> f() : Unit = #()
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethosWithPRefTP.java b/compiler/testData/readJavaBinaryClass/MethosWithPRefTP.java
index e32fbd4b741..2fd9639a5ce 100644
--- a/compiler/testData/readJavaBinaryClass/MethosWithPRefTP.java
+++ b/compiler/testData/readJavaBinaryClass/MethosWithPRefTP.java
@@ -1,5 +1,5 @@
 package test;
 
-final class MethosWithPRefTP {
+public final class MethosWithPRefTP {
     public final <P> void f(P p) {}
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethosWithPRefTP.kt b/compiler/testData/readJavaBinaryClass/MethosWithPRefTP.kt
index 903134692e1..974ea3f9e59 100644
--- a/compiler/testData/readJavaBinaryClass/MethosWithPRefTP.kt
+++ b/compiler/testData/readJavaBinaryClass/MethosWithPRefTP.kt
@@ -1,5 +1,5 @@
 package test
 
-final class MethosWithPRefTP() : java.lang.Object() {
-    fun <P> f(p0: P?) = #()
+public final class MethosWithPRefTP() : java.lang.Object() {
+    public fun <P> f(p0: P?) : Unit = #()
 }
diff --git a/compiler/testData/readJavaBinaryClass/MyException.java b/compiler/testData/readJavaBinaryClass/MyException.java
index 10e5a46bbfc..f58777c0268 100644
--- a/compiler/testData/readJavaBinaryClass/MyException.java
+++ b/compiler/testData/readJavaBinaryClass/MyException.java
@@ -2,6 +2,6 @@
 
 package test;
 
-class MyException {
-    MyException(String message, Throwable cause) {}
+public class MyException {
+    public MyException(String message, Throwable cause) {}
 }
diff --git a/compiler/testData/readJavaBinaryClass/MyException.kt b/compiler/testData/readJavaBinaryClass/MyException.kt
index 6b618bc2b7a..8ab0457d139 100644
--- a/compiler/testData/readJavaBinaryClass/MyException.kt
+++ b/compiler/testData/readJavaBinaryClass/MyException.kt
@@ -1,3 +1,3 @@
 package test
 
-open class MyException(p0: String?, p1: Throwable?) : java.lang.Object()
+public open class MyException(p0: String?, p1: Throwable?) : java.lang.Object()
diff --git a/compiler/testData/readJavaBinaryClass/Simple.kt b/compiler/testData/readJavaBinaryClass/Simple.kt
index 39b05b99014..142307e5b5a 100644
--- a/compiler/testData/readJavaBinaryClass/Simple.kt
+++ b/compiler/testData/readJavaBinaryClass/Simple.kt
@@ -1,3 +1,3 @@
 package test
 
-class Simple() : java.lang.Object()
+public class Simple() : java.lang.Object()
diff --git a/compiler/testData/readJavaBinaryClass/TwoFields.java b/compiler/testData/readJavaBinaryClass/TwoFields.java
index a969f3381c1..5435e17236b 100644
--- a/compiler/testData/readJavaBinaryClass/TwoFields.java
+++ b/compiler/testData/readJavaBinaryClass/TwoFields.java
@@ -1,6 +1,6 @@
 package test;
 
-final class TwoFields {
-    int a;
-    short b;
+public final class TwoFields {
+    public int a;
+    public short b;
 }
diff --git a/compiler/testData/readJavaBinaryClass/TwoFields.kt b/compiler/testData/readJavaBinaryClass/TwoFields.kt
index c2aea9666e7..8ceb5f11990 100644
--- a/compiler/testData/readJavaBinaryClass/TwoFields.kt
+++ b/compiler/testData/readJavaBinaryClass/TwoFields.kt
@@ -1,6 +1,6 @@
 package test
 
-class TwoFields() : java.lang.Object() {
-    var a: Int = 1
-    var b: Short = 2;
+public class TwoFields() : java.lang.Object() {
+    public var a: Int = 1
+    public var b: Short = 2;
 }
diff --git a/compiler/testData/readJavaBinaryClass/annotation/AnnotatedAnnotation.java b/compiler/testData/readJavaBinaryClass/annotation/AnnotatedAnnotation.java
index 066f2fc29bf..96917bc5fc6 100644
--- a/compiler/testData/readJavaBinaryClass/annotation/AnnotatedAnnotation.java
+++ b/compiler/testData/readJavaBinaryClass/annotation/AnnotatedAnnotation.java
@@ -2,5 +2,5 @@ package test;
 
 @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS)
 @AnnotatedAnnotation
-@interface AnnotatedAnnotation {
+public @interface AnnotatedAnnotation {
 }
diff --git a/compiler/testData/readJavaBinaryClass/annotation/AnnotatedAnnotation.kt b/compiler/testData/readJavaBinaryClass/annotation/AnnotatedAnnotation.kt
index 99dc9324970..ff58c206d3e 100644
--- a/compiler/testData/readJavaBinaryClass/annotation/AnnotatedAnnotation.kt
+++ b/compiler/testData/readJavaBinaryClass/annotation/AnnotatedAnnotation.kt
@@ -1,4 +1,4 @@
 package test
 
 [AnnotatedAnnotation]
-annotation class AnnotatedAnnotation
+public annotation class AnnotatedAnnotation
diff --git a/compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.java b/compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.java
index a370ecc04a6..f157ade3fd8 100644
--- a/compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.java
+++ b/compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.java
@@ -1,12 +1,6 @@
 package test;
 
-import java.lang.annotation.*;
-
-@Retention(RetentionPolicy.CLASS)
-@interface Aaa {
-}
-
-class HasAnnotatedMethod {
-    @Aaa
+public class AnnotatedMethod {
+    @Deprecated
     public void f() { }
 }
diff --git a/compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.kt b/compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.kt
index 4985614a154..d0c8e1d8520 100644
--- a/compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.kt
+++ b/compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.kt
@@ -1,7 +1,5 @@
 package test
 
-annotation class Aaa
-
-open class HasAnnotatedMethod() : java.lang.Object() {
-    open Aaa fun f(): Unit { }
+public open class AnnotatedMethod() : java.lang.Object() {
+    public open Deprecated fun f(): Unit { }
 }
diff --git a/compiler/testData/readJavaBinaryClass/annotation/SimpleAnnotation.java b/compiler/testData/readJavaBinaryClass/annotation/SimpleAnnotation.java
index a2b8b821a12..09be6c50a7e 100644
--- a/compiler/testData/readJavaBinaryClass/annotation/SimpleAnnotation.java
+++ b/compiler/testData/readJavaBinaryClass/annotation/SimpleAnnotation.java
@@ -1,4 +1,4 @@
 package test;
 
-@interface SimpleAnnotation {
+public @interface SimpleAnnotation {
 }
diff --git a/compiler/testData/readJavaBinaryClass/annotation/SimpleAnnotation.kt b/compiler/testData/readJavaBinaryClass/annotation/SimpleAnnotation.kt
index a8a82d59a6c..011dd0fd47d 100644
--- a/compiler/testData/readJavaBinaryClass/annotation/SimpleAnnotation.kt
+++ b/compiler/testData/readJavaBinaryClass/annotation/SimpleAnnotation.kt
@@ -1,3 +1,3 @@
 package test
 
-annotation class SimpleAnnotation
+public annotation class SimpleAnnotation
diff --git a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.java b/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.java
index 602193d79e3..67bf74bc208 100644
--- a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.java
+++ b/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.java
@@ -1,5 +1,5 @@
 package test;
 
-class ConstructorGenericDeep {
-    <P> ConstructorGenericDeep(java.lang.Class<P> cl) {}
+public class ConstructorGenericDeep {
+    public <P> ConstructorGenericDeep(java.lang.Class<P> cl) {}
 }
diff --git a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.kt b/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.kt
index 6768daf92d5..3cf6e78927a 100644
--- a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.kt
+++ b/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.kt
@@ -1,3 +1,3 @@
 package test
 
-open class ConstructorGenericDeep(p0: java.lang.Class<Any?>?) : java.lang.Object()
+public open class ConstructorGenericDeep(p0: java.lang.Class<Any?>?) : java.lang.Object()
diff --git a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.java b/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.java
index 84326f2a8d3..8c317c5d21d 100644
--- a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.java
+++ b/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.java
@@ -1,5 +1,5 @@
 package test;
 
-class ConstructorGenericSimple {
-    <P> ConstructorGenericSimple(P p) {}
+public class ConstructorGenericSimple {
+    public <P> ConstructorGenericSimple(P p) {}
 }
diff --git a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.kt b/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.kt
index 83979465a4d..c29b0b8c2ec 100644
--- a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.kt
+++ b/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.kt
@@ -1,3 +1,3 @@
 package test
 
-open class ConstructorGenericSimple(p0: Any?) : java.lang.Object()
+public open class ConstructorGenericSimple(p0: Any?) : java.lang.Object()
diff --git a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.java b/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.java
index 877f78eff79..b2173ebd099 100644
--- a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.java
+++ b/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.java
@@ -1,5 +1,5 @@
 package test;
 
-class ConstructorGenericUpperBound {
-    <P extends java.util.RandomAccess> ConstructorGenericUpperBound(P p) {}
+public class ConstructorGenericUpperBound {
+    public <P extends java.util.RandomAccess> ConstructorGenericUpperBound(P p) {}
 }
diff --git a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.kt b/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.kt
index 604fb2c9e11..1641ed20277 100644
--- a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.kt
+++ b/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.kt
@@ -1,3 +1,3 @@
 package test
 
-open class ConstructorGenericUpperBound(p0: java.util.RandomAccess?) : java.lang.Object()
+public open class ConstructorGenericUpperBound(p0: java.util.RandomAccess?) : java.lang.Object()
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.java b/compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.java
index 4906b73e69c..20dc1cc2061 100644
--- a/compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.java
+++ b/compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.java
@@ -1,6 +1,6 @@
 package test;
 
-class DifferentGetterAndSetter {
-    void setSomething(String color) { }
-    int getSomething() { return 17; }
+public class DifferentGetterAndSetter {
+    public void setSomething(String color) { }
+    public int getSomething() { return 17; }
 }
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.kt b/compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.kt
index b75ce4316da..2cf5614c969 100644
--- a/compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.kt
+++ b/compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.kt
@@ -1,6 +1,6 @@
 package test
 
-open class DifferentGetterAndSetter() : java.lang.Object() {
-    open fun setSomething(p0: String?): Unit { }
-    open fun getSomething() = 17
+public open class DifferentGetterAndSetter() : java.lang.Object() {
+    public open fun setSomething(p0: String?): Unit { }
+    public open fun getSomething() : Int = 17
 }
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.java b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.java
index 39ed8053496..fee8c5a21b8 100644
--- a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.java
+++ b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.java
@@ -1,5 +1,5 @@
 package test;
 
-interface JavaBeanAbstractGetter {
-    int getRed();
+public interface JavaBeanAbstractGetter {
+    public int getRed();
 }
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.kt b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.kt
index 8ef31db9173..a9260f0575c 100644
--- a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.kt
+++ b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.kt
@@ -1,6 +1,6 @@
 package test
 
-trait JavaBeanAbstractGetter : java.lang.Object {
+public trait JavaBeanAbstractGetter : java.lang.Object {
     //final val red: Int
-    abstract fun getRed(): Int
+    public abstract fun getRed(): Int
 }
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.java b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.java
index 9cc328c8cbd..49007bf6f13 100644
--- a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.java
+++ b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.java
@@ -1,5 +1,5 @@
 package test;
 
-class JavaBeanVal {
-    String getColor() { return ""; }
+public class JavaBeanVal {
+    public String getColor() { return ""; }
 }
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.kt b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.kt
index ff6d52aa03d..0651c65bda0 100644
--- a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.kt
+++ b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.kt
@@ -1,6 +1,6 @@
 package test
 
-open class JavaBeanVal() : java.lang.Object() {
-    open fun getColor(): String? = ""
+public open class JavaBeanVal() : java.lang.Object() {
+    public open fun getColor(): String? = ""
     //val color: String? = ""
 }
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.java b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.java
index 09d1ce1e1db..32b8f4a17fc 100644
--- a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.java
+++ b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.java
@@ -1,6 +1,6 @@
 package test;
 
-class JavaBeanVal {
-    String getColor() { return ""; }
-    void setColor(String string) { }
+public class JavaBeanVar {
+    public String getColor() { return ""; }
+    public void setColor(String string) { }
 }
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.kt b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.kt
index 3385a1bff42..9838ee6c865 100644
--- a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.kt
+++ b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.kt
@@ -1,7 +1,7 @@
 package test
 
-open class JavaBeanVal() : java.lang.Object() {
-    open fun getColor(): String? = ""
-    open fun setColor(p0: String?): Unit { }
+public open class JavaBeanVar() : java.lang.Object() {
+    public open fun getColor(): String? = ""
+    public open fun setColor(p0: String?): Unit { }
     //var color: String? = ""
 }
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.java b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.java
index 97537e85c8f..25860ac427e 100644
--- a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.java
+++ b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.java
@@ -2,7 +2,7 @@ package test;
 
 import java.util.ArrayList;
 
-class JavaBeanVarOfGenericType<P> {
-    ArrayList<P> getCharacters() { return null; }
-    void setCharacters(ArrayList<P> characters) { }
+public class JavaBeanVarOfGenericType<P> {
+    public ArrayList<P> getCharacters() { return null; }
+    public void setCharacters(ArrayList<P> characters) { }
 }
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.kt b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.kt
index 49ed1c04f04..7bdb8a1833e 100644
--- a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.kt
+++ b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.kt
@@ -2,8 +2,8 @@ package test
 
 import java.util.ArrayList
 
-open class JavaBeanVarOfGenericType<P>() : java.lang.Object() {
-    open fun getCharacters(): ArrayList<P>? = null
-    open fun setCharacters(p0: ArrayList<P>?) { }
+public open class JavaBeanVarOfGenericType<P>() : java.lang.Object() {
+    public open fun getCharacters(): ArrayList<P>? = null
+    public open fun setCharacters(p0: ArrayList<P>?) { }
     //var characters: ArrayList<P>? = null
 }
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.java b/compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.java
index 38600a47e9a..7227fb8d0fd 100644
--- a/compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.java
+++ b/compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.java
@@ -1,6 +1,6 @@
 package test;
 
-class TwoSetters {
-    void setSize(String size) { }
-    void setSize(int size) { }
+public class TwoSetters {
+    public void setSize(String size) { }
+    public void setSize(int size) { }
 }
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.kt b/compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.kt
index b0de528b8f6..b2a8d472b44 100644
--- a/compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.kt
+++ b/compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.kt
@@ -1,6 +1,6 @@
 package test
 
-open class TwoSetters() : java.lang.Object() {
-    open fun setSize(p0: String?) { }
-    open fun setSize(p0: Int) { }
+public open class TwoSetters() : java.lang.Object() {
+    public open fun setSize(p0: String?) { }
+    public open fun setSize(p0: Int) { }
 }
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithFunctionTypes.kt b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithFunctionTypes.kt
index a18997215c7..96b121f22bd 100644
--- a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithFunctionTypes.kt
+++ b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithFunctionTypes.kt
@@ -3,7 +3,7 @@ package test
 import java.util.*
 
 public open class MethodWithFunctionTypes : Object() {
-    open fun foo(p0 : (String?) -> String) : (String.() -> String?)? {
+    public open fun foo(p0 : (String?) -> String) : (String.() -> String?)? {
         throw UnsupportedOperationException()
     }
 }
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.kt b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.kt
index faba18dd3b7..20fe56ff9de 100644
--- a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.kt
+++ b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.kt
@@ -3,5 +3,5 @@ package test
 import java.util.*
 
 public open class MethodWithGenerics : Object() {
-    open fun foo(p0 : String, p1 : List<Map.Entry<String?, String>?>) : String = ""
+    public open fun foo(p0 : String, p1 : List<Map.Entry<String?, String>?>) : String = ""
 }
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTupleType.kt b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTupleType.kt
index cf44d0f82b3..eb61d5ac59f 100644
--- a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTupleType.kt
+++ b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTupleType.kt
@@ -3,7 +3,7 @@ package test
 import java.util.*
 
 public open class MethodWithTupleType : Object() {
-    open fun foo(p0 : Tuple2<String, String?>) { // writing Tuple2<..> instead of #(..), because the latter
+    public open fun foo(p0 : Tuple2<String, String?>) { // writing Tuple2<..> instead of #(..), because the latter
                                                  // adds unnecessary "out" keywords
     }
 }
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTypeParameters.kt b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTypeParameters.kt
index 672b1f477f6..4343d479f16 100644
--- a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTypeParameters.kt
+++ b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTypeParameters.kt
@@ -3,6 +3,6 @@ package test
 import java.util.*
 
 public open class MethodWithTypeParameters : Object() {
-    open fun <erased A, erased B : Runnable> foo(p0 : A, p1 : List<out B>, p2: List<in String?>) where B : List<Cloneable> {
+    public open fun <erased A, erased B : Runnable> foo(p0 : A, p1 : List<out B>, p2: List<in String?>) where B : List<Cloneable> {
     }
 }
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithVararg.kt b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithVararg.kt
index 41f258dced6..e341396cbab 100644
--- a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithVararg.kt
+++ b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithVararg.kt
@@ -3,7 +3,7 @@ package test
 import java.util.*
 
 public open class MethodWithVararg : Object() {
-    open fun foo(vararg p0 : String) {
+    public open fun foo(vararg p0 : String) {
         throw UnsupportedOperationException()
     }
 }
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/SyntaxError.kt b/compiler/testData/readJavaBinaryClass/kotlinSignature/error/SyntaxError.kt
index c18e1ca7028..4e253df9e78 100644
--- a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/SyntaxError.kt
+++ b/compiler/testData/readJavaBinaryClass/kotlinSignature/error/SyntaxError.kt
@@ -3,7 +3,7 @@ package test
 import java.util.*
 
 public open class SyntaxError : Object() {
-    open fun foo() : Int? {
+    public open fun foo() : Int? {
         throw UnsupportedOperationException()
     }
 }
diff --git a/compiler/testData/readJavaBinaryClass/notNull/NotNullField.java b/compiler/testData/readJavaBinaryClass/notNull/NotNullField.java
index d566dfc711a..b3effe10404 100644
--- a/compiler/testData/readJavaBinaryClass/notNull/NotNullField.java
+++ b/compiler/testData/readJavaBinaryClass/notNull/NotNullField.java
@@ -2,7 +2,7 @@ package test;
 
 import org.jetbrains.annotations.NotNull;
 
-class NotNullField {
+public class NotNullField {
     @NotNull
     public String hi;
 }
diff --git a/compiler/testData/readJavaBinaryClass/notNull/NotNullField.kt b/compiler/testData/readJavaBinaryClass/notNull/NotNullField.kt
index 8bf333b4c84..0b0a904c87a 100644
--- a/compiler/testData/readJavaBinaryClass/notNull/NotNullField.kt
+++ b/compiler/testData/readJavaBinaryClass/notNull/NotNullField.kt
@@ -1,5 +1,5 @@
 package test;
 
-open class NotNullField() : java.lang.Object() {
-    var hi: String = "";
+public open class NotNullField() : java.lang.Object() {
+    public var hi: String = "";
 }
diff --git a/compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.java b/compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.java
index b7c571baa71..57e4bcdf523 100644
--- a/compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.java
+++ b/compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.java
@@ -2,7 +2,7 @@ package test;
 
 import org.jetbrains.annotations.NotNull;
 
-class NotNullMethod {
+public class NotNullMethod {
     @NotNull
     public String hi() { return ""; }
 }
diff --git a/compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.kt b/compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.kt
index 230db9040d3..525aaa4cbfb 100644
--- a/compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.kt
+++ b/compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.kt
@@ -1,5 +1,5 @@
 package test
 
-open class NotNullMethod() : java.lang.Object() {
-    open fun hi(): String = ""
+public open class NotNullMethod() : java.lang.Object() {
+    public open fun hi(): String = ""
 }
diff --git a/compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.java b/compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.java
index c065983340f..529c60e13ef 100644
--- a/compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.java
+++ b/compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.java
@@ -2,6 +2,6 @@ package test;
 
 import org.jetbrains.annotations.NotNull;
 
-class NotNullParameter {
+public class NotNullParameter {
     public void hi(@NotNull String param) { }
 }
diff --git a/compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.kt b/compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.kt
index 68f3c2556e5..b20f8613349 100644
--- a/compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.kt
+++ b/compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.kt
@@ -1,5 +1,5 @@
 package test
 
-open class NotNullParameter() : java.lang.Object() {
-    open fun hi(p0: String): Unit { }
+public open class NotNullParameter() : java.lang.Object() {
+    public open fun hi(p0: String): Unit { }
 }
diff --git a/compiler/testData/readJavaBinaryClass/vararg/VarargInt.java b/compiler/testData/readJavaBinaryClass/vararg/VarargInt.java
index 2e0a2b94b28..a9594234f71 100644
--- a/compiler/testData/readJavaBinaryClass/vararg/VarargInt.java
+++ b/compiler/testData/readJavaBinaryClass/vararg/VarargInt.java
@@ -1,5 +1,5 @@
 package test;
 
-class VarargInt {
-    void vararg(int... p) {}
+public class VarargInt {
+    public void vararg(int... p) {}
 }
diff --git a/compiler/testData/readJavaBinaryClass/vararg/VarargInt.kt b/compiler/testData/readJavaBinaryClass/vararg/VarargInt.kt
index 93ebbed91d0..b76312d69de 100644
--- a/compiler/testData/readJavaBinaryClass/vararg/VarargInt.kt
+++ b/compiler/testData/readJavaBinaryClass/vararg/VarargInt.kt
@@ -1,5 +1,5 @@
 package test
 
-open class VarargInt() : java.lang.Object() {
-    open fun vararg(vararg p0: Int): Unit = #()
+public open class VarargInt() : java.lang.Object() {
+    public open fun vararg(vararg p0: Int): Unit = #()
 }
diff --git a/compiler/testData/readJavaBinaryClass/vararg/VarargString.java b/compiler/testData/readJavaBinaryClass/vararg/VarargString.java
index c163dc94a7c..382ac99b621 100644
--- a/compiler/testData/readJavaBinaryClass/vararg/VarargString.java
+++ b/compiler/testData/readJavaBinaryClass/vararg/VarargString.java
@@ -1,5 +1,5 @@
 package test;
 
-class VarargString {
-    void vararg(String... strings) {}
+public class VarargString {
+    public void vararg(String... strings) {}
 }
diff --git a/compiler/testData/readJavaBinaryClass/vararg/VarargString.kt b/compiler/testData/readJavaBinaryClass/vararg/VarargString.kt
index 83f2e5adec0..b624bea5042 100644
--- a/compiler/testData/readJavaBinaryClass/vararg/VarargString.kt
+++ b/compiler/testData/readJavaBinaryClass/vararg/VarargString.kt
@@ -1,5 +1,5 @@
 package test
 
-open class VarargString() : java.lang.Object() {
-    open fun vararg(vararg p0: String?): Unit = #()
+public open class VarargString() : java.lang.Object() {
+    public open fun vararg(vararg p0: String?): Unit = #()
 }