diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/arrayGetAssignMultiIndex.kt b/compiler/testData/codegen/box/arrays/arrayGetAssignMultiIndex.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/arrays/arrayGetAssignMultiIndex.kt
rename to compiler/testData/codegen/box/arrays/arrayGetAssignMultiIndex.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/arrayGetMultiIndex.kt b/compiler/testData/codegen/box/arrays/arrayGetMultiIndex.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/arrays/arrayGetMultiIndex.kt
rename to compiler/testData/codegen/box/arrays/arrayGetMultiIndex.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/cloneArray.kt b/compiler/testData/codegen/box/arrays/cloneArray.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/arrays/cloneArray.kt
rename to compiler/testData/codegen/box/arrays/cloneArray.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/clonePrimitiveArrays.kt b/compiler/testData/codegen/box/arrays/clonePrimitiveArrays.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/arrays/clonePrimitiveArrays.kt
rename to compiler/testData/codegen/box/arrays/clonePrimitiveArrays.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/inProjectionAsParameter.kt b/compiler/testData/codegen/box/arrays/inProjectionAsParameter.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/arrays/inProjectionAsParameter.kt
rename to compiler/testData/codegen/box/arrays/inProjectionAsParameter.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfArray.kt b/compiler/testData/codegen/box/arrays/inProjectionOfArray.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfArray.kt
rename to compiler/testData/codegen/box/arrays/inProjectionOfArray.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/iterator.kt b/compiler/testData/codegen/box/arrays/iterator.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/arrays/iterator.kt
rename to compiler/testData/codegen/box/arrays/iterator.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/kt1291.kt b/compiler/testData/codegen/box/arrays/kt1291.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/arrays/kt1291.kt
rename to compiler/testData/codegen/box/arrays/kt1291.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/kt3771.kt b/compiler/testData/codegen/box/arrays/kt3771.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/arrays/kt3771.kt
rename to compiler/testData/codegen/box/arrays/kt3771.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/kt4118.kt b/compiler/testData/codegen/box/arrays/kt4118.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/arrays/kt4118.kt
rename to compiler/testData/codegen/box/arrays/kt4118.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/kt4357.kt b/compiler/testData/codegen/box/arrays/kt4357.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/arrays/kt4357.kt
rename to compiler/testData/codegen/box/arrays/kt4357.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/kt945.kt b/compiler/testData/codegen/box/arrays/kt945.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/arrays/kt945.kt
rename to compiler/testData/codegen/box/arrays/kt945.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclFor.kt b/compiler/testData/codegen/box/arrays/multiDecl/MultiDeclFor.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclFor.kt
rename to compiler/testData/codegen/box/arrays/multiDecl/MultiDeclFor.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForComponentExtensions.kt b/compiler/testData/codegen/box/arrays/multiDecl/MultiDeclForComponentExtensions.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForComponentExtensions.kt
rename to compiler/testData/codegen/box/arrays/multiDecl/MultiDeclForComponentExtensions.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForComponentMemberExtensions.kt b/compiler/testData/codegen/box/arrays/multiDecl/MultiDeclForComponentMemberExtensions.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForComponentMemberExtensions.kt
rename to compiler/testData/codegen/box/arrays/multiDecl/MultiDeclForComponentMemberExtensions.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt b/compiler/testData/codegen/box/arrays/multiDecl/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt
rename to compiler/testData/codegen/box/arrays/multiDecl/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForValCaptured.kt b/compiler/testData/codegen/box/arrays/multiDecl/MultiDeclForValCaptured.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForValCaptured.kt
rename to compiler/testData/codegen/box/arrays/multiDecl/MultiDeclForValCaptured.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentExtensions.kt b/compiler/testData/codegen/box/arrays/multiDecl/int/MultiDeclForComponentExtensions.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentExtensions.kt
rename to compiler/testData/codegen/box/arrays/multiDecl/int/MultiDeclForComponentExtensions.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentExtensionsValCaptured.kt b/compiler/testData/codegen/box/arrays/multiDecl/int/MultiDeclForComponentExtensionsValCaptured.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentExtensionsValCaptured.kt
rename to compiler/testData/codegen/box/arrays/multiDecl/int/MultiDeclForComponentExtensionsValCaptured.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentMemberExtensions.kt b/compiler/testData/codegen/box/arrays/multiDecl/int/MultiDeclForComponentMemberExtensions.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentMemberExtensions.kt
rename to compiler/testData/codegen/box/arrays/multiDecl/int/MultiDeclForComponentMemberExtensions.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt b/compiler/testData/codegen/box/arrays/multiDecl/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt
rename to compiler/testData/codegen/box/arrays/multiDecl/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentExtensions.kt b/compiler/testData/codegen/box/arrays/multiDecl/long/MultiDeclForComponentExtensions.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentExtensions.kt
rename to compiler/testData/codegen/box/arrays/multiDecl/long/MultiDeclForComponentExtensions.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentExtensionsValCaptured.kt b/compiler/testData/codegen/box/arrays/multiDecl/long/MultiDeclForComponentExtensionsValCaptured.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentExtensionsValCaptured.kt
rename to compiler/testData/codegen/box/arrays/multiDecl/long/MultiDeclForComponentExtensionsValCaptured.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentMemberExtensions.kt b/compiler/testData/codegen/box/arrays/multiDecl/long/MultiDeclForComponentMemberExtensions.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentMemberExtensions.kt
rename to compiler/testData/codegen/box/arrays/multiDecl/long/MultiDeclForComponentMemberExtensions.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt b/compiler/testData/codegen/box/arrays/multiDecl/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt
rename to compiler/testData/codegen/box/arrays/multiDecl/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/nonLocalReturnArrayConstructor.kt b/compiler/testData/codegen/box/arrays/nonLocalReturnArrayConstructor.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/arrays/nonLocalReturnArrayConstructor.kt
rename to compiler/testData/codegen/box/arrays/nonLocalReturnArrayConstructor.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/nonNullArray.kt b/compiler/testData/codegen/box/arrays/nonNullArray.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/arrays/nonNullArray.kt
rename to compiler/testData/codegen/box/arrays/nonNullArray.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/stdlib.kt b/compiler/testData/codegen/box/arrays/stdlib.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/arrays/stdlib.kt
rename to compiler/testData/codegen/box/arrays/stdlib.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/boxingOptimization/kt5493.kt b/compiler/testData/codegen/box/boxingOptimization/kt5493.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/boxingOptimization/kt5493.kt
rename to compiler/testData/codegen/box/boxingOptimization/kt5493.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/boxingOptimization/kt5588.kt b/compiler/testData/codegen/box/boxingOptimization/kt5588.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/boxingOptimization/kt5588.kt
rename to compiler/testData/codegen/box/boxingOptimization/kt5588.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/abstractClassMember.kt b/compiler/testData/codegen/box/callableReference/function/abstractClassMember.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/abstractClassMember.kt
rename to compiler/testData/codegen/box/callableReference/function/abstractClassMember.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/booleanNotIntrinsic.kt b/compiler/testData/codegen/box/callableReference/function/booleanNotIntrinsic.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/booleanNotIntrinsic.kt
rename to compiler/testData/codegen/box/callableReference/function/booleanNotIntrinsic.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromClass.kt b/compiler/testData/codegen/box/callableReference/function/classMemberFromClass.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromClass.kt
rename to compiler/testData/codegen/box/callableReference/function/classMemberFromClass.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromExtension.kt b/compiler/testData/codegen/box/callableReference/function/classMemberFromExtension.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromExtension.kt
rename to compiler/testData/codegen/box/callableReference/function/classMemberFromExtension.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelStringNoArgs.kt b/compiler/testData/codegen/box/callableReference/function/classMemberFromTopLevelStringNoArgs.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelStringNoArgs.kt
rename to compiler/testData/codegen/box/callableReference/function/classMemberFromTopLevelStringNoArgs.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelStringOneStringArg.kt b/compiler/testData/codegen/box/callableReference/function/classMemberFromTopLevelStringOneStringArg.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelStringOneStringArg.kt
rename to compiler/testData/codegen/box/callableReference/function/classMemberFromTopLevelStringOneStringArg.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelUnitNoArgs.kt b/compiler/testData/codegen/box/callableReference/function/classMemberFromTopLevelUnitNoArgs.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelUnitNoArgs.kt
rename to compiler/testData/codegen/box/callableReference/function/classMemberFromTopLevelUnitNoArgs.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelUnitOneStringArg.kt b/compiler/testData/codegen/box/callableReference/function/classMemberFromTopLevelUnitOneStringArg.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelUnitOneStringArg.kt
rename to compiler/testData/codegen/box/callableReference/function/classMemberFromTopLevelUnitOneStringArg.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/constructorFromTopLevelNoArgs.kt b/compiler/testData/codegen/box/callableReference/function/constructorFromTopLevelNoArgs.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/constructorFromTopLevelNoArgs.kt
rename to compiler/testData/codegen/box/callableReference/function/constructorFromTopLevelNoArgs.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/constructorFromTopLevelOneStringArg.kt b/compiler/testData/codegen/box/callableReference/function/constructorFromTopLevelOneStringArg.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/constructorFromTopLevelOneStringArg.kt
rename to compiler/testData/codegen/box/callableReference/function/constructorFromTopLevelOneStringArg.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/enumValueOfMethod.kt b/compiler/testData/codegen/box/callableReference/function/enumValueOfMethod.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/enumValueOfMethod.kt
rename to compiler/testData/codegen/box/callableReference/function/enumValueOfMethod.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/equalsIntrinsic.kt b/compiler/testData/codegen/box/callableReference/function/equalsIntrinsic.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/equalsIntrinsic.kt
rename to compiler/testData/codegen/box/callableReference/function/equalsIntrinsic.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromClass.kt b/compiler/testData/codegen/box/callableReference/function/extensionFromClass.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromClass.kt
rename to compiler/testData/codegen/box/callableReference/function/extensionFromClass.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromExtension.kt b/compiler/testData/codegen/box/callableReference/function/extensionFromExtension.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromExtension.kt
rename to compiler/testData/codegen/box/callableReference/function/extensionFromExtension.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelStringNoArgs.kt b/compiler/testData/codegen/box/callableReference/function/extensionFromTopLevelStringNoArgs.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelStringNoArgs.kt
rename to compiler/testData/codegen/box/callableReference/function/extensionFromTopLevelStringNoArgs.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelStringOneStringArg.kt b/compiler/testData/codegen/box/callableReference/function/extensionFromTopLevelStringOneStringArg.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelStringOneStringArg.kt
rename to compiler/testData/codegen/box/callableReference/function/extensionFromTopLevelStringOneStringArg.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelUnitNoArgs.kt b/compiler/testData/codegen/box/callableReference/function/extensionFromTopLevelUnitNoArgs.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelUnitNoArgs.kt
rename to compiler/testData/codegen/box/callableReference/function/extensionFromTopLevelUnitNoArgs.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelUnitOneStringArg.kt b/compiler/testData/codegen/box/callableReference/function/extensionFromTopLevelUnitOneStringArg.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelUnitOneStringArg.kt
rename to compiler/testData/codegen/box/callableReference/function/extensionFromTopLevelUnitOneStringArg.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/genericMember.kt b/compiler/testData/codegen/box/callableReference/function/genericMember.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/genericMember.kt
rename to compiler/testData/codegen/box/callableReference/function/genericMember.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromClass.kt b/compiler/testData/codegen/box/callableReference/function/innerConstructorFromClass.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromClass.kt
rename to compiler/testData/codegen/box/callableReference/function/innerConstructorFromClass.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromExtension.kt b/compiler/testData/codegen/box/callableReference/function/innerConstructorFromExtension.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromExtension.kt
rename to compiler/testData/codegen/box/callableReference/function/innerConstructorFromExtension.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromTopLevelNoArgs.kt b/compiler/testData/codegen/box/callableReference/function/innerConstructorFromTopLevelNoArgs.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromTopLevelNoArgs.kt
rename to compiler/testData/codegen/box/callableReference/function/innerConstructorFromTopLevelNoArgs.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromTopLevelOneStringArg.kt b/compiler/testData/codegen/box/callableReference/function/innerConstructorFromTopLevelOneStringArg.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromTopLevelOneStringArg.kt
rename to compiler/testData/codegen/box/callableReference/function/innerConstructorFromTopLevelOneStringArg.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/javaCollectionsStaticMethod.kt b/compiler/testData/codegen/box/callableReference/function/javaCollectionsStaticMethod.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/javaCollectionsStaticMethod.kt
rename to compiler/testData/codegen/box/callableReference/function/javaCollectionsStaticMethod.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/captureOuter.kt b/compiler/testData/codegen/box/callableReference/function/local/captureOuter.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/captureOuter.kt
rename to compiler/testData/codegen/box/callableReference/function/local/captureOuter.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/classMember.kt b/compiler/testData/codegen/box/callableReference/function/local/classMember.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/classMember.kt
rename to compiler/testData/codegen/box/callableReference/function/local/classMember.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/closureWithSideEffect.kt b/compiler/testData/codegen/box/callableReference/function/local/closureWithSideEffect.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/closureWithSideEffect.kt
rename to compiler/testData/codegen/box/callableReference/function/local/closureWithSideEffect.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/constructor.kt b/compiler/testData/codegen/box/callableReference/function/local/constructor.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/constructor.kt
rename to compiler/testData/codegen/box/callableReference/function/local/constructor.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/constructorWithInitializer.kt b/compiler/testData/codegen/box/callableReference/function/local/constructorWithInitializer.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/constructorWithInitializer.kt
rename to compiler/testData/codegen/box/callableReference/function/local/constructorWithInitializer.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/enumExtendsTrait.kt b/compiler/testData/codegen/box/callableReference/function/local/enumExtendsTrait.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/enumExtendsTrait.kt
rename to compiler/testData/codegen/box/callableReference/function/local/enumExtendsTrait.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extension.kt b/compiler/testData/codegen/box/callableReference/function/local/extension.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extension.kt
rename to compiler/testData/codegen/box/callableReference/function/local/extension.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionToLocalClass.kt b/compiler/testData/codegen/box/callableReference/function/local/extensionToLocalClass.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionToLocalClass.kt
rename to compiler/testData/codegen/box/callableReference/function/local/extensionToLocalClass.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionToPrimitive.kt b/compiler/testData/codegen/box/callableReference/function/local/extensionToPrimitive.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionToPrimitive.kt
rename to compiler/testData/codegen/box/callableReference/function/local/extensionToPrimitive.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionWithClosure.kt b/compiler/testData/codegen/box/callableReference/function/local/extensionWithClosure.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionWithClosure.kt
rename to compiler/testData/codegen/box/callableReference/function/local/extensionWithClosure.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/genericMember.kt b/compiler/testData/codegen/box/callableReference/function/local/genericMember.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/genericMember.kt
rename to compiler/testData/codegen/box/callableReference/function/local/genericMember.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/localClassMember.kt b/compiler/testData/codegen/box/callableReference/function/local/localClassMember.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/localClassMember.kt
rename to compiler/testData/codegen/box/callableReference/function/local/localClassMember.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/localLocal.kt b/compiler/testData/codegen/box/callableReference/function/local/localLocal.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/localLocal.kt
rename to compiler/testData/codegen/box/callableReference/function/local/localLocal.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/recursiveClosure.kt b/compiler/testData/codegen/box/callableReference/function/local/recursiveClosure.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/recursiveClosure.kt
rename to compiler/testData/codegen/box/callableReference/function/local/recursiveClosure.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simple.kt b/compiler/testData/codegen/box/callableReference/function/local/simple.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simple.kt
rename to compiler/testData/codegen/box/callableReference/function/local/simple.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simpleClosure.kt b/compiler/testData/codegen/box/callableReference/function/local/simpleClosure.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simpleClosure.kt
rename to compiler/testData/codegen/box/callableReference/function/local/simpleClosure.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simpleWithArg.kt b/compiler/testData/codegen/box/callableReference/function/local/simpleWithArg.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simpleWithArg.kt
rename to compiler/testData/codegen/box/callableReference/function/local/simpleWithArg.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/unitWithSideEffect.kt b/compiler/testData/codegen/box/callableReference/function/local/unitWithSideEffect.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/unitWithSideEffect.kt
rename to compiler/testData/codegen/box/callableReference/function/local/unitWithSideEffect.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromClass.kt b/compiler/testData/codegen/box/callableReference/function/nestedConstructorFromClass.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromClass.kt
rename to compiler/testData/codegen/box/callableReference/function/nestedConstructorFromClass.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromTopLevelNoArgs.kt b/compiler/testData/codegen/box/callableReference/function/nestedConstructorFromTopLevelNoArgs.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromTopLevelNoArgs.kt
rename to compiler/testData/codegen/box/callableReference/function/nestedConstructorFromTopLevelNoArgs.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromTopLevelOneStringArg.kt b/compiler/testData/codegen/box/callableReference/function/nestedConstructorFromTopLevelOneStringArg.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromTopLevelOneStringArg.kt
rename to compiler/testData/codegen/box/callableReference/function/nestedConstructorFromTopLevelOneStringArg.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/newArray.kt b/compiler/testData/codegen/box/callableReference/function/newArray.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/newArray.kt
rename to compiler/testData/codegen/box/callableReference/function/newArray.kt
diff --git a/compiler/testData/codegen/box/callableReference/function/overloadedFun.kt b/compiler/testData/codegen/box/callableReference/function/overloadedFun.kt
new file mode 100644
index 00000000000..569ef57a1bb
--- /dev/null
+++ b/compiler/testData/codegen/box/callableReference/function/overloadedFun.kt
@@ -0,0 +1,27 @@
+fun foo(): String = "foo1"
+fun foo(i: Int): String = "foo2"
+
+val f1: () -> String = ::foo
+val f2: (Int) -> String = ::foo
+
+fun foo1() {}
+fun foo2(i: Int) {}
+
+fun bar(f: () -> Unit): String = "bar1"
+fun bar(f: (Int) -> Unit): String = "bar2"
+
+fun box(): String {
+    val x1 = f1()
+    if (x1 != "foo1") return "Fail 1: $x1"
+    
+    val x2 = f2(0)
+    if (x2 != "foo2") return "Fail 2: $x2"
+    
+    val y1 = bar(::foo1)
+    if (y1 != "bar1") return "Fail 3: $y1"
+    
+    val y2 = bar(::foo2)
+    if (y2 != "bar2") return "Fail 4: $y2"
+    
+    return "OK"
+}
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/overloadedFunVsVal.kt b/compiler/testData/codegen/box/callableReference/function/overloadedFunVsVal.kt
similarity index 62%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/overloadedFunVsVal.kt
rename to compiler/testData/codegen/box/callableReference/function/overloadedFunVsVal.kt
index 77ade044bc0..b1a5da79850 100644
--- a/compiler/testData/codegen/boxWithStdlib/callableReference/function/overloadedFunVsVal.kt
+++ b/compiler/testData/codegen/box/callableReference/function/overloadedFunVsVal.kt
@@ -1,5 +1,4 @@
 import kotlin.reflect.*
-import kotlin.test.assertEquals
 
 class A {
     val x = 1
@@ -12,8 +11,8 @@ val f2: (A) -> String = A::x
 fun box(): String {
     val a = A()
 
-    assertEquals(1, f1.get(a))
-    assertEquals("OK", f2(a))
+    val x1 = f1.get(a)
+    if (x1 != 1) return "Fail 1: $x1"
 
-    return "OK"
-}
\ No newline at end of file
+    return f2(a)
+}
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/privateClassMember.kt b/compiler/testData/codegen/box/callableReference/function/privateClassMember.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/privateClassMember.kt
rename to compiler/testData/codegen/box/callableReference/function/privateClassMember.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/sortListOfStrings.kt b/compiler/testData/codegen/box/callableReference/function/sortListOfStrings.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/sortListOfStrings.kt
rename to compiler/testData/codegen/box/callableReference/function/sortListOfStrings.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromClass.kt b/compiler/testData/codegen/box/callableReference/function/topLevelFromClass.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromClass.kt
rename to compiler/testData/codegen/box/callableReference/function/topLevelFromClass.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromExtension.kt b/compiler/testData/codegen/box/callableReference/function/topLevelFromExtension.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromExtension.kt
rename to compiler/testData/codegen/box/callableReference/function/topLevelFromExtension.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelStringNoArgs.kt b/compiler/testData/codegen/box/callableReference/function/topLevelFromTopLevelStringNoArgs.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelStringNoArgs.kt
rename to compiler/testData/codegen/box/callableReference/function/topLevelFromTopLevelStringNoArgs.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelStringOneStringArg.kt b/compiler/testData/codegen/box/callableReference/function/topLevelFromTopLevelStringOneStringArg.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelStringOneStringArg.kt
rename to compiler/testData/codegen/box/callableReference/function/topLevelFromTopLevelStringOneStringArg.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelUnitNoArgs.kt b/compiler/testData/codegen/box/callableReference/function/topLevelFromTopLevelUnitNoArgs.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelUnitNoArgs.kt
rename to compiler/testData/codegen/box/callableReference/function/topLevelFromTopLevelUnitNoArgs.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelUnitOneStringArg.kt b/compiler/testData/codegen/box/callableReference/function/topLevelFromTopLevelUnitOneStringArg.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelUnitOneStringArg.kt
rename to compiler/testData/codegen/box/callableReference/function/topLevelFromTopLevelUnitOneStringArg.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/traitImplMethodWithClassReceiver.kt b/compiler/testData/codegen/box/callableReference/function/traitImplMethodWithClassReceiver.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/traitImplMethodWithClassReceiver.kt
rename to compiler/testData/codegen/box/callableReference/function/traitImplMethodWithClassReceiver.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/traitMember.kt b/compiler/testData/codegen/box/callableReference/function/traitMember.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/function/traitMember.kt
rename to compiler/testData/codegen/box/callableReference/function/traitMember.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/accessViaSubclass.kt b/compiler/testData/codegen/box/callableReference/property/accessViaSubclass.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/property/accessViaSubclass.kt
rename to compiler/testData/codegen/box/callableReference/property/accessViaSubclass.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/delegated.kt b/compiler/testData/codegen/box/callableReference/property/delegated.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/property/delegated.kt
rename to compiler/testData/codegen/box/callableReference/property/delegated.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/delegatedMutable.kt b/compiler/testData/codegen/box/callableReference/property/delegatedMutable.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/property/delegatedMutable.kt
rename to compiler/testData/codegen/box/callableReference/property/delegatedMutable.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/enumNameOrdinal.kt b/compiler/testData/codegen/box/callableReference/property/enumNameOrdinal.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/property/enumNameOrdinal.kt
rename to compiler/testData/codegen/box/callableReference/property/enumNameOrdinal.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/extensionToArray.kt b/compiler/testData/codegen/box/callableReference/property/extensionToArray.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/property/extensionToArray.kt
rename to compiler/testData/codegen/box/callableReference/property/extensionToArray.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/genericProperty.kt b/compiler/testData/codegen/box/callableReference/property/genericProperty.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/property/genericProperty.kt
rename to compiler/testData/codegen/box/callableReference/property/genericProperty.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/invokePropertyReference.kt b/compiler/testData/codegen/box/callableReference/property/invokePropertyReference.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/property/invokePropertyReference.kt
rename to compiler/testData/codegen/box/callableReference/property/invokePropertyReference.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/javaBeanConvention.kt b/compiler/testData/codegen/box/callableReference/property/javaBeanConvention.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/property/javaBeanConvention.kt
rename to compiler/testData/codegen/box/callableReference/property/javaBeanConvention.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/kClassInstanceIsInitializedFirst.kt b/compiler/testData/codegen/box/callableReference/property/kClassInstanceIsInitializedFirst.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/property/kClassInstanceIsInitializedFirst.kt
rename to compiler/testData/codegen/box/callableReference/property/kClassInstanceIsInitializedFirst.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/kt6870_privatePropertyReference.kt b/compiler/testData/codegen/box/callableReference/property/kt6870_privatePropertyReference.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/property/kt6870_privatePropertyReference.kt
rename to compiler/testData/codegen/box/callableReference/property/kt6870_privatePropertyReference.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/localClassVar.kt b/compiler/testData/codegen/box/callableReference/property/localClassVar.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/property/localClassVar.kt
rename to compiler/testData/codegen/box/callableReference/property/localClassVar.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/overriddenInSubclass.kt b/compiler/testData/codegen/box/callableReference/property/overriddenInSubclass.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/property/overriddenInSubclass.kt
rename to compiler/testData/codegen/box/callableReference/property/overriddenInSubclass.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleExtension.kt b/compiler/testData/codegen/box/callableReference/property/simpleExtension.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleExtension.kt
rename to compiler/testData/codegen/box/callableReference/property/simpleExtension.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMember.kt b/compiler/testData/codegen/box/callableReference/property/simpleMember.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMember.kt
rename to compiler/testData/codegen/box/callableReference/property/simpleMember.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMutableExtension.kt b/compiler/testData/codegen/box/callableReference/property/simpleMutableExtension.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMutableExtension.kt
rename to compiler/testData/codegen/box/callableReference/property/simpleMutableExtension.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMutableMember.kt b/compiler/testData/codegen/box/callableReference/property/simpleMutableMember.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMutableMember.kt
rename to compiler/testData/codegen/box/callableReference/property/simpleMutableMember.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMutableTopLevel.kt b/compiler/testData/codegen/box/callableReference/property/simpleMutableTopLevel.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMutableTopLevel.kt
rename to compiler/testData/codegen/box/callableReference/property/simpleMutableTopLevel.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleTopLevel.kt b/compiler/testData/codegen/box/callableReference/property/simpleTopLevel.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleTopLevel.kt
rename to compiler/testData/codegen/box/callableReference/property/simpleTopLevel.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/casts/asFunKSmall.kt b/compiler/testData/codegen/box/casts/functions/asFunKSmall.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/casts/asFunKSmall.kt
rename to compiler/testData/codegen/box/casts/functions/asFunKSmall.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/casts/reifiedAsFunKSmall.kt b/compiler/testData/codegen/box/casts/functions/reifiedAsFunKSmall.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/casts/reifiedAsFunKSmall.kt
rename to compiler/testData/codegen/box/casts/functions/reifiedAsFunKSmall.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/casts/reifiedSafeAsFunKBig.kt b/compiler/testData/codegen/box/casts/functions/reifiedSafeAsFunKBig.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/casts/reifiedSafeAsFunKBig.kt
rename to compiler/testData/codegen/box/casts/functions/reifiedSafeAsFunKBig.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/casts/reifiedSafeAsFunKSmall.kt b/compiler/testData/codegen/box/casts/functions/reifiedSafeAsFunKSmall.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/casts/reifiedSafeAsFunKSmall.kt
rename to compiler/testData/codegen/box/casts/functions/reifiedSafeAsFunKSmall.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/classes/kt471.kt b/compiler/testData/codegen/box/classes/kt471.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/classes/kt471.kt
rename to compiler/testData/codegen/box/classes/kt471.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/classes/kt633.kt b/compiler/testData/codegen/box/classes/kt633.kt
similarity index 74%
rename from compiler/testData/codegen/boxWithStdlib/classes/kt633.kt
rename to compiler/testData/codegen/box/classes/kt633.kt
index 79b61fa0ad0..04e0a26ec12 100644
--- a/compiler/testData/codegen/boxWithStdlib/classes/kt633.kt
+++ b/compiler/testData/codegen/box/classes/kt633.kt
@@ -15,12 +15,9 @@ class MyArray() {
 fun box() : String {
     val a = MyArray()
     var i = mInt(0)
-      System.out?.println(i)
-    a[i++]// = mInt(1)
-      System.out?.println(i)
+    a[i++]
     a[i++] = mInt(1)
-      System.out?.println(i)
     for (i in 0..9)
-      System.out?.println("ar: ${a[mInt(i)]}")
+        a[mInt(i)]
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/arrayParams.kt b/compiler/testData/codegen/box/dataClasses/arrayParams.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/arrayParams.kt
rename to compiler/testData/codegen/box/dataClasses/arrayParams.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/changingVarParam.kt b/compiler/testData/codegen/box/dataClasses/changingVarParam.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/changingVarParam.kt
rename to compiler/testData/codegen/box/dataClasses/changingVarParam.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/copy/constructorWithDefaultParam.kt b/compiler/testData/codegen/box/dataClasses/copy/constructorWithDefaultParam.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/copy/constructorWithDefaultParam.kt
rename to compiler/testData/codegen/box/dataClasses/copy/constructorWithDefaultParam.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/copy/copyInObjectNestedDataClass.kt b/compiler/testData/codegen/box/dataClasses/copy/copyInObjectNestedDataClass.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/copy/copyInObjectNestedDataClass.kt
rename to compiler/testData/codegen/box/dataClasses/copy/copyInObjectNestedDataClass.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/copy/kt3033.kt b/compiler/testData/codegen/box/dataClasses/copy/kt3033.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/copy/kt3033.kt
rename to compiler/testData/codegen/box/dataClasses/copy/kt3033.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/copy/valInConstructorParams.kt b/compiler/testData/codegen/box/dataClasses/copy/valInConstructorParams.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/copy/valInConstructorParams.kt
rename to compiler/testData/codegen/box/dataClasses/copy/valInConstructorParams.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/copy/varInConstructorParams.kt b/compiler/testData/codegen/box/dataClasses/copy/varInConstructorParams.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/copy/varInConstructorParams.kt
rename to compiler/testData/codegen/box/dataClasses/copy/varInConstructorParams.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/copy/withGenericParameter.kt b/compiler/testData/codegen/box/dataClasses/copy/withGenericParameter.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/copy/withGenericParameter.kt
rename to compiler/testData/codegen/box/dataClasses/copy/withGenericParameter.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/doubleParam.kt b/compiler/testData/codegen/box/dataClasses/doubleParam.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/doubleParam.kt
rename to compiler/testData/codegen/box/dataClasses/doubleParam.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/equals/alreadyDeclared.kt b/compiler/testData/codegen/box/dataClasses/equals/alreadyDeclared.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/equals/alreadyDeclared.kt
rename to compiler/testData/codegen/box/dataClasses/equals/alreadyDeclared.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/equals/genericarray.kt b/compiler/testData/codegen/box/dataClasses/equals/genericarray.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/equals/genericarray.kt
rename to compiler/testData/codegen/box/dataClasses/equals/genericarray.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/equals/intarray.kt b/compiler/testData/codegen/box/dataClasses/equals/intarray.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/equals/intarray.kt
rename to compiler/testData/codegen/box/dataClasses/equals/intarray.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/equals/nullother.kt b/compiler/testData/codegen/box/dataClasses/equals/nullother.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/equals/nullother.kt
rename to compiler/testData/codegen/box/dataClasses/equals/nullother.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/equals/sameinstance.kt b/compiler/testData/codegen/box/dataClasses/equals/sameinstance.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/equals/sameinstance.kt
rename to compiler/testData/codegen/box/dataClasses/equals/sameinstance.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/floatParam.kt b/compiler/testData/codegen/box/dataClasses/floatParam.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/floatParam.kt
rename to compiler/testData/codegen/box/dataClasses/floatParam.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/genericParam.kt b/compiler/testData/codegen/box/dataClasses/genericParam.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/genericParam.kt
rename to compiler/testData/codegen/box/dataClasses/genericParam.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/alreadyDeclared.kt b/compiler/testData/codegen/box/dataClasses/hashCode/alreadyDeclared.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/alreadyDeclared.kt
rename to compiler/testData/codegen/box/dataClasses/hashCode/alreadyDeclared.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/array.kt b/compiler/testData/codegen/box/dataClasses/hashCode/array.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/array.kt
rename to compiler/testData/codegen/box/dataClasses/hashCode/array.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/boolean.kt b/compiler/testData/codegen/box/dataClasses/hashCode/boolean.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/boolean.kt
rename to compiler/testData/codegen/box/dataClasses/hashCode/boolean.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/byte.kt b/compiler/testData/codegen/box/dataClasses/hashCode/byte.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/byte.kt
rename to compiler/testData/codegen/box/dataClasses/hashCode/byte.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/char.kt b/compiler/testData/codegen/box/dataClasses/hashCode/char.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/char.kt
rename to compiler/testData/codegen/box/dataClasses/hashCode/char.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/double.kt b/compiler/testData/codegen/box/dataClasses/hashCode/double.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/double.kt
rename to compiler/testData/codegen/box/dataClasses/hashCode/double.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/float.kt b/compiler/testData/codegen/box/dataClasses/hashCode/float.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/float.kt
rename to compiler/testData/codegen/box/dataClasses/hashCode/float.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/genericNull.kt b/compiler/testData/codegen/box/dataClasses/hashCode/genericNull.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/genericNull.kt
rename to compiler/testData/codegen/box/dataClasses/hashCode/genericNull.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/int.kt b/compiler/testData/codegen/box/dataClasses/hashCode/int.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/int.kt
rename to compiler/testData/codegen/box/dataClasses/hashCode/int.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/long.kt b/compiler/testData/codegen/box/dataClasses/hashCode/long.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/long.kt
rename to compiler/testData/codegen/box/dataClasses/hashCode/long.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/null.kt b/compiler/testData/codegen/box/dataClasses/hashCode/null.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/null.kt
rename to compiler/testData/codegen/box/dataClasses/hashCode/null.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/short.kt b/compiler/testData/codegen/box/dataClasses/hashCode/short.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/short.kt
rename to compiler/testData/codegen/box/dataClasses/hashCode/short.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/kt5002.kt b/compiler/testData/codegen/box/dataClasses/kt5002.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/kt5002.kt
rename to compiler/testData/codegen/box/dataClasses/kt5002.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/mixedParams.kt b/compiler/testData/codegen/box/dataClasses/mixedParams.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/mixedParams.kt
rename to compiler/testData/codegen/box/dataClasses/mixedParams.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/multiDeclaration.kt b/compiler/testData/codegen/box/dataClasses/multiDeclaration.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/multiDeclaration.kt
rename to compiler/testData/codegen/box/dataClasses/multiDeclaration.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/multiDeclarationFor.kt b/compiler/testData/codegen/box/dataClasses/multiDeclarationFor.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/multiDeclarationFor.kt
rename to compiler/testData/codegen/box/dataClasses/multiDeclarationFor.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/privateValParams.kt b/compiler/testData/codegen/box/dataClasses/privateValParams.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/privateValParams.kt
rename to compiler/testData/codegen/box/dataClasses/privateValParams.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/alreadyDeclared.kt b/compiler/testData/codegen/box/dataClasses/toString/alreadyDeclared.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/alreadyDeclared.kt
rename to compiler/testData/codegen/box/dataClasses/toString/alreadyDeclared.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/arrayParams.kt b/compiler/testData/codegen/box/dataClasses/toString/arrayParams.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/arrayParams.kt
rename to compiler/testData/codegen/box/dataClasses/toString/arrayParams.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/changingVarParam.kt b/compiler/testData/codegen/box/dataClasses/toString/changingVarParam.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/changingVarParam.kt
rename to compiler/testData/codegen/box/dataClasses/toString/changingVarParam.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/genericParam.kt b/compiler/testData/codegen/box/dataClasses/toString/genericParam.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/genericParam.kt
rename to compiler/testData/codegen/box/dataClasses/toString/genericParam.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/mixedParams.kt b/compiler/testData/codegen/box/dataClasses/toString/mixedParams.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/mixedParams.kt
rename to compiler/testData/codegen/box/dataClasses/toString/mixedParams.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/unitComponent.kt b/compiler/testData/codegen/box/dataClasses/toString/unitComponent.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/unitComponent.kt
rename to compiler/testData/codegen/box/dataClasses/toString/unitComponent.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/twoValParams.kt b/compiler/testData/codegen/box/dataClasses/twoValParams.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/twoValParams.kt
rename to compiler/testData/codegen/box/dataClasses/twoValParams.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/twoVarParams.kt b/compiler/testData/codegen/box/dataClasses/twoVarParams.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/twoVarParams.kt
rename to compiler/testData/codegen/box/dataClasses/twoVarParams.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/unitComponent.kt b/compiler/testData/codegen/box/dataClasses/unitComponent.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/dataClasses/unitComponent.kt
rename to compiler/testData/codegen/box/dataClasses/unitComponent.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/charBuffer.kt b/compiler/testData/codegen/box/fullJdk/charBuffer.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/fullJdk/charBuffer.kt
rename to compiler/testData/codegen/box/fullJdk/charBuffer.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/classpath.kt b/compiler/testData/codegen/box/fullJdk/classpath.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/fullJdk/classpath.kt
rename to compiler/testData/codegen/box/fullJdk/classpath.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/ifInWhile.kt b/compiler/testData/codegen/box/fullJdk/ifInWhile.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/fullJdk/ifInWhile.kt
rename to compiler/testData/codegen/box/fullJdk/ifInWhile.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/intCountDownLatchExtension.kt b/compiler/testData/codegen/box/fullJdk/intCountDownLatchExtension.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/fullJdk/intCountDownLatchExtension.kt
rename to compiler/testData/codegen/box/fullJdk/intCountDownLatchExtension.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/kt434.kt b/compiler/testData/codegen/box/fullJdk/kt434.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/fullJdk/kt434.kt
rename to compiler/testData/codegen/box/fullJdk/kt434.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/native/nativePropertyAccessors.kt b/compiler/testData/codegen/box/fullJdk/native/nativePropertyAccessors.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/fullJdk/native/nativePropertyAccessors.kt
rename to compiler/testData/codegen/box/fullJdk/native/nativePropertyAccessors.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/native/simpleNative.kt b/compiler/testData/codegen/box/fullJdk/native/simpleNative.kt
similarity index 92%
rename from compiler/testData/codegen/boxWithStdlib/fullJdk/native/simpleNative.kt
rename to compiler/testData/codegen/box/fullJdk/native/simpleNative.kt
index ee75e26a68d..aad13a4ee68 100644
--- a/compiler/testData/codegen/boxWithStdlib/fullJdk/native/simpleNative.kt
+++ b/compiler/testData/codegen/box/fullJdk/native/simpleNative.kt
@@ -2,8 +2,6 @@
 
 package foo
 
-import kotlin.jvm.*
-
 class WithNative {
     external fun foo()
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/native/topLevel.kt b/compiler/testData/codegen/box/fullJdk/native/topLevel.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/fullJdk/native/topLevel.kt
rename to compiler/testData/codegen/box/fullJdk/native/topLevel.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/platformTypeAssertionStackTrace.kt b/compiler/testData/codegen/box/fullJdk/platformTypeAssertionStackTrace.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/fullJdk/platformTypeAssertionStackTrace.kt
rename to compiler/testData/codegen/box/fullJdk/platformTypeAssertionStackTrace.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt1770.kt b/compiler/testData/codegen/box/fullJdk/regressions/kt1770.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt1770.kt
rename to compiler/testData/codegen/box/fullJdk/regressions/kt1770.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/postfixIncrementDecrement/arrayElement.kt b/compiler/testData/codegen/box/increment/arrayElement.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/postfixIncrementDecrement/arrayElement.kt
rename to compiler/testData/codegen/box/increment/arrayElement.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/postfixIncrementDecrement/classNaryGetSet.kt b/compiler/testData/codegen/box/increment/classNaryGetSet.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/postfixIncrementDecrement/classNaryGetSet.kt
rename to compiler/testData/codegen/box/increment/classNaryGetSet.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/postfixIncrementDecrement/classWithGetSet.kt b/compiler/testData/codegen/box/increment/classWithGetSet.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/postfixIncrementDecrement/classWithGetSet.kt
rename to compiler/testData/codegen/box/increment/classWithGetSet.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/postfixIncrementDecrement/extOnLong.kt b/compiler/testData/codegen/box/increment/extOnLong.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/postfixIncrementDecrement/extOnLong.kt
rename to compiler/testData/codegen/box/increment/extOnLong.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/postfixIncrementDecrement/genericClassWithGetSet.kt b/compiler/testData/codegen/box/increment/genericClassWithGetSet.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/postfixIncrementDecrement/genericClassWithGetSet.kt
rename to compiler/testData/codegen/box/increment/genericClassWithGetSet.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/postfixIncrementDecrement/nullable.kt b/compiler/testData/codegen/box/increment/nullable.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/postfixIncrementDecrement/nullable.kt
rename to compiler/testData/codegen/box/increment/nullable.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/intrinsics/charToInt.kt b/compiler/testData/codegen/box/intrinsics/charToInt.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/intrinsics/charToInt.kt
rename to compiler/testData/codegen/box/intrinsics/charToInt.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/jdk/arrayList.kt b/compiler/testData/codegen/box/jdk/arrayList.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/jdk/arrayList.kt
rename to compiler/testData/codegen/box/jdk/arrayList.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/jdk/hashMap.kt b/compiler/testData/codegen/box/jdk/hashMap.kt
similarity index 85%
rename from compiler/testData/codegen/boxWithStdlib/jdk/hashMap.kt
rename to compiler/testData/codegen/box/jdk/hashMap.kt
index 1e586d1e4d4..d36c884ae62 100644
--- a/compiler/testData/codegen/boxWithStdlib/jdk/hashMap.kt
+++ b/compiler/testData/codegen/box/jdk/hashMap.kt
@@ -10,6 +10,6 @@ fun box(): String {
     if (map.size != 4) return "fail 2"
     if (map.get("eeeee") != null) return "fail 3"
     if (!map.containsKey("bb")) return "fail 4"
-    if (map.entries.contains("ffffff" as Any)) return "fail 5"
+    if (map.keys.contains("ffffff")) return "fail 5"
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/jdk/iteratingOverHashMap.kt b/compiler/testData/codegen/box/jdk/iteratingOverHashMap.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/jdk/iteratingOverHashMap.kt
rename to compiler/testData/codegen/box/jdk/iteratingOverHashMap.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/jdk/kt1397.kt b/compiler/testData/codegen/box/jdk/kt1397.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/jdk/kt1397.kt
rename to compiler/testData/codegen/box/jdk/kt1397.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/lazyCodegen/exceptionInFieldInitializer.kt b/compiler/testData/codegen/box/lazyCodegen/exceptionInFieldInitializer.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/lazyCodegen/exceptionInFieldInitializer.kt
rename to compiler/testData/codegen/box/lazyCodegen/exceptionInFieldInitializer.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/lazyCodegen/ifElse.kt b/compiler/testData/codegen/box/lazyCodegen/ifElse.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/lazyCodegen/ifElse.kt
rename to compiler/testData/codegen/box/lazyCodegen/ifElse.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/lazyCodegen/increment.kt b/compiler/testData/codegen/box/lazyCodegen/increment.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/lazyCodegen/increment.kt
rename to compiler/testData/codegen/box/lazyCodegen/increment.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateConstantCompare.kt b/compiler/testData/codegen/box/lazyCodegen/optimizations/negateConstantCompare.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateConstantCompare.kt
rename to compiler/testData/codegen/box/lazyCodegen/optimizations/negateConstantCompare.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateFalse.kt b/compiler/testData/codegen/box/lazyCodegen/optimizations/negateFalse.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateFalse.kt
rename to compiler/testData/codegen/box/lazyCodegen/optimizations/negateFalse.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateFalseVar.kt b/compiler/testData/codegen/box/lazyCodegen/optimizations/negateFalseVar.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateFalseVar.kt
rename to compiler/testData/codegen/box/lazyCodegen/optimizations/negateFalseVar.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateFalseVarChain.kt b/compiler/testData/codegen/box/lazyCodegen/optimizations/negateFalseVarChain.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateFalseVarChain.kt
rename to compiler/testData/codegen/box/lazyCodegen/optimizations/negateFalseVarChain.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateObjectComp.kt b/compiler/testData/codegen/box/lazyCodegen/optimizations/negateObjectComp.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateObjectComp.kt
rename to compiler/testData/codegen/box/lazyCodegen/optimizations/negateObjectComp.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateObjectComp2.kt b/compiler/testData/codegen/box/lazyCodegen/optimizations/negateObjectComp2.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateObjectComp2.kt
rename to compiler/testData/codegen/box/lazyCodegen/optimizations/negateObjectComp2.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateTrue.kt b/compiler/testData/codegen/box/lazyCodegen/optimizations/negateTrue.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateTrue.kt
rename to compiler/testData/codegen/box/lazyCodegen/optimizations/negateTrue.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateTrueVar.kt b/compiler/testData/codegen/box/lazyCodegen/optimizations/negateTrueVar.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateTrueVar.kt
rename to compiler/testData/codegen/box/lazyCodegen/optimizations/negateTrueVar.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/noOptimization.kt b/compiler/testData/codegen/box/lazyCodegen/optimizations/noOptimization.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/noOptimization.kt
rename to compiler/testData/codegen/box/lazyCodegen/optimizations/noOptimization.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/lazyCodegen/safeAssign.kt b/compiler/testData/codegen/box/lazyCodegen/safeAssign.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/lazyCodegen/safeAssign.kt
rename to compiler/testData/codegen/box/lazyCodegen/safeAssign.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/lazyCodegen/safeAssignComplex.kt b/compiler/testData/codegen/box/lazyCodegen/safeAssignComplex.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/lazyCodegen/safeAssignComplex.kt
rename to compiler/testData/codegen/box/lazyCodegen/safeAssignComplex.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/lazyCodegen/safeCallAndArray.kt b/compiler/testData/codegen/box/lazyCodegen/safeCallAndArray.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/lazyCodegen/safeCallAndArray.kt
rename to compiler/testData/codegen/box/lazyCodegen/safeCallAndArray.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/lazyCodegen/toString.kt b/compiler/testData/codegen/box/lazyCodegen/toString.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/lazyCodegen/toString.kt
rename to compiler/testData/codegen/box/lazyCodegen/toString.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/lazyCodegen/tryCatchExpression.kt b/compiler/testData/codegen/box/lazyCodegen/tryCatchExpression.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/lazyCodegen/tryCatchExpression.kt
rename to compiler/testData/codegen/box/lazyCodegen/tryCatchExpression.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/lazyCodegen/when.kt b/compiler/testData/codegen/box/lazyCodegen/when.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/lazyCodegen/when.kt
rename to compiler/testData/codegen/box/lazyCodegen/when.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/rangeContainsString.kt b/compiler/testData/codegen/box/ranges/rangeContainsString.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/ranges/rangeContainsString.kt
rename to compiler/testData/codegen/box/ranges/rangeContainsString.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt2210.kt b/compiler/testData/codegen/box/regressions/kt2210.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/regressions/kt2210.kt
rename to compiler/testData/codegen/box/regressions/kt2210.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt2509.kt b/compiler/testData/codegen/box/regressions/kt2509.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/regressions/kt2509.kt
rename to compiler/testData/codegen/box/regressions/kt2509.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt3850.kt b/compiler/testData/codegen/box/regressions/kt3850.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/regressions/kt3850.kt
rename to compiler/testData/codegen/box/regressions/kt3850.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt4142.kt b/compiler/testData/codegen/box/regressions/kt4142.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/regressions/kt4142.kt
rename to compiler/testData/codegen/box/regressions/kt4142.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt5395.kt b/compiler/testData/codegen/box/regressions/kt5395.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/regressions/kt5395.kt
rename to compiler/testData/codegen/box/regressions/kt5395.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt789.kt b/compiler/testData/codegen/box/regressions/kt789.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/regressions/kt789.kt
rename to compiler/testData/codegen/box/regressions/kt789.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/arraysReification/jaggedArray.kt b/compiler/testData/codegen/box/reified/arraysReification/jaggedArray.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/reified/arraysReification/jaggedArray.kt
rename to compiler/testData/codegen/box/reified/arraysReification/jaggedArray.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/arraysReification/jaggedDeep.kt b/compiler/testData/codegen/box/reified/arraysReification/jaggedDeep.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/reified/arraysReification/jaggedDeep.kt
rename to compiler/testData/codegen/box/reified/arraysReification/jaggedDeep.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/strings/kt5389_stringBuilderGet.kt b/compiler/testData/codegen/box/strings/kt5389_stringBuilderGet.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/strings/kt5389_stringBuilderGet.kt
rename to compiler/testData/codegen/box/strings/kt5389_stringBuilderGet.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/topLevelPrivate/privateInInlineNested.kt b/compiler/testData/codegen/box/topLevelPrivate/privateInInlineNested.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/topLevelPrivate/privateInInlineNested.kt
rename to compiler/testData/codegen/box/topLevelPrivate/privateInInlineNested.kt
diff --git a/compiler/testData/codegen/box/topLevelPrivate/privateVisibility.kt b/compiler/testData/codegen/box/topLevelPrivate/privateVisibility.kt
new file mode 100644
index 00000000000..a38d8c009f2
--- /dev/null
+++ b/compiler/testData/codegen/box/topLevelPrivate/privateVisibility.kt
@@ -0,0 +1,18 @@
+// FULL_JDK
+package test
+
+import java.lang.reflect.Modifier
+
+private val prop = "O"
+
+private fun test() = "K"
+
+fun box(): String {
+    val clazz = Class.forName("test.PrivateVisibilityKt")
+    if (!Modifier.isPrivate(clazz.getDeclaredMethod("test").modifiers))
+        return "Private top level function should be private"
+    if (!Modifier.isPrivate(clazz.getDeclaredField("prop").modifiers))
+        return "Backing field for private top level property should be private"
+
+    return "OK"
+}
diff --git a/compiler/testData/codegen/boxWithStdlib/topLevelPrivate/syntheticAccessor.kt b/compiler/testData/codegen/box/topLevelPrivate/syntheticAccessor.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/topLevelPrivate/syntheticAccessor.kt
rename to compiler/testData/codegen/box/topLevelPrivate/syntheticAccessor.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/vararg/varargInFunParam.kt b/compiler/testData/codegen/box/vararg/varargInFunParam.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/vararg/varargInFunParam.kt
rename to compiler/testData/codegen/box/vararg/varargInFunParam.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nonConstantEnum.kt b/compiler/testData/codegen/box/when/enumOptimization/nonConstantEnum.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nonConstantEnum.kt
rename to compiler/testData/codegen/box/when/enumOptimization/nonConstantEnum.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nullableEnum.kt b/compiler/testData/codegen/box/when/enumOptimization/nullableEnum.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nullableEnum.kt
rename to compiler/testData/codegen/box/when/enumOptimization/nullableEnum.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/when/exhaustiveBreakContinue.kt b/compiler/testData/codegen/box/when/exhaustiveBreakContinue.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/when/exhaustiveBreakContinue.kt
rename to compiler/testData/codegen/box/when/exhaustiveBreakContinue.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/overloadedFun.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/overloadedFun.kt
deleted file mode 100644
index 001cc71734a..00000000000
--- a/compiler/testData/codegen/boxWithStdlib/callableReference/function/overloadedFun.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-import kotlin.test.assertEquals
-
-fun foo(): String = "foo1"
-fun foo(i: Int): String = "foo2"
-
-val f1: () -> String = ::foo
-val f2: (Int) -> String = ::foo
-
-fun foo1() {}
-fun foo2(i: Int) {}
-
-fun bar(f: () -> Unit): String = "bar1"
-fun bar(f: (Int) -> Unit): String = "bar2"
-
-fun box(): String {
-    assertEquals("foo1", f1())
-    assertEquals("foo2", f2(0))
-    assertEquals("bar1", bar(::foo1))
-    assertEquals("bar2", bar(::foo2))
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/platformNamedAccessors.kt b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/propertyAccessorsWithJvmName.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/property/platformNamedAccessors.kt
rename to compiler/testData/codegen/boxWithStdlib/reflection/mapping/propertyAccessorsWithJvmName.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/publicClassValAccessible.kt b/compiler/testData/codegen/boxWithStdlib/reflection/properties/publicClassValAccessible.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/callableReference/property/publicClassValAccessible.kt
rename to compiler/testData/codegen/boxWithStdlib/reflection/properties/publicClassValAccessible.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/topLevelPrivate/privateVisibility.kt b/compiler/testData/codegen/boxWithStdlib/topLevelPrivate/privateVisibility.kt
deleted file mode 100644
index 3ec7676598a..00000000000
--- a/compiler/testData/codegen/boxWithStdlib/topLevelPrivate/privateVisibility.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-// FULL_JDK
-package test
-
-import java.lang.reflect.Modifier
-import kotlin.test.assertTrue
-
-
-private val prop = "O"
-
-private fun test() = "K"
-
-fun box(): String {
-    val clazz = Class.forName("test.PrivateVisibilityKt")
-    assertTrue(Modifier.isPrivate(clazz.getDeclaredMethod("test").modifiers), "Private top level function should be private")
-    assertTrue(Modifier.isPrivate(clazz.getDeclaredField("prop").modifiers), "Backing field for private top level property should be private")
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
index 25bb00ca75f..f30a316fd5d 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
@@ -118,6 +118,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/arrays"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
+        @TestMetadata("arrayGetAssignMultiIndex.kt")
+        public void testArrayGetAssignMultiIndex() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/arrayGetAssignMultiIndex.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("arrayGetMultiIndex.kt")
+        public void testArrayGetMultiIndex() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/arrayGetMultiIndex.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("arrayInstanceOf.kt")
         public void testArrayInstanceOf() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/arrayInstanceOf.kt");
@@ -130,6 +142,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest(fileName);
         }
 
+        @TestMetadata("cloneArray.kt")
+        public void testCloneArray() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/cloneArray.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("clonePrimitiveArrays.kt")
+        public void testClonePrimitiveArrays() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/clonePrimitiveArrays.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("collectionAssignGetMultiIndex.kt")
         public void testCollectionAssignGetMultiIndex() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/collectionAssignGetMultiIndex.kt");
@@ -196,6 +220,24 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest(fileName);
         }
 
+        @TestMetadata("inProjectionAsParameter.kt")
+        public void testInProjectionAsParameter() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/inProjectionAsParameter.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("inProjectionOfArray.kt")
+        public void testInProjectionOfArray() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/inProjectionOfArray.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("iterator.kt")
+        public void testIterator() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iterator.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("iteratorBooleanArray.kt")
         public void testIteratorBooleanArray() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorBooleanArray.kt");
@@ -256,6 +298,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest(fileName);
         }
 
+        @TestMetadata("kt1291.kt")
+        public void testKt1291() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt1291.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("kt238.kt")
         public void testKt238() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt238.kt");
@@ -274,12 +322,30 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest(fileName);
         }
 
+        @TestMetadata("kt3771.kt")
+        public void testKt3771() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt3771.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("kt4118.kt")
+        public void testKt4118() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt4118.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("kt4348.kt")
         public void testKt4348() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt4348.kt");
             doTest(fileName);
         }
 
+        @TestMetadata("kt4357.kt")
+        public void testKt4357() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt4357.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("kt503.kt")
         public void testKt503() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt503.kt");
@@ -304,6 +370,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest(fileName);
         }
 
+        @TestMetadata("kt945.kt")
+        public void testKt945() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt945.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("kt950.kt")
         public void testKt950() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt950.kt");
@@ -315,6 +387,129 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/longAsIndex.kt");
             doTest(fileName);
         }
+
+        @TestMetadata("nonLocalReturnArrayConstructor.kt")
+        public void testNonLocalReturnArrayConstructor() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/nonLocalReturnArrayConstructor.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("nonNullArray.kt")
+        public void testNonNullArray() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/nonNullArray.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("stdlib.kt")
+        public void testStdlib() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/stdlib.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/arrays/multiDecl")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class MultiDecl extends AbstractBlackBoxCodegenTest {
+            public void testAllFilesPresentInMultiDecl() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/arrays/multiDecl"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("MultiDeclFor.kt")
+            public void testMultiDeclFor() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/multiDecl/MultiDeclFor.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("MultiDeclForComponentExtensions.kt")
+            public void testMultiDeclForComponentExtensions() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/multiDecl/MultiDeclForComponentExtensions.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
+            public void testMultiDeclForComponentMemberExtensions() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/multiDecl/MultiDeclForComponentMemberExtensions.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
+            public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/multiDecl/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("MultiDeclForValCaptured.kt")
+            public void testMultiDeclForValCaptured() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/multiDecl/MultiDeclForValCaptured.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/arrays/multiDecl/int")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Int extends AbstractBlackBoxCodegenTest {
+                public void testAllFilesPresentInInt() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/arrays/multiDecl/int"), Pattern.compile("^(.+)\\.kt$"), true);
+                }
+
+                @TestMetadata("MultiDeclForComponentExtensions.kt")
+                public void testMultiDeclForComponentExtensions() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/multiDecl/int/MultiDeclForComponentExtensions.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt")
+                public void testMultiDeclForComponentExtensionsValCaptured() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/multiDecl/int/MultiDeclForComponentExtensionsValCaptured.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
+                public void testMultiDeclForComponentMemberExtensions() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/multiDecl/int/MultiDeclForComponentMemberExtensions.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
+                public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/multiDecl/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                    doTest(fileName);
+                }
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/arrays/multiDecl/long")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Long extends AbstractBlackBoxCodegenTest {
+                public void testAllFilesPresentInLong() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/arrays/multiDecl/long"), Pattern.compile("^(.+)\\.kt$"), true);
+                }
+
+                @TestMetadata("MultiDeclForComponentExtensions.kt")
+                public void testMultiDeclForComponentExtensions() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/multiDecl/long/MultiDeclForComponentExtensions.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt")
+                public void testMultiDeclForComponentExtensionsValCaptured() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/multiDecl/long/MultiDeclForComponentExtensionsValCaptured.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
+                public void testMultiDeclForComponentMemberExtensions() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/multiDecl/long/MultiDeclForComponentMemberExtensions.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
+                public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/multiDecl/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                    doTest(fileName);
+                }
+            }
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/box/binaryOp")
@@ -398,6 +593,27 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         }
     }
 
+    @TestMetadata("compiler/testData/codegen/box/boxingOptimization")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class BoxingOptimization extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInBoxingOptimization() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/boxingOptimization"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+
+        @TestMetadata("kt5493.kt")
+        public void testKt5493() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/boxingOptimization/kt5493.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("kt5588.kt")
+        public void testKt5588() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/boxingOptimization/kt5588.kt");
+            doTest(fileName);
+        }
+    }
+
     @TestMetadata("compiler/testData/codegen/box/bridges")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -908,6 +1124,498 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         }
     }
 
+    @TestMetadata("compiler/testData/codegen/box/callableReference")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class CallableReference extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInCallableReference() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/callableReference"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/callableReference/function")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Function extends AbstractBlackBoxCodegenTest {
+            @TestMetadata("abstractClassMember.kt")
+            public void testAbstractClassMember() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/abstractClassMember.kt");
+                doTest(fileName);
+            }
+
+            public void testAllFilesPresentInFunction() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/callableReference/function"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("booleanNotIntrinsic.kt")
+            public void testBooleanNotIntrinsic() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/booleanNotIntrinsic.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("classMemberFromClass.kt")
+            public void testClassMemberFromClass() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/classMemberFromClass.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("classMemberFromExtension.kt")
+            public void testClassMemberFromExtension() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/classMemberFromExtension.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("classMemberFromTopLevelStringNoArgs.kt")
+            public void testClassMemberFromTopLevelStringNoArgs() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/classMemberFromTopLevelStringNoArgs.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("classMemberFromTopLevelStringOneStringArg.kt")
+            public void testClassMemberFromTopLevelStringOneStringArg() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/classMemberFromTopLevelStringOneStringArg.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("classMemberFromTopLevelUnitNoArgs.kt")
+            public void testClassMemberFromTopLevelUnitNoArgs() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/classMemberFromTopLevelUnitNoArgs.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("classMemberFromTopLevelUnitOneStringArg.kt")
+            public void testClassMemberFromTopLevelUnitOneStringArg() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/classMemberFromTopLevelUnitOneStringArg.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("constructorFromTopLevelNoArgs.kt")
+            public void testConstructorFromTopLevelNoArgs() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/constructorFromTopLevelNoArgs.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("constructorFromTopLevelOneStringArg.kt")
+            public void testConstructorFromTopLevelOneStringArg() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/constructorFromTopLevelOneStringArg.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("enumValueOfMethod.kt")
+            public void testEnumValueOfMethod() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/enumValueOfMethod.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("equalsIntrinsic.kt")
+            public void testEqualsIntrinsic() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/equalsIntrinsic.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("extensionFromClass.kt")
+            public void testExtensionFromClass() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/extensionFromClass.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("extensionFromExtension.kt")
+            public void testExtensionFromExtension() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/extensionFromExtension.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("extensionFromTopLevelStringNoArgs.kt")
+            public void testExtensionFromTopLevelStringNoArgs() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/extensionFromTopLevelStringNoArgs.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("extensionFromTopLevelStringOneStringArg.kt")
+            public void testExtensionFromTopLevelStringOneStringArg() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/extensionFromTopLevelStringOneStringArg.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("extensionFromTopLevelUnitNoArgs.kt")
+            public void testExtensionFromTopLevelUnitNoArgs() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/extensionFromTopLevelUnitNoArgs.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("extensionFromTopLevelUnitOneStringArg.kt")
+            public void testExtensionFromTopLevelUnitOneStringArg() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/extensionFromTopLevelUnitOneStringArg.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("genericMember.kt")
+            public void testGenericMember() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/genericMember.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("innerConstructorFromClass.kt")
+            public void testInnerConstructorFromClass() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/innerConstructorFromClass.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("innerConstructorFromExtension.kt")
+            public void testInnerConstructorFromExtension() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/innerConstructorFromExtension.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("innerConstructorFromTopLevelNoArgs.kt")
+            public void testInnerConstructorFromTopLevelNoArgs() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/innerConstructorFromTopLevelNoArgs.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("innerConstructorFromTopLevelOneStringArg.kt")
+            public void testInnerConstructorFromTopLevelOneStringArg() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/innerConstructorFromTopLevelOneStringArg.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("javaCollectionsStaticMethod.kt")
+            public void testJavaCollectionsStaticMethod() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/javaCollectionsStaticMethod.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("nestedConstructorFromClass.kt")
+            public void testNestedConstructorFromClass() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/nestedConstructorFromClass.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("nestedConstructorFromTopLevelNoArgs.kt")
+            public void testNestedConstructorFromTopLevelNoArgs() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/nestedConstructorFromTopLevelNoArgs.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("nestedConstructorFromTopLevelOneStringArg.kt")
+            public void testNestedConstructorFromTopLevelOneStringArg() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/nestedConstructorFromTopLevelOneStringArg.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("newArray.kt")
+            public void testNewArray() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/newArray.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("overloadedFun.kt")
+            public void testOverloadedFun() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/overloadedFun.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("overloadedFunVsVal.kt")
+            public void testOverloadedFunVsVal() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/overloadedFunVsVal.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("privateClassMember.kt")
+            public void testPrivateClassMember() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/privateClassMember.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("sortListOfStrings.kt")
+            public void testSortListOfStrings() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/sortListOfStrings.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("topLevelFromClass.kt")
+            public void testTopLevelFromClass() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/topLevelFromClass.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("topLevelFromExtension.kt")
+            public void testTopLevelFromExtension() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/topLevelFromExtension.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("topLevelFromTopLevelStringNoArgs.kt")
+            public void testTopLevelFromTopLevelStringNoArgs() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/topLevelFromTopLevelStringNoArgs.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("topLevelFromTopLevelStringOneStringArg.kt")
+            public void testTopLevelFromTopLevelStringOneStringArg() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/topLevelFromTopLevelStringOneStringArg.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("topLevelFromTopLevelUnitNoArgs.kt")
+            public void testTopLevelFromTopLevelUnitNoArgs() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/topLevelFromTopLevelUnitNoArgs.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("topLevelFromTopLevelUnitOneStringArg.kt")
+            public void testTopLevelFromTopLevelUnitOneStringArg() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/topLevelFromTopLevelUnitOneStringArg.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("traitImplMethodWithClassReceiver.kt")
+            public void testTraitImplMethodWithClassReceiver() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/traitImplMethodWithClassReceiver.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("traitMember.kt")
+            public void testTraitMember() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/traitMember.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("compiler/testData/codegen/box/callableReference/function/local")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Local extends AbstractBlackBoxCodegenTest {
+                public void testAllFilesPresentInLocal() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/callableReference/function/local"), Pattern.compile("^(.+)\\.kt$"), true);
+                }
+
+                @TestMetadata("captureOuter.kt")
+                public void testCaptureOuter() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/local/captureOuter.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("classMember.kt")
+                public void testClassMember() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/local/classMember.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("closureWithSideEffect.kt")
+                public void testClosureWithSideEffect() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/local/closureWithSideEffect.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("constructor.kt")
+                public void testConstructor() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/local/constructor.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("constructorWithInitializer.kt")
+                public void testConstructorWithInitializer() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/local/constructorWithInitializer.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("enumExtendsTrait.kt")
+                public void testEnumExtendsTrait() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/local/enumExtendsTrait.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("extension.kt")
+                public void testExtension() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/local/extension.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("extensionToLocalClass.kt")
+                public void testExtensionToLocalClass() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/local/extensionToLocalClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("extensionToPrimitive.kt")
+                public void testExtensionToPrimitive() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/local/extensionToPrimitive.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("extensionWithClosure.kt")
+                public void testExtensionWithClosure() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/local/extensionWithClosure.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("genericMember.kt")
+                public void testGenericMember() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/local/genericMember.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("localClassMember.kt")
+                public void testLocalClassMember() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/local/localClassMember.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("localLocal.kt")
+                public void testLocalLocal() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/local/localLocal.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("recursiveClosure.kt")
+                public void testRecursiveClosure() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/local/recursiveClosure.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("simple.kt")
+                public void testSimple() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/local/simple.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("simpleClosure.kt")
+                public void testSimpleClosure() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/local/simpleClosure.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("simpleWithArg.kt")
+                public void testSimpleWithArg() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/local/simpleWithArg.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("unitWithSideEffect.kt")
+                public void testUnitWithSideEffect() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/function/local/unitWithSideEffect.kt");
+                    doTest(fileName);
+                }
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/callableReference/property")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Property extends AbstractBlackBoxCodegenTest {
+            @TestMetadata("accessViaSubclass.kt")
+            public void testAccessViaSubclass() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/accessViaSubclass.kt");
+                doTest(fileName);
+            }
+
+            public void testAllFilesPresentInProperty() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/callableReference/property"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("delegated.kt")
+            public void testDelegated() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/delegated.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("delegatedMutable.kt")
+            public void testDelegatedMutable() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/delegatedMutable.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("enumNameOrdinal.kt")
+            public void testEnumNameOrdinal() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/enumNameOrdinal.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("extensionToArray.kt")
+            public void testExtensionToArray() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/extensionToArray.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("genericProperty.kt")
+            public void testGenericProperty() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/genericProperty.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("invokePropertyReference.kt")
+            public void testInvokePropertyReference() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/invokePropertyReference.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("javaBeanConvention.kt")
+            public void testJavaBeanConvention() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/javaBeanConvention.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("kClassInstanceIsInitializedFirst.kt")
+            public void testKClassInstanceIsInitializedFirst() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/kClassInstanceIsInitializedFirst.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("kt6870_privatePropertyReference.kt")
+            public void testKt6870_privatePropertyReference() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/kt6870_privatePropertyReference.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("localClassVar.kt")
+            public void testLocalClassVar() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/localClassVar.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("overriddenInSubclass.kt")
+            public void testOverriddenInSubclass() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/overriddenInSubclass.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("simpleExtension.kt")
+            public void testSimpleExtension() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/simpleExtension.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("simpleMember.kt")
+            public void testSimpleMember() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/simpleMember.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("simpleMutableExtension.kt")
+            public void testSimpleMutableExtension() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/simpleMutableExtension.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("simpleMutableMember.kt")
+            public void testSimpleMutableMember() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/simpleMutableMember.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("simpleMutableTopLevel.kt")
+            public void testSimpleMutableTopLevel() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/simpleMutableTopLevel.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("simpleTopLevel.kt")
+            public void testSimpleTopLevel() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/simpleTopLevel.kt");
+                doTest(fileName);
+            }
+        }
+    }
+
     @TestMetadata("compiler/testData/codegen/box/casts")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -1006,6 +1714,39 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest(fileName);
         }
 
+        @TestMetadata("compiler/testData/codegen/box/casts/functions")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Functions extends AbstractBlackBoxCodegenTest {
+            public void testAllFilesPresentInFunctions() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/casts/functions"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("asFunKSmall.kt")
+            public void testAsFunKSmall() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/functions/asFunKSmall.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("reifiedAsFunKSmall.kt")
+            public void testReifiedAsFunKSmall() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/functions/reifiedAsFunKSmall.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("reifiedSafeAsFunKBig.kt")
+            public void testReifiedSafeAsFunKBig() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/functions/reifiedSafeAsFunKBig.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("reifiedSafeAsFunKSmall.kt")
+            public void testReifiedSafeAsFunKSmall() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/functions/reifiedSafeAsFunKSmall.kt");
+                doTest(fileName);
+            }
+        }
+
         @TestMetadata("compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
@@ -1504,6 +2245,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest(fileName);
         }
 
+        @TestMetadata("kt471.kt")
+        public void testKt471() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt471.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("kt48.kt")
         public void testKt48() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt48.kt");
@@ -1552,6 +2299,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest(fileName);
         }
 
+        @TestMetadata("kt633.kt")
+        public void testKt633() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt633.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("kt6816.kt")
         public void testKt6816() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt6816.kt");
@@ -2684,6 +3437,303 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         }
     }
 
+    @TestMetadata("compiler/testData/codegen/box/dataClasses")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class DataClasses extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInDataClasses() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/dataClasses"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+
+        @TestMetadata("arrayParams.kt")
+        public void testArrayParams() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/arrayParams.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("changingVarParam.kt")
+        public void testChangingVarParam() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/changingVarParam.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("doubleParam.kt")
+        public void testDoubleParam() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/doubleParam.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("floatParam.kt")
+        public void testFloatParam() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/floatParam.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("genericParam.kt")
+        public void testGenericParam() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/genericParam.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("kt5002.kt")
+        public void testKt5002() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/kt5002.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("mixedParams.kt")
+        public void testMixedParams() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/mixedParams.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("multiDeclaration.kt")
+        public void testMultiDeclaration() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/multiDeclaration.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("multiDeclarationFor.kt")
+        public void testMultiDeclarationFor() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/multiDeclarationFor.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("privateValParams.kt")
+        public void testPrivateValParams() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/privateValParams.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("twoValParams.kt")
+        public void testTwoValParams() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/twoValParams.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("twoVarParams.kt")
+        public void testTwoVarParams() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/twoVarParams.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("unitComponent.kt")
+        public void testUnitComponent() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/unitComponent.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/dataClasses/copy")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Copy extends AbstractBlackBoxCodegenTest {
+            public void testAllFilesPresentInCopy() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/dataClasses/copy"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("constructorWithDefaultParam.kt")
+            public void testConstructorWithDefaultParam() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/copy/constructorWithDefaultParam.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("copyInObjectNestedDataClass.kt")
+            public void testCopyInObjectNestedDataClass() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/copy/copyInObjectNestedDataClass.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("kt3033.kt")
+            public void testKt3033() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/copy/kt3033.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("valInConstructorParams.kt")
+            public void testValInConstructorParams() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/copy/valInConstructorParams.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("varInConstructorParams.kt")
+            public void testVarInConstructorParams() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/copy/varInConstructorParams.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("withGenericParameter.kt")
+            public void testWithGenericParameter() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/copy/withGenericParameter.kt");
+                doTest(fileName);
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/dataClasses/equals")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Equals extends AbstractBlackBoxCodegenTest {
+            public void testAllFilesPresentInEquals() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/dataClasses/equals"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("alreadyDeclared.kt")
+            public void testAlreadyDeclared() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/equals/alreadyDeclared.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("genericarray.kt")
+            public void testGenericarray() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/equals/genericarray.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("intarray.kt")
+            public void testIntarray() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/equals/intarray.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("nullother.kt")
+            public void testNullother() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/equals/nullother.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("sameinstance.kt")
+            public void testSameinstance() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/equals/sameinstance.kt");
+                doTest(fileName);
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/dataClasses/hashCode")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class HashCode extends AbstractBlackBoxCodegenTest {
+            public void testAllFilesPresentInHashCode() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/dataClasses/hashCode"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("alreadyDeclared.kt")
+            public void testAlreadyDeclared() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/hashCode/alreadyDeclared.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("array.kt")
+            public void testArray() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/hashCode/array.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("boolean.kt")
+            public void testBoolean() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/hashCode/boolean.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("byte.kt")
+            public void testByte() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/hashCode/byte.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("char.kt")
+            public void testChar() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/hashCode/char.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("double.kt")
+            public void testDouble() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/hashCode/double.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("float.kt")
+            public void testFloat() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/hashCode/float.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("genericNull.kt")
+            public void testGenericNull() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/hashCode/genericNull.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("int.kt")
+            public void testInt() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/hashCode/int.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("long.kt")
+            public void testLong() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/hashCode/long.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("null.kt")
+            public void testNull() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/hashCode/null.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("short.kt")
+            public void testShort() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/hashCode/short.kt");
+                doTest(fileName);
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/dataClasses/toString")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ToString extends AbstractBlackBoxCodegenTest {
+            public void testAllFilesPresentInToString() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/dataClasses/toString"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("alreadyDeclared.kt")
+            public void testAlreadyDeclared() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/toString/alreadyDeclared.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("arrayParams.kt")
+            public void testArrayParams() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/toString/arrayParams.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("changingVarParam.kt")
+            public void testChangingVarParam() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/toString/changingVarParam.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("genericParam.kt")
+            public void testGenericParam() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/toString/genericParam.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("mixedParams.kt")
+            public void testMixedParams() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/toString/mixedParams.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("unitComponent.kt")
+            public void testUnitComponent() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/dataClasses/toString/unitComponent.kt");
+                doTest(fileName);
+            }
+        }
+    }
+
     @TestMetadata("compiler/testData/codegen/box/deadCodeElimination")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -4115,6 +5165,93 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         }
     }
 
+    @TestMetadata("compiler/testData/codegen/box/fullJdk")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class FullJdk extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInFullJdk() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/fullJdk"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+
+        @TestMetadata("charBuffer.kt")
+        public void testCharBuffer() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/fullJdk/charBuffer.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("classpath.kt")
+        public void testClasspath() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/fullJdk/classpath.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("ifInWhile.kt")
+        public void testIfInWhile() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/fullJdk/ifInWhile.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("intCountDownLatchExtension.kt")
+        public void testIntCountDownLatchExtension() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/fullJdk/intCountDownLatchExtension.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("kt434.kt")
+        public void testKt434() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/fullJdk/kt434.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("platformTypeAssertionStackTrace.kt")
+        public void testPlatformTypeAssertionStackTrace() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/fullJdk/platformTypeAssertionStackTrace.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/fullJdk/native")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Native extends AbstractBlackBoxCodegenTest {
+            public void testAllFilesPresentInNative() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/fullJdk/native"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("nativePropertyAccessors.kt")
+            public void testNativePropertyAccessors() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/fullJdk/native/nativePropertyAccessors.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("simpleNative.kt")
+            public void testSimpleNative() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/fullJdk/native/simpleNative.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("topLevel.kt")
+            public void testTopLevel() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/fullJdk/native/topLevel.kt");
+                doTest(fileName);
+            }
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/fullJdk/regressions")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Regressions extends AbstractBlackBoxCodegenTest {
+            public void testAllFilesPresentInRegressions() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/fullJdk/regressions"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("kt1770.kt")
+            public void testKt1770() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/fullJdk/regressions/kt1770.kt");
+                doTest(fileName);
+            }
+        }
+    }
+
     @TestMetadata("compiler/testData/codegen/box/functions")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -4567,12 +5704,48 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/increment"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
+        @TestMetadata("arrayElement.kt")
+        public void testArrayElement() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/arrayElement.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("assignPlusOnSmartCast.kt")
         public void testAssignPlusOnSmartCast() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/assignPlusOnSmartCast.kt");
             doTest(fileName);
         }
 
+        @TestMetadata("classNaryGetSet.kt")
+        public void testClassNaryGetSet() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/classNaryGetSet.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("classWithGetSet.kt")
+        public void testClassWithGetSet() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/classWithGetSet.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("extOnLong.kt")
+        public void testExtOnLong() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/extOnLong.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("genericClassWithGetSet.kt")
+        public void testGenericClassWithGetSet() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/genericClassWithGetSet.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("nullable.kt")
+        public void testNullable() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/nullable.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("postfixIncrementDoubleSmartCast.kt")
         public void testPostfixIncrementDoubleSmartCast() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/postfixIncrementDoubleSmartCast.kt");
@@ -4807,6 +5980,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/intrinsics"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
+        @TestMetadata("charToInt.kt")
+        public void testCharToInt() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/charToInt.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("ea35953.kt")
         public void testEa35953() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/ea35953.kt");
@@ -4937,6 +6116,39 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         }
     }
 
+    @TestMetadata("compiler/testData/codegen/box/jdk")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Jdk extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInJdk() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/jdk"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+
+        @TestMetadata("arrayList.kt")
+        public void testArrayList() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jdk/arrayList.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("hashMap.kt")
+        public void testHashMap() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jdk/hashMap.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("iteratingOverHashMap.kt")
+        public void testIteratingOverHashMap() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jdk/iteratingOverHashMap.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("kt1397.kt")
+        public void testKt1397() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jdk/kt1397.kt");
+            doTest(fileName);
+        }
+    }
+
     @TestMetadata("compiler/testData/codegen/box/labels")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -4982,6 +6194,132 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         }
     }
 
+    @TestMetadata("compiler/testData/codegen/box/lazyCodegen")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class LazyCodegen extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInLazyCodegen() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/lazyCodegen"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+
+        @TestMetadata("exceptionInFieldInitializer.kt")
+        public void testExceptionInFieldInitializer() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/lazyCodegen/exceptionInFieldInitializer.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("ifElse.kt")
+        public void testIfElse() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/lazyCodegen/ifElse.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("increment.kt")
+        public void testIncrement() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/lazyCodegen/increment.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("safeAssign.kt")
+        public void testSafeAssign() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/lazyCodegen/safeAssign.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("safeAssignComplex.kt")
+        public void testSafeAssignComplex() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/lazyCodegen/safeAssignComplex.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("safeCallAndArray.kt")
+        public void testSafeCallAndArray() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/lazyCodegen/safeCallAndArray.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("toString.kt")
+        public void testToString() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/lazyCodegen/toString.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("tryCatchExpression.kt")
+        public void testTryCatchExpression() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/lazyCodegen/tryCatchExpression.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("when.kt")
+        public void testWhen() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/lazyCodegen/when.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/lazyCodegen/optimizations")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Optimizations extends AbstractBlackBoxCodegenTest {
+            public void testAllFilesPresentInOptimizations() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/lazyCodegen/optimizations"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("negateConstantCompare.kt")
+            public void testNegateConstantCompare() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/lazyCodegen/optimizations/negateConstantCompare.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("negateFalse.kt")
+            public void testNegateFalse() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/lazyCodegen/optimizations/negateFalse.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("negateFalseVar.kt")
+            public void testNegateFalseVar() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/lazyCodegen/optimizations/negateFalseVar.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("negateFalseVarChain.kt")
+            public void testNegateFalseVarChain() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/lazyCodegen/optimizations/negateFalseVarChain.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("negateObjectComp.kt")
+            public void testNegateObjectComp() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/lazyCodegen/optimizations/negateObjectComp.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("negateObjectComp2.kt")
+            public void testNegateObjectComp2() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/lazyCodegen/optimizations/negateObjectComp2.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("negateTrue.kt")
+            public void testNegateTrue() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/lazyCodegen/optimizations/negateTrue.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("negateTrueVar.kt")
+            public void testNegateTrueVar() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/lazyCodegen/optimizations/negateTrueVar.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("noOptimization.kt")
+            public void testNoOptimization() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/lazyCodegen/optimizations/noOptimization.kt");
+                doTest(fileName);
+            }
+        }
+    }
+
     @TestMetadata("compiler/testData/codegen/box/localClasses")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -7022,6 +8360,21 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         }
     }
 
+    @TestMetadata("compiler/testData/codegen/box/ranges")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Ranges extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInRanges() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/ranges"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+
+        @TestMetadata("rangeContainsString.kt")
+        public void testRangeContainsString() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/ranges/rangeContainsString.kt");
+            doTest(fileName);
+        }
+    }
+
     @TestMetadata("compiler/testData/codegen/box/reflection")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -7135,6 +8488,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest(fileName);
         }
 
+        @TestMetadata("kt2210.kt")
+        public void testKt2210() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt2210.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("kt2509.kt")
+        public void testKt2509() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt2509.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("kt3107.kt")
         public void testKt3107() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt3107.kt");
@@ -7153,12 +8518,24 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest(fileName);
         }
 
+        @TestMetadata("kt3850.kt")
+        public void testKt3850() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt3850.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("kt3903.kt")
         public void testKt3903() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt3903.kt");
             doTest(fileName);
         }
 
+        @TestMetadata("kt4142.kt")
+        public void testKt4142() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt4142.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("kt4281.kt")
         public void testKt4281() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt4281.kt");
@@ -7171,6 +8548,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest(fileName);
         }
 
+        @TestMetadata("kt5395.kt")
+        public void testKt5395() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt5395.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("kt6153.kt")
         public void testKt6153() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt6153.kt");
@@ -7183,6 +8566,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest(fileName);
         }
 
+        @TestMetadata("kt789.kt")
+        public void testKt789() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt789.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("unjustifiedReferenceTarget.kt")
         public void testUnjustifiedReferenceTarget() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/unjustifiedReferenceTarget.kt");
@@ -7190,6 +8579,36 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         }
     }
 
+    @TestMetadata("compiler/testData/codegen/box/reified")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Reified extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInReified() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/reified"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+
+        @TestMetadata("compiler/testData/codegen/box/reified/arraysReification")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ArraysReification extends AbstractBlackBoxCodegenTest {
+            public void testAllFilesPresentInArraysReification() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/reified/arraysReification"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("jaggedArray.kt")
+            public void testJaggedArray() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reified/arraysReification/jaggedArray.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("jaggedDeep.kt")
+            public void testJaggedDeep() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reified/arraysReification/jaggedDeep.kt");
+                doTest(fileName);
+            }
+        }
+    }
+
     @TestMetadata("compiler/testData/codegen/box/safeCall")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -7771,6 +9190,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest(fileName);
         }
 
+        @TestMetadata("kt5389_stringBuilderGet.kt")
+        public void testKt5389_stringBuilderGet() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/kt5389_stringBuilderGet.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("kt5956.kt")
         public void testKt5956() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/kt5956.kt");
@@ -8072,6 +9497,33 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         }
     }
 
+    @TestMetadata("compiler/testData/codegen/box/topLevelPrivate")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class TopLevelPrivate extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInTopLevelPrivate() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/topLevelPrivate"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+
+        @TestMetadata("privateInInlineNested.kt")
+        public void testPrivateInInlineNested() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/topLevelPrivate/privateInInlineNested.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("privateVisibility.kt")
+        public void testPrivateVisibility() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/topLevelPrivate/privateVisibility.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("syntheticAccessor.kt")
+        public void testSyntheticAccessor() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/topLevelPrivate/syntheticAccessor.kt");
+            doTest(fileName);
+        }
+    }
+
     @TestMetadata("compiler/testData/codegen/box/traits")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -8479,6 +9931,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest(fileName);
         }
 
+        @TestMetadata("varargInFunParam.kt")
+        public void testVarargInFunParam() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/vararg/varargInFunParam.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("varargsAndFunctionLiterals.kt")
         public void testVarargsAndFunctionLiterals() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/vararg/varargsAndFunctionLiterals.kt");
@@ -8512,6 +9970,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest(fileName);
         }
 
+        @TestMetadata("exhaustiveBreakContinue.kt")
+        public void testExhaustiveBreakContinue() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/exhaustiveBreakContinue.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("exhaustiveWhenInitialization.kt")
         public void testExhaustiveWhenInitialization() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/exhaustiveWhenInitialization.kt");
@@ -8619,5 +10083,26 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/whenArgumentIsEvaluatedOnlyOnce.kt");
             doTest(fileName);
         }
+
+        @TestMetadata("compiler/testData/codegen/box/when/enumOptimization")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class EnumOptimization extends AbstractBlackBoxCodegenTest {
+            public void testAllFilesPresentInEnumOptimization() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/when/enumOptimization"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("nonConstantEnum.kt")
+            public void testNonConstantEnum() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/enumOptimization/nonConstantEnum.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("nullableEnum.kt")
+            public void testNullableEnum() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/enumOptimization/nullableEnum.kt");
+                doTest(fileName);
+            }
+        }
     }
 }
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxWithStdlibCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxWithStdlibCodegenTestGenerated.java
index 9aaca3605e2..f7fa8c7c42e 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxWithStdlibCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxWithStdlibCodegenTestGenerated.java
@@ -163,42 +163,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             doTestWithStdlib(fileName);
         }
 
-        @TestMetadata("arrayGetAssignMultiIndex.kt")
-        public void testArrayGetAssignMultiIndex() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/arrayGetAssignMultiIndex.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("arrayGetMultiIndex.kt")
-        public void testArrayGetMultiIndex() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/arrayGetMultiIndex.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("cloneArray.kt")
-        public void testCloneArray() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/cloneArray.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("clonePrimitiveArrays.kt")
-        public void testClonePrimitiveArrays() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/clonePrimitiveArrays.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("inProjectionAsParameter.kt")
-        public void testInProjectionAsParameter() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/inProjectionAsParameter.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("inProjectionOfArray.kt")
-        public void testInProjectionOfArray() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfArray.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("inProjectionOfList.kt")
         public void testInProjectionOfList() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfList.kt");
@@ -217,36 +181,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             doTestWithStdlib(fileName);
         }
 
-        @TestMetadata("iterator.kt")
-        public void testIterator() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/iterator.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("kt1291.kt")
-        public void testKt1291() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt1291.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("kt3771.kt")
-        public void testKt3771() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt3771.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("kt4118.kt")
-        public void testKt4118() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt4118.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("kt4357.kt")
-        public void testKt4357() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt4357.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("kt602.kt")
         public void testKt602() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt602.kt");
@@ -265,35 +199,11 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             doTestWithStdlib(fileName);
         }
 
-        @TestMetadata("kt945.kt")
-        public void testKt945() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt945.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("multiArrayConstructors.kt")
         public void testMultiArrayConstructors() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/multiArrayConstructors.kt");
             doTestWithStdlib(fileName);
         }
-
-        @TestMetadata("nonLocalReturnArrayConstructor.kt")
-        public void testNonLocalReturnArrayConstructor() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/nonLocalReturnArrayConstructor.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("nonNullArray.kt")
-        public void testNonNullArray() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/nonNullArray.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("stdlib.kt")
-        public void testStdlib() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/stdlib.kt");
-            doTestWithStdlib(fileName);
-        }
     }
 
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization")
@@ -328,18 +238,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             doTestWithStdlib(fileName);
         }
 
-        @TestMetadata("kt5493.kt")
-        public void testKt5493() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/kt5493.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("kt5588.kt")
-        public void testKt5588() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/kt5588.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("kt5844.kt")
         public void testKt5844() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/kt5844.kt");
@@ -413,507 +311,21 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class Function extends AbstractBlackBoxCodegenTest {
-            @TestMetadata("abstractClassMember.kt")
-            public void testAbstractClassMember() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/abstractClassMember.kt");
-                doTestWithStdlib(fileName);
-            }
-
             public void testAllFilesPresentInFunction() throws Exception {
                 KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/callableReference/function"), Pattern.compile("^(.+)\\.kt$"), true);
             }
 
-            @TestMetadata("booleanNotIntrinsic.kt")
-            public void testBooleanNotIntrinsic() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/booleanNotIntrinsic.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("classMemberFromClass.kt")
-            public void testClassMemberFromClass() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromClass.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("classMemberFromExtension.kt")
-            public void testClassMemberFromExtension() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromExtension.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("classMemberFromTopLevelStringNoArgs.kt")
-            public void testClassMemberFromTopLevelStringNoArgs() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelStringNoArgs.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("classMemberFromTopLevelStringOneStringArg.kt")
-            public void testClassMemberFromTopLevelStringOneStringArg() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelStringOneStringArg.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("classMemberFromTopLevelUnitNoArgs.kt")
-            public void testClassMemberFromTopLevelUnitNoArgs() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelUnitNoArgs.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("classMemberFromTopLevelUnitOneStringArg.kt")
-            public void testClassMemberFromTopLevelUnitOneStringArg() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelUnitOneStringArg.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("constructorFromTopLevelNoArgs.kt")
-            public void testConstructorFromTopLevelNoArgs() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/constructorFromTopLevelNoArgs.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("constructorFromTopLevelOneStringArg.kt")
-            public void testConstructorFromTopLevelOneStringArg() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/constructorFromTopLevelOneStringArg.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("enumValueOfMethod.kt")
-            public void testEnumValueOfMethod() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/enumValueOfMethod.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("equalsIntrinsic.kt")
-            public void testEqualsIntrinsic() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/equalsIntrinsic.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("extensionFromClass.kt")
-            public void testExtensionFromClass() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromClass.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("extensionFromExtension.kt")
-            public void testExtensionFromExtension() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromExtension.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("extensionFromTopLevelStringNoArgs.kt")
-            public void testExtensionFromTopLevelStringNoArgs() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelStringNoArgs.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("extensionFromTopLevelStringOneStringArg.kt")
-            public void testExtensionFromTopLevelStringOneStringArg() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelStringOneStringArg.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("extensionFromTopLevelUnitNoArgs.kt")
-            public void testExtensionFromTopLevelUnitNoArgs() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelUnitNoArgs.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("extensionFromTopLevelUnitOneStringArg.kt")
-            public void testExtensionFromTopLevelUnitOneStringArg() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelUnitOneStringArg.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("genericMember.kt")
-            public void testGenericMember() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/genericMember.kt");
-                doTestWithStdlib(fileName);
-            }
-
             @TestMetadata("getArityViaFunctionImpl.kt")
             public void testGetArityViaFunctionImpl() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/getArityViaFunctionImpl.kt");
                 doTestWithStdlib(fileName);
             }
 
-            @TestMetadata("innerConstructorFromClass.kt")
-            public void testInnerConstructorFromClass() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromClass.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("innerConstructorFromExtension.kt")
-            public void testInnerConstructorFromExtension() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromExtension.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("innerConstructorFromTopLevelNoArgs.kt")
-            public void testInnerConstructorFromTopLevelNoArgs() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromTopLevelNoArgs.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("innerConstructorFromTopLevelOneStringArg.kt")
-            public void testInnerConstructorFromTopLevelOneStringArg() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromTopLevelOneStringArg.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("javaCollectionsStaticMethod.kt")
-            public void testJavaCollectionsStaticMethod() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/javaCollectionsStaticMethod.kt");
-                doTestWithStdlib(fileName);
-            }
-
             @TestMetadata("listOfStringsMapLength.kt")
             public void testListOfStringsMapLength() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/listOfStringsMapLength.kt");
                 doTestWithStdlib(fileName);
             }
-
-            @TestMetadata("nestedConstructorFromClass.kt")
-            public void testNestedConstructorFromClass() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromClass.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("nestedConstructorFromTopLevelNoArgs.kt")
-            public void testNestedConstructorFromTopLevelNoArgs() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromTopLevelNoArgs.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("nestedConstructorFromTopLevelOneStringArg.kt")
-            public void testNestedConstructorFromTopLevelOneStringArg() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromTopLevelOneStringArg.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("newArray.kt")
-            public void testNewArray() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/newArray.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("overloadedFun.kt")
-            public void testOverloadedFun() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/overloadedFun.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("overloadedFunVsVal.kt")
-            public void testOverloadedFunVsVal() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/overloadedFunVsVal.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("privateClassMember.kt")
-            public void testPrivateClassMember() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/privateClassMember.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("sortListOfStrings.kt")
-            public void testSortListOfStrings() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/sortListOfStrings.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("topLevelFromClass.kt")
-            public void testTopLevelFromClass() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromClass.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("topLevelFromExtension.kt")
-            public void testTopLevelFromExtension() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromExtension.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("topLevelFromTopLevelStringNoArgs.kt")
-            public void testTopLevelFromTopLevelStringNoArgs() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelStringNoArgs.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("topLevelFromTopLevelStringOneStringArg.kt")
-            public void testTopLevelFromTopLevelStringOneStringArg() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelStringOneStringArg.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("topLevelFromTopLevelUnitNoArgs.kt")
-            public void testTopLevelFromTopLevelUnitNoArgs() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelUnitNoArgs.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("topLevelFromTopLevelUnitOneStringArg.kt")
-            public void testTopLevelFromTopLevelUnitOneStringArg() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelUnitOneStringArg.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("traitImplMethodWithClassReceiver.kt")
-            public void testTraitImplMethodWithClassReceiver() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/traitImplMethodWithClassReceiver.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("traitMember.kt")
-            public void testTraitMember() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/traitMember.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local")
-            @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class Local extends AbstractBlackBoxCodegenTest {
-                public void testAllFilesPresentInLocal() throws Exception {
-                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/callableReference/function/local"), Pattern.compile("^(.+)\\.kt$"), true);
-                }
-
-                @TestMetadata("captureOuter.kt")
-                public void testCaptureOuter() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/captureOuter.kt");
-                    doTestWithStdlib(fileName);
-                }
-
-                @TestMetadata("classMember.kt")
-                public void testClassMember() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/classMember.kt");
-                    doTestWithStdlib(fileName);
-                }
-
-                @TestMetadata("closureWithSideEffect.kt")
-                public void testClosureWithSideEffect() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/closureWithSideEffect.kt");
-                    doTestWithStdlib(fileName);
-                }
-
-                @TestMetadata("constructor.kt")
-                public void testConstructor() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/constructor.kt");
-                    doTestWithStdlib(fileName);
-                }
-
-                @TestMetadata("constructorWithInitializer.kt")
-                public void testConstructorWithInitializer() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/constructorWithInitializer.kt");
-                    doTestWithStdlib(fileName);
-                }
-
-                @TestMetadata("enumExtendsTrait.kt")
-                public void testEnumExtendsTrait() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/enumExtendsTrait.kt");
-                    doTestWithStdlib(fileName);
-                }
-
-                @TestMetadata("extension.kt")
-                public void testExtension() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extension.kt");
-                    doTestWithStdlib(fileName);
-                }
-
-                @TestMetadata("extensionToLocalClass.kt")
-                public void testExtensionToLocalClass() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionToLocalClass.kt");
-                    doTestWithStdlib(fileName);
-                }
-
-                @TestMetadata("extensionToPrimitive.kt")
-                public void testExtensionToPrimitive() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionToPrimitive.kt");
-                    doTestWithStdlib(fileName);
-                }
-
-                @TestMetadata("extensionWithClosure.kt")
-                public void testExtensionWithClosure() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionWithClosure.kt");
-                    doTestWithStdlib(fileName);
-                }
-
-                @TestMetadata("genericMember.kt")
-                public void testGenericMember() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/genericMember.kt");
-                    doTestWithStdlib(fileName);
-                }
-
-                @TestMetadata("localClassMember.kt")
-                public void testLocalClassMember() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/localClassMember.kt");
-                    doTestWithStdlib(fileName);
-                }
-
-                @TestMetadata("localLocal.kt")
-                public void testLocalLocal() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/localLocal.kt");
-                    doTestWithStdlib(fileName);
-                }
-
-                @TestMetadata("recursiveClosure.kt")
-                public void testRecursiveClosure() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/recursiveClosure.kt");
-                    doTestWithStdlib(fileName);
-                }
-
-                @TestMetadata("simple.kt")
-                public void testSimple() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simple.kt");
-                    doTestWithStdlib(fileName);
-                }
-
-                @TestMetadata("simpleClosure.kt")
-                public void testSimpleClosure() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simpleClosure.kt");
-                    doTestWithStdlib(fileName);
-                }
-
-                @TestMetadata("simpleWithArg.kt")
-                public void testSimpleWithArg() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simpleWithArg.kt");
-                    doTestWithStdlib(fileName);
-                }
-
-                @TestMetadata("unitWithSideEffect.kt")
-                public void testUnitWithSideEffect() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/unitWithSideEffect.kt");
-                    doTestWithStdlib(fileName);
-                }
-            }
-        }
-
-        @TestMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Property extends AbstractBlackBoxCodegenTest {
-            @TestMetadata("accessViaSubclass.kt")
-            public void testAccessViaSubclass() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/accessViaSubclass.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            public void testAllFilesPresentInProperty() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/callableReference/property"), Pattern.compile("^(.+)\\.kt$"), true);
-            }
-
-            @TestMetadata("delegated.kt")
-            public void testDelegated() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/delegated.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("delegatedMutable.kt")
-            public void testDelegatedMutable() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/delegatedMutable.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("enumNameOrdinal.kt")
-            public void testEnumNameOrdinal() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/enumNameOrdinal.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("extensionToArray.kt")
-            public void testExtensionToArray() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/extensionToArray.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("genericProperty.kt")
-            public void testGenericProperty() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/genericProperty.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("invokePropertyReference.kt")
-            public void testInvokePropertyReference() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/invokePropertyReference.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("javaBeanConvention.kt")
-            public void testJavaBeanConvention() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/javaBeanConvention.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("kClassInstanceIsInitializedFirst.kt")
-            public void testKClassInstanceIsInitializedFirst() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/kClassInstanceIsInitializedFirst.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("kt6870_privatePropertyReference.kt")
-            public void testKt6870_privatePropertyReference() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/kt6870_privatePropertyReference.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("localClassVar.kt")
-            public void testLocalClassVar() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/localClassVar.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("overriddenInSubclass.kt")
-            public void testOverriddenInSubclass() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/overriddenInSubclass.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("platformNamedAccessors.kt")
-            public void testPlatformNamedAccessors() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/platformNamedAccessors.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("publicClassValAccessible.kt")
-            public void testPublicClassValAccessible() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/publicClassValAccessible.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("simpleExtension.kt")
-            public void testSimpleExtension() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleExtension.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("simpleMember.kt")
-            public void testSimpleMember() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMember.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("simpleMutableExtension.kt")
-            public void testSimpleMutableExtension() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMutableExtension.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("simpleMutableMember.kt")
-            public void testSimpleMutableMember() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMutableMember.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("simpleMutableTopLevel.kt")
-            public void testSimpleMutableTopLevel() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMutableTopLevel.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("simpleTopLevel.kt")
-            public void testSimpleTopLevel() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleTopLevel.kt");
-                doTestWithStdlib(fileName);
-            }
         }
     }
 
@@ -931,12 +343,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             doTestWithStdlib(fileName);
         }
 
-        @TestMetadata("asFunKSmall.kt")
-        public void testAsFunKSmall() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/asFunKSmall.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("asWithGeneric.kt")
         public void testAsWithGeneric() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/asWithGeneric.kt");
@@ -973,12 +379,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             doTestWithStdlib(fileName);
         }
 
-        @TestMetadata("reifiedAsFunKSmall.kt")
-        public void testReifiedAsFunKSmall() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/reifiedAsFunKSmall.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("reifiedAsWithMutable.kt")
         public void testReifiedAsWithMutable() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/reifiedAsWithMutable.kt");
@@ -1003,18 +403,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             doTestWithStdlib(fileName);
         }
 
-        @TestMetadata("reifiedSafeAsFunKBig.kt")
-        public void testReifiedSafeAsFunKBig() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/reifiedSafeAsFunKBig.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("reifiedSafeAsFunKSmall.kt")
-        public void testReifiedSafeAsFunKSmall() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/reifiedSafeAsFunKSmall.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("reifiedSafeAsWithMutable.kt")
         public void testReifiedSafeAsWithMutable() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/reifiedSafeAsWithMutable.kt");
@@ -1060,18 +448,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/classes"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
-        @TestMetadata("kt471.kt")
-        public void testKt471() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/classes/kt471.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("kt633.kt")
-        public void testKt633() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/classes/kt633.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("kt8011.kt")
         public void testKt8011() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/classes/kt8011.kt");
@@ -1129,129 +505,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/dataClasses"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
-        @TestMetadata("arrayParams.kt")
-        public void testArrayParams() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/arrayParams.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("changingVarParam.kt")
-        public void testChangingVarParam() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/changingVarParam.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("doubleParam.kt")
-        public void testDoubleParam() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/doubleParam.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("floatParam.kt")
-        public void testFloatParam() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/floatParam.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("genericParam.kt")
-        public void testGenericParam() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/genericParam.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("kt5002.kt")
-        public void testKt5002() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/kt5002.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("mixedParams.kt")
-        public void testMixedParams() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/mixedParams.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("multiDeclaration.kt")
-        public void testMultiDeclaration() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/multiDeclaration.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("multiDeclarationFor.kt")
-        public void testMultiDeclarationFor() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/multiDeclarationFor.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("privateValParams.kt")
-        public void testPrivateValParams() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/privateValParams.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("twoValParams.kt")
-        public void testTwoValParams() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/twoValParams.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("twoVarParams.kt")
-        public void testTwoVarParams() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/twoVarParams.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("unitComponent.kt")
-        public void testUnitComponent() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/unitComponent.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Copy extends AbstractBlackBoxCodegenTest {
-            public void testAllFilesPresentInCopy() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/dataClasses/copy"), Pattern.compile("^(.+)\\.kt$"), true);
-            }
-
-            @TestMetadata("constructorWithDefaultParam.kt")
-            public void testConstructorWithDefaultParam() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/constructorWithDefaultParam.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("copyInObjectNestedDataClass.kt")
-            public void testCopyInObjectNestedDataClass() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/copyInObjectNestedDataClass.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("kt3033.kt")
-            public void testKt3033() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/kt3033.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("valInConstructorParams.kt")
-            public void testValInConstructorParams() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/valInConstructorParams.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("varInConstructorParams.kt")
-            public void testVarInConstructorParams() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/varInConstructorParams.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("withGenericParameter.kt")
-            public void testWithGenericParameter() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/withGenericParameter.kt");
-                doTestWithStdlib(fileName);
-            }
-        }
-
         @TestMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
@@ -1260,41 +513,11 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                 KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/dataClasses/equals"), Pattern.compile("^(.+)\\.kt$"), true);
             }
 
-            @TestMetadata("alreadyDeclared.kt")
-            public void testAlreadyDeclared() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/alreadyDeclared.kt");
-                doTestWithStdlib(fileName);
-            }
-
             @TestMetadata("alreadyDeclaredWrongSignature.kt")
             public void testAlreadyDeclaredWrongSignature() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/alreadyDeclaredWrongSignature.kt");
                 doTestWithStdlib(fileName);
             }
-
-            @TestMetadata("genericarray.kt")
-            public void testGenericarray() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/genericarray.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("intarray.kt")
-            public void testIntarray() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/intarray.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("nullother.kt")
-            public void testNullother() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/nullother.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("sameinstance.kt")
-            public void testSameinstance() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/sameinstance.kt");
-                doTestWithStdlib(fileName);
-            }
         }
 
         @TestMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode")
@@ -1305,83 +528,11 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                 KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode"), Pattern.compile("^(.+)\\.kt$"), true);
             }
 
-            @TestMetadata("alreadyDeclared.kt")
-            public void testAlreadyDeclared() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/alreadyDeclared.kt");
-                doTestWithStdlib(fileName);
-            }
-
             @TestMetadata("alreadyDeclaredWrongSignature.kt")
             public void testAlreadyDeclaredWrongSignature() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/alreadyDeclaredWrongSignature.kt");
                 doTestWithStdlib(fileName);
             }
-
-            @TestMetadata("array.kt")
-            public void testArray() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/array.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("boolean.kt")
-            public void testBoolean() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/boolean.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("byte.kt")
-            public void testByte() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/byte.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("char.kt")
-            public void testChar() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/char.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("double.kt")
-            public void testDouble() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/double.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("float.kt")
-            public void testFloat() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/float.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("genericNull.kt")
-            public void testGenericNull() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/genericNull.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("int.kt")
-            public void testInt() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/int.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("long.kt")
-            public void testLong() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/long.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("null.kt")
-            public void testNull() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/null.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("short.kt")
-            public void testShort() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/short.kt");
-                doTestWithStdlib(fileName);
-            }
         }
 
         @TestMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring")
@@ -1392,47 +543,11 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                 KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring"), Pattern.compile("^(.+)\\.kt$"), true);
             }
 
-            @TestMetadata("alreadyDeclared.kt")
-            public void testAlreadyDeclared() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/alreadyDeclared.kt");
-                doTestWithStdlib(fileName);
-            }
-
             @TestMetadata("alreadyDeclaredWrongSignature.kt")
             public void testAlreadyDeclaredWrongSignature() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/alreadyDeclaredWrongSignature.kt");
                 doTestWithStdlib(fileName);
             }
-
-            @TestMetadata("arrayParams.kt")
-            public void testArrayParams() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/arrayParams.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("changingVarParam.kt")
-            public void testChangingVarParam() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/changingVarParam.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("genericParam.kt")
-            public void testGenericParam() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/genericParam.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("mixedParams.kt")
-            public void testMixedParams() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/mixedParams.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("unitComponent.kt")
-            public void testUnitComponent() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/unitComponent.kt");
-                doTestWithStdlib(fileName);
-            }
         }
     }
 
@@ -1660,36 +775,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/fullJdk"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
-        @TestMetadata("charBuffer.kt")
-        public void testCharBuffer() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/charBuffer.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("classpath.kt")
-        public void testClasspath() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/classpath.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("constFlags.kt")
         public void testConstFlags() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/constFlags.kt");
             doTestWithStdlib(fileName);
         }
 
-        @TestMetadata("ifInWhile.kt")
-        public void testIfInWhile() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/ifInWhile.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("intCountDownLatchExtension.kt")
-        public void testIntCountDownLatchExtension() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/intCountDownLatchExtension.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("jvmAnnotationFlags.kt")
         public void testJvmAnnotationFlags() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/jvmAnnotationFlags.kt");
@@ -1702,24 +793,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             doTestWithStdlib(fileName);
         }
 
-        @TestMetadata("kt434.kt")
-        public void testKt434() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/kt434.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("lateinitVisibility.kt")
         public void testLateinitVisibility() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/lateinitVisibility.kt");
             doTestWithStdlib(fileName);
         }
 
-        @TestMetadata("platformTypeAssertionStackTrace.kt")
-        public void testPlatformTypeAssertionStackTrace() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/platformTypeAssertionStackTrace.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/native")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
@@ -1734,35 +813,17 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                 doTestWithStdlib(fileName);
             }
 
-            @TestMetadata("nativePropertyAccessors.kt")
-            public void testNativePropertyAccessors() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/native/nativePropertyAccessors.kt");
-                doTestWithStdlib(fileName);
-            }
-
             @TestMetadata("privateStatic.kt")
             public void testPrivateStatic() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/native/privateStatic.kt");
                 doTestWithStdlib(fileName);
             }
 
-            @TestMetadata("simpleNative.kt")
-            public void testSimpleNative() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/native/simpleNative.kt");
-                doTestWithStdlib(fileName);
-            }
-
             @TestMetadata("staticNative.kt")
             public void testStaticNative() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/native/staticNative.kt");
                 doTestWithStdlib(fileName);
             }
-
-            @TestMetadata("topLevel.kt")
-            public void testTopLevel() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/native/topLevel.kt");
-                doTestWithStdlib(fileName);
-            }
         }
 
         @TestMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions")
@@ -1791,12 +852,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                 doTestWithStdlib(fileName);
             }
 
-            @TestMetadata("kt1770.kt")
-            public void testKt1770() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt1770.kt");
-                doTestWithStdlib(fileName);
-            }
-
             @TestMetadata("kt274.kt")
             public void testKt274() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt274.kt");
@@ -2011,12 +1066,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/intrinsics"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
-        @TestMetadata("charToInt.kt")
-        public void testCharToInt() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/intrinsics/charToInt.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("defaultObjectMapping.kt")
         public void testDefaultObjectMapping() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/intrinsics/defaultObjectMapping.kt");
@@ -2042,39 +1091,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         }
     }
 
-    @TestMetadata("compiler/testData/codegen/boxWithStdlib/jdk")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Jdk extends AbstractBlackBoxCodegenTest {
-        public void testAllFilesPresentInJdk() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/jdk"), Pattern.compile("^(.+)\\.kt$"), true);
-        }
-
-        @TestMetadata("arrayList.kt")
-        public void testArrayList() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jdk/arrayList.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("hashMap.kt")
-        public void testHashMap() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jdk/hashMap.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("iteratingOverHashMap.kt")
-        public void testIteratingOverHashMap() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jdk/iteratingOverHashMap.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("kt1397.kt")
-        public void testKt1397() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jdk/kt1397.kt");
-            doTestWithStdlib(fileName);
-        }
-    }
-
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/jvmField")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -2387,132 +1403,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         }
     }
 
-    @TestMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class LazyCodegen extends AbstractBlackBoxCodegenTest {
-        public void testAllFilesPresentInLazyCodegen() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/lazyCodegen"), Pattern.compile("^(.+)\\.kt$"), true);
-        }
-
-        @TestMetadata("exceptionInFieldInitializer.kt")
-        public void testExceptionInFieldInitializer() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/exceptionInFieldInitializer.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("ifElse.kt")
-        public void testIfElse() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/ifElse.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("increment.kt")
-        public void testIncrement() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/increment.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("safeAssign.kt")
-        public void testSafeAssign() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/safeAssign.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("safeAssignComplex.kt")
-        public void testSafeAssignComplex() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/safeAssignComplex.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("safeCallAndArray.kt")
-        public void testSafeCallAndArray() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/safeCallAndArray.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("toString.kt")
-        public void testToString() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/toString.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("tryCatchExpression.kt")
-        public void testTryCatchExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/tryCatchExpression.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("when.kt")
-        public void testWhen() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/when.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Optimizations extends AbstractBlackBoxCodegenTest {
-            public void testAllFilesPresentInOptimizations() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations"), Pattern.compile("^(.+)\\.kt$"), true);
-            }
-
-            @TestMetadata("negateConstantCompare.kt")
-            public void testNegateConstantCompare() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateConstantCompare.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("negateFalse.kt")
-            public void testNegateFalse() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateFalse.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("negateFalseVar.kt")
-            public void testNegateFalseVar() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateFalseVar.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("negateFalseVarChain.kt")
-            public void testNegateFalseVarChain() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateFalseVarChain.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("negateObjectComp.kt")
-            public void testNegateObjectComp() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateObjectComp.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("negateObjectComp2.kt")
-            public void testNegateObjectComp2() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateObjectComp2.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("negateTrue.kt")
-            public void testNegateTrue() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateTrue.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("negateTrueVar.kt")
-            public void testNegateTrueVar() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateTrueVar.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("noOptimization.kt")
-            public void testNoOptimization() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/noOptimization.kt");
-                doTestWithStdlib(fileName);
-            }
-        }
-    }
-
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/localFunInLambda")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -2580,102 +1470,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/kt9828.kt");
             doTestWithStdlib(fileName);
         }
-
-        @TestMetadata("MultiDeclFor.kt")
-        public void testMultiDeclFor() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclFor.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("MultiDeclForComponentExtensions.kt")
-        public void testMultiDeclForComponentExtensions() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForComponentExtensions.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
-        public void testMultiDeclForComponentMemberExtensions() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForComponentMemberExtensions.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
-        public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("MultiDeclForValCaptured.kt")
-        public void testMultiDeclForValCaptured() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForValCaptured.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Int extends AbstractBlackBoxCodegenTest {
-            public void testAllFilesPresentInInt() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int"), Pattern.compile("^(.+)\\.kt$"), true);
-            }
-
-            @TestMetadata("MultiDeclForComponentExtensions.kt")
-            public void testMultiDeclForComponentExtensions() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentExtensions.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt")
-            public void testMultiDeclForComponentExtensionsValCaptured() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentExtensionsValCaptured.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
-            public void testMultiDeclForComponentMemberExtensions() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentMemberExtensions.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
-            public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
-                doTestWithStdlib(fileName);
-            }
-        }
-
-        @TestMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Long extends AbstractBlackBoxCodegenTest {
-            public void testAllFilesPresentInLong() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long"), Pattern.compile("^(.+)\\.kt$"), true);
-            }
-
-            @TestMetadata("MultiDeclForComponentExtensions.kt")
-            public void testMultiDeclForComponentExtensions() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentExtensions.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt")
-            public void testMultiDeclForComponentExtensionsValCaptured() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentExtensionsValCaptured.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
-            public void testMultiDeclForComponentMemberExtensions() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentMemberExtensions.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
-            public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
-                doTestWithStdlib(fileName);
-            }
-        }
     }
 
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/nonLocalReturns")
@@ -2707,36 +1501,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/postfixIncrementDecrement"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
-        @TestMetadata("arrayElement.kt")
-        public void testArrayElement() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/postfixIncrementDecrement/arrayElement.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("classNaryGetSet.kt")
-        public void testClassNaryGetSet() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/postfixIncrementDecrement/classNaryGetSet.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("classWithGetSet.kt")
-        public void testClassWithGetSet() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/postfixIncrementDecrement/classWithGetSet.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("extOnLong.kt")
-        public void testExtOnLong() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/postfixIncrementDecrement/extOnLong.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("genericClassWithGetSet.kt")
-        public void testGenericClassWithGetSet() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/postfixIncrementDecrement/genericClassWithGetSet.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("memberExtOnLong.kt")
         public void testMemberExtOnLong() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/postfixIncrementDecrement/memberExtOnLong.kt");
@@ -2748,12 +1512,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/postfixIncrementDecrement/mutableListElement.kt");
             doTestWithStdlib(fileName);
         }
-
-        @TestMetadata("nullable.kt")
-        public void testNullable() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/postfixIncrementDecrement/nullable.kt");
-            doTestWithStdlib(fileName);
-        }
     }
 
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/privateConstructor")
@@ -2797,12 +1555,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             doTestWithStdlib(fileName);
         }
 
-        @TestMetadata("rangeContainsString.kt")
-        public void testRangeContainsString() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/rangeContainsString.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("safeCallRangeTo.kt")
         public void testSafeCallRangeTo() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/safeCallRangeTo.kt");
@@ -3954,6 +2706,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                 doTestWithStdlib(fileName);
             }
 
+            @TestMetadata("propertyAccessorsWithJvmName.kt")
+            public void testPropertyAccessorsWithJvmName() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/propertyAccessorsWithJvmName.kt");
+                doTestWithStdlib(fileName);
+            }
+
             @TestMetadata("syntheticFields.kt")
             public void testSyntheticFields() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/syntheticFields.kt");
@@ -4296,6 +3054,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                 doTestWithStdlib(fileName);
             }
 
+            @TestMetadata("publicClassValAccessible.kt")
+            public void testPublicClassValAccessible() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/publicClassValAccessible.kt");
+                doTestWithStdlib(fileName);
+            }
+
             @TestMetadata("simpleGetProperties.kt")
             public void testSimpleGetProperties() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/simpleGetProperties.kt");
@@ -4426,12 +3190,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             doTestWithStdlib(fileName);
         }
 
-        @TestMetadata("kt2210.kt")
-        public void testKt2210() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt2210.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("kt2246.kt")
         public void testKt2246() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt2246.kt");
@@ -4450,12 +3208,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             doTestWithStdlib(fileName);
         }
 
-        @TestMetadata("kt2509.kt")
-        public void testKt2509() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt2509.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("kt2593.kt")
         public void testKt2593() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt2593.kt");
@@ -4480,18 +3232,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             doTestWithStdlib(fileName);
         }
 
-        @TestMetadata("kt3850.kt")
-        public void testKt3850() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt3850.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("kt4142.kt")
-        public void testKt4142() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt4142.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("kt4259.kt")
         public void testKt4259() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt4259.kt");
@@ -4510,12 +3250,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             doTestWithStdlib(fileName);
         }
 
-        @TestMetadata("kt5395.kt")
-        public void testKt5395() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt5395.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("kt5786_privateWithDefault.kt")
         public void testKt5786_privateWithDefault() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt5786_privateWithDefault.kt");
@@ -4546,12 +3280,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             doTestWithStdlib(fileName);
         }
 
-        @TestMetadata("kt789.kt")
-        public void testKt789() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt789.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("kt998.kt")
         public void testKt998() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt998.kt");
@@ -4767,23 +3495,11 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                 doTestWithStdlib(fileName);
             }
 
-            @TestMetadata("jaggedArray.kt")
-            public void testJaggedArray() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/arraysReification/jaggedArray.kt");
-                doTestWithStdlib(fileName);
-            }
-
             @TestMetadata("jaggedArrayOfNulls.kt")
             public void testJaggedArrayOfNulls() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/arraysReification/jaggedArrayOfNulls.kt");
                 doTestWithStdlib(fileName);
             }
-
-            @TestMetadata("jaggedDeep.kt")
-            public void testJaggedDeep() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/arraysReification/jaggedDeep.kt");
-                doTestWithStdlib(fileName);
-            }
         }
     }
 
@@ -4840,12 +3556,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             doTestWithStdlib(fileName);
         }
 
-        @TestMetadata("kt5389_stringBuilderGet.kt")
-        public void testKt5389_stringBuilderGet() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/strings/kt5389_stringBuilderGet.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("stringPlusOnlyWorksOnString.kt")
         public void testStringPlusOnlyWorksOnString() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/strings/stringPlusOnlyWorksOnString.kt");
@@ -4927,24 +3637,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             doTestWithStdlib(fileName);
         }
 
-        @TestMetadata("privateInInlineNested.kt")
-        public void testPrivateInInlineNested() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/topLevelPrivate/privateInInlineNested.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("privateVisibility.kt")
-        public void testPrivateVisibility() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/topLevelPrivate/privateVisibility.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("syntheticAccessor.kt")
-        public void testSyntheticAccessor() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/topLevelPrivate/syntheticAccessor.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("syntheticAccessorInMultiFile.kt")
         public void testSyntheticAccessorInMultiFile() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/topLevelPrivate/syntheticAccessorInMultiFile.kt");
@@ -4986,12 +3678,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/vararg/spreadCopiesArray.kt");
             doTestWithStdlib(fileName);
         }
-
-        @TestMetadata("varargInFunParam.kt")
-        public void testVarargInFunParam() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/vararg/varargInFunParam.kt");
-            doTestWithStdlib(fileName);
-        }
     }
 
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/when")
@@ -5002,12 +3688,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/when"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
-        @TestMetadata("exhaustiveBreakContinue.kt")
-        public void testExhaustiveBreakContinue() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/exhaustiveBreakContinue.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("integralWhenWithNoInlinedConstants.kt")
         public void testIntegralWhenWithNoInlinedConstants() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/integralWhenWithNoInlinedConstants.kt");
@@ -5101,24 +3781,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             doTestWithStdlib(fileName);
         }
 
-        @TestMetadata("nonConstantEnum.kt")
-        public void testNonConstantEnum() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nonConstantEnum.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("nullability.kt")
         public void testNullability() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nullability.kt");
             doTestWithStdlib(fileName);
         }
 
-        @TestMetadata("nullableEnum.kt")
-        public void testNullableEnum() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nullableEnum.kt");
-            doTestWithStdlib(fileName);
-        }
-
         @TestMetadata("subjectAny.kt")
         public void testSubjectAny() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/subjectAny.kt");
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClassesTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClassesTestGenerated.java
index 149d42a05e7..895e06b91ed 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClassesTestGenerated.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClassesTestGenerated.java
@@ -503,6 +503,12 @@ public class ClassesTestGenerated extends AbstractClassesTest {
         doTest(fileName);
     }
 
+    @TestMetadata("kt471.kt")
+    public void testKt471() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt471.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("kt48.kt")
     public void testKt48() throws Exception {
         String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt48.kt");
@@ -539,6 +545,12 @@ public class ClassesTestGenerated extends AbstractClassesTest {
         doTest(fileName);
     }
 
+    @TestMetadata("kt633.kt")
+    public void testKt633() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt633.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("kt6816.kt")
     public void testKt6816() throws Exception {
         String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt6816.kt");