diff --git a/compiler/testData/lazyResolve/descriptorRenderer/ClassObject.txt b/compiler/testData/lazyResolve/descriptorRenderer/ClassObject.txt
new file mode 100644
index 00000000000..d196336651f
--- /dev/null
+++ b/compiler/testData/lazyResolve/descriptorRenderer/ClassObject.txt
@@ -0,0 +1,7 @@
+namespace <root>
+
+internal abstract trait TheTrait : jet.Any {
+    internal final object TheTrait.<no name provided> : jet.Any {
+        internal final /*constructor*/ fun <init>(): TheTrait.<no name provided>
+    }
+}
diff --git a/compiler/testData/lazyResolve/namespaceComparator/enum.kt b/compiler/testData/lazyResolve/namespaceComparator/enum.kt
new file mode 100644
index 00000000000..32e77b1a5f8
--- /dev/null
+++ b/compiler/testData/lazyResolve/namespaceComparator/enum.kt
@@ -0,0 +1,5 @@
+enum class Test(a : Int) {
+  A : Test(0)
+  B(x : Int) : Test(x)
+  C : Test(0) {}
+}
diff --git a/compiler/testData/lazyResolve/namespaceComparator/simpleClass.txt b/compiler/testData/lazyResolve/namespaceComparator/simpleClass.txt
index 0f392c0b5fa..c31f30caf3d 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/simpleClass.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/simpleClass.txt
@@ -3,24 +3,24 @@ namespace <root>
 // <namespace name="p">
 namespace p
 
-final class p.C : jet.Any {
-    final /*constructor*/ fun <init>(): p.C
-    final fun f(): jet.Tuple0
+internal final class p.C : jet.Any {
+    internal final fun f(): jet.Tuple0
+    public final /*constructor*/ fun <init>(): p.C
 }
-open class p.G</*0*/ T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): p.G<T>
-    final fun a(): jet.Tuple0
-    open fun f(): T
+internal open class p.G</*0*/ T : jet.Any?> : jet.Any {
+    internal final fun a(): jet.Tuple0
+    internal open fun f(): T
+    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): p.G<T>
 }
-final class p.G2</*0*/ E : jet.Any?> : p.G<E> {
-    final /*constructor*/ fun </*0*/ E : jet.Any?><init>(): p.G2<E>
-    final override /*1*/ fun a(): jet.Tuple0
-    open override /*1*/ fun f(): E
-    final fun g(): E
+internal final class p.G2</*0*/ E : jet.Any?> : p.G<E> {
+    internal final fun g(): E
+    internal final override /*1*/ fun a(): jet.Tuple0
+    internal open override /*1*/ fun f(): E
+    public final /*constructor*/ fun </*0*/ E : jet.Any?><init>(): p.G2<E>
 }
-final fun foo(): jet.Tuple0
-final fun foo(/*0*/ a: p.C): jet.Tuple0
+internal final fun foo(): jet.Tuple0
+internal final fun foo(/*0*/ a: p.C): jet.Tuple0
 // </namespace name="p">
-final class A : jet.Any {
-    final /*constructor*/ fun <init>(): A
+internal final class A : jet.Any {
+    public final /*constructor*/ fun <init>(): A
 }
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java
index a0dbfcb22fa..bdfc8e633a7 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java
@@ -68,16 +68,16 @@ public class LazyResolveDescriptorRendererTestGenerated {
             doTest("compiler/testData/renderer/GlobalProperties.kt");
         }
         
+        @Test
+        public void testInheritedMembersVisibility() throws Exception {
+            doTest("compiler/testData/renderer/InheritedMembersVisibility.kt");
+        }
+        
         @Test
         public void testTupleTypes() throws Exception {
             doTest("compiler/testData/renderer/TupleTypes.kt");
         }
         
-        @Test
-        public void testInheritedMembersVisibility() throws Exception {
-            doTest("compiler/testData/renderer/InheritedMembersVisibility.kt");
-        }
-
         public static void allTestsPresent(Class<?> clazz, File testDataDir, boolean recursive) {
             Set<String> methodNames = new HashSet<String>();
             for (Method method : clazz.getDeclaredMethods()) {
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
index 0dd90578711..19ca7a9ac55 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
@@ -538,12 +538,12 @@ public class LazyResolveNamespaceComparingTestGenerated {
         public void testNsVar() throws Exception {
             doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/NsVar.kt");
         }
-
+        
         @Test
         public void testOverrideClassVal() throws Exception {
             doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/OverrideClassVal.kt");
         }
-
+        
         @Test
         public void testOverrideTraitVal() throws Exception {
             doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/OverrideTraitVal.kt");
@@ -693,57 +693,57 @@ public class LazyResolveNamespaceComparingTestGenerated {
         public void testTuple0() throws Exception {
             doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/Tuple0.kt");
         }
-
+        
         @Test
         public void testInternalAbstractTraitMembersOverridden() throws Exception {
             doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/InternalAbstractTraitMembersOverridden.kt");
         }
-
+        
         @Test
         public void testInternalClass() throws Exception {
             doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/InternalClass.kt");
         }
-
+        
         @Test
         public void testInternalConstructor() throws Exception {
             doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/InternalConstructor.kt");
         }
-
+        
         @Test
         public void testInternalTopLevelMembers() throws Exception {
             doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/InternalTopLevelMembers.kt");
         }
-
+        
         @Test
         public void testInternalTraitMembers() throws Exception {
             doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembers.kt");
         }
-
+        
         @Test
         public void testInternalTraitMembersInherited() throws Exception {
             doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembersInherited.kt");
         }
-
+        
         @Test
         public void testPrivateClass() throws Exception {
             doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/PrivateClass.kt");
         }
-
+        
         @Test
         public void testPrivateTopLevelFun() throws Exception {
             doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/PrivateTopLevelFun.kt");
         }
-
+        
         @Test
         public void testPrivateTopLevelVal() throws Exception {
             doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/PrivateTopLevelVal.kt");
         }
-
+        
         @Test
         public void testTopLevelVarWithPrivateSetter() throws Exception {
             doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/TopLevelVarWithPrivateSetter.kt");
         }
-
+        
         public static void allTestsPresent(Class<?> clazz, File testDataDir, boolean recursive) {
             Set<String> methodNames = new HashSet<String>();
             for (Method method : clazz.getDeclaredMethods()) {
@@ -847,12 +847,12 @@ public class LazyResolveNamespaceComparingTestGenerated {
         public void testFinalFieldAsVal() throws Exception {
             doTestSinglePackage("compiler/testData/readJavaBinaryClass/FinalFieldAsVal.kt");
         }
-
+        
         @Test
         public void testInnerClass() throws Exception {
             doTestSinglePackage("compiler/testData/readJavaBinaryClass/InnerClass.kt");
         }
-
+        
         @Test
         public void testInnerClassesInGeneric() throws Exception {
             doTestSinglePackage("compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.kt");
@@ -1028,13 +1028,23 @@ public class LazyResolveNamespaceComparingTestGenerated {
         }
         
         @Test
-        public void testGenericFunction() throws Exception {
-            doTest("compiler/testData/lazyResolve/genericFunction.kt");
+        public void testClassObject() throws Exception {
+            doTest("compiler/testData/lazyResolve/descriptorRenderer/ClassObject.kt");
         }
-
+        
+        @Test
+        public void testEnum() throws Exception {
+            doTest("compiler/testData/lazyResolve/namespaceComparator/enum.kt");
+        }
+        
+        @Test
+        public void testGenericFunction() throws Exception {
+            doTest("compiler/testData/lazyResolve/namespaceComparator/genericFunction.kt");
+        }
+        
         @Test
         public void testSimpleClass() throws Exception {
-            doTest("compiler/testData/lazyResolve/simpleClass.kt");
+            doTest("compiler/testData/lazyResolve/namespaceComparator/simpleClass.kt");
         }
         
         public static void allTestsPresent(Class<?> clazz, File testDataDir, boolean recursive) {